driver: systimer: increase esp32c3 tick resolution

sylvioalves · carlescufi · commit cff71c8d2b5b · 2023-01-04T14:24:25.000+01:00
hal_espressif systimer HAL calls are based on 1MHz reference.
This changes systimer driver to allow max clocking reference of 16MHz
and increases soc tick resolution by reducing min delay interval.

This also sets all ESP32-C3 socs to 16MHz hardware cycles reference.

Signed-off-by: Sylvio Alves &lt;sylvio.alves@espressif.com&gt;
diff --git a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig
@@ -3,7 +3,6 @@
 CONFIG_BOARD_ESP32C3_DEVKITM=y
 CONFIG_SOC_ESP32C3=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
diff --git a/boards/riscv/icev_wireless/icev_wireless_defconfig b/boards/riscv/icev_wireless/icev_wireless_defconfig
@@ -3,7 +3,6 @@
 CONFIG_BOARD_ICEV_WIRELESS=y
 CONFIG_SOC_ESP32C3=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
diff --git a/boards/riscv/xiao_esp32c3/xiao_esp32c3_defconfig b/boards/riscv/xiao_esp32c3/xiao_esp32c3_defconfig
@@ -3,7 +3,6 @@
 CONFIG_BOARD_XIAO_ESP32C3=y
 CONFIG_SOC_ESP32C3=y
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
diff --git a/drivers/timer/esp32c3_sys_timer.c b/drivers/timer/esp32c3_sys_timer.c
@@ -24,7 +24,7 @@
 			      / (uint64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC))
 #define MAX_CYC 0xffffffffu
 #define MAX_TICKS ((MAX_CYC - CYC_PER_TICK) / CYC_PER_TICK)
-#define MIN_DELAY 1000
+#define MIN_DELAY 1
 
 #if defined(CONFIG_TEST)
 const int32_t z_sys_timer_irq_for_test = DT_IRQN(DT_NODELABEL(systimer0));
@@ -43,13 +43,18 @@ static void set_systimer_alarm(uint64_t time)
 	systimer_hal_select_alarm_mode(&systimer_hal,
 		SYSTIMER_LL_ALARM_OS_TICK_CORE0, SYSTIMER_ALARM_MODE_ONESHOT);
 
-	systimer_hal_set_alarm_target(&systimer_hal, SYSTIMER_LL_ALARM_OS_TICK_CORE0, time);
-	systimer_hal_enable_alarm_int(&systimer_hal, SYSTIMER_LL_ALARM_OS_TICK_CORE0);
+	systimer_counter_value_t alarm = {.val = time};
+
+	systimer_ll_enable_alarm(systimer_hal.dev, SYSTIMER_LL_ALARM_OS_TICK_CORE0, false);
+	systimer_ll_set_alarm_target(systimer_hal.dev, SYSTIMER_LL_ALARM_OS_TICK_CORE0, alarm.val);
+	systimer_ll_apply_alarm_value(systimer_hal.dev, SYSTIMER_LL_ALARM_OS_TICK_CORE0);
+	systimer_ll_enable_alarm(systimer_hal.dev, SYSTIMER_LL_ALARM_OS_TICK_CORE0, true);
+	systimer_ll_enable_alarm_int(systimer_hal.dev, SYSTIMER_LL_ALARM_OS_TICK_CORE0, true);
 }
 
 static uint64_t get_systimer_alarm(void)
 {
-	return systimer_hal_get_time(&systimer_hal, SYSTIMER_LL_COUNTER_OS_TICK);
+	return systimer_hal_get_counter_value(&systimer_hal, SYSTIMER_LL_COUNTER_OS_TICK);
 }
 
 static void sys_timer_isr(const void *arg)
diff --git a/soc/riscv/esp32c3/Kconfig.defconfig b/soc/riscv/esp32c3/Kconfig.defconfig
@@ -51,4 +51,7 @@ config ATOMIC_OPERATIONS_C
 config MINIMAL_LIBC_OPTIMIZE_STRING_FOR_SIZE
 	default n
 
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 16000000
+
 endif
diff --git a/west.yml b/west.yml
@@ -57,7 +57,7 @@ manifest:
       groups:
         - hal
     - name: hal_espressif
-      revision: 15c84e32d557545d662392e72ca86e3d88382c03
+      revision: 1a2292632131d09549b527917cfd0ad7cd78338c
       path: modules/hal/espressif
       west-commands: west/west-commands.yml
       groups:
