[rv64] feat: unify tick.c

polarvid · polarvid · commit 30f3ac4bc67a · 2024-07-09T20:14:04.000+08:00
The changes unify the tick.c implementations for all risc-v64
architectures, leveraging the CPUTIME feature. This refactoring was
necessary to streamline the codebase, and ensure consistent timer
handling across different platforms.

Changes:
- Updated `Kconfig` in `bsp/cvitek/cv18xx_risc-v` to fix formatting issues.
- Added default values for `CPUTIME_TIMER_FREQ` in `components/drivers/cputime/Kconfig`.
- Refactored `tick.c` and `tick.h` in `libcpu/risc-v/t-head/c906` and `libcpu/risc-v/virt64`:
  - Replaced direct use of `rdtime` with `clock_cpu_gettime`.
  - Removed redundant timer frequency definitions.
  - Added static assertions to check the value of `CPUTIME_TIMER_FREQ`.
  - Initialized `tick_cycles` based on `CPUTIME_TIMER_FREQ`.
  - Integrated `ktime` support for tick initialization.

Signed-off-by: Shell &lt;smokewood@qq.com&gt;
diff --git a/bsp/cvitek/cv18xx_risc-v/Kconfig b/bsp/cvitek/cv18xx_risc-v/Kconfig
@@ -26,7 +26,7 @@ config C906_PLIC_PHY_ADDR
     default 0x70000000
 
 config IRQ_MAX_NR
-    int 
+    int
     default 64
 
 config TIMER_CLK_FREQ
@@ -40,7 +40,7 @@ config GPIO_IRQ_BASE
 config SYS_GPIO_IRQ_BASE
     int
     default 70
-    
+
 config __STACKSIZE__
     int "stack size for interrupt"
     default 4096
@@ -72,5 +72,5 @@ choice
     config BOARD_TYPE_MILKV_DUO256M_SPINOR
         select SOC_TYPE_SG2002
         bool "milkv-duo256m-spinor"
-        
+
 endchoice
diff --git a/components/drivers/cputime/Kconfig b/components/drivers/cputime/Kconfig
@@ -30,5 +30,8 @@ if RT_USING_CPUTIME
             Some RISCV64 MCU Use rdtime instructions read CPU time.
     config CPUTIME_TIMER_FREQ
         int "CPUTIME timer freq"
+        default 10000000 if BOARD_QEMU_VIRT_RV64
+        default 24000000 if BOARD_allwinnerd1s
+        default 25000000 if BSP_USING_CV18XX
         default 0
 endif
diff --git a/libcpu/risc-v/t-head/c906/tick.c b/libcpu/risc-v/t-head/c906/tick.c
@@ -6,44 +6,47 @@
  * Change Logs:
  * Date           Author       Notes
  * 2018/10/28     Bernard      The unify RISC-V porting code.
+ * 2024/07/08     Shell        Using CPUTIME as tick
  */
 
 #include <rthw.h>
 #include <rtthread.h>
 
+#include <drivers/cputime.h>
 #include <encoding.h>
 #include "sbi.h"
-#include "tick.h"
 
-static volatile uint64_t time_elapsed = 0;
-static volatile unsigned long tick_cycles = 0;
-
-static unsigned long tick_delta = TIMER_CLK_FREQ / RT_TICK_PER_SECOND;
+#ifdef RT_USING_KTIME
+#include <ktime.h>
+#endif
 
-static uint64_t get_ticks()
-{
-    __asm__ __volatile__(
-        "rdtime %0"
-        : "=r"(time_elapsed));
-    return time_elapsed;
-}
+static volatile unsigned long tick_cycles = 0;
 
 int tick_isr(void)
 {
     rt_tick_increase();
-    sbi_set_timer(get_ticks() + tick_delta);
+    sbi_set_timer(clock_cpu_gettime() + tick_cycles);
     return 0;
 }
 
+/* BSP should config clockbase frequency */
+RT_STATIC_ASSERT(defined_clockbase_freq, CPUTIME_TIMER_FREQ != 0);
+
 /* Sets and enable the timer interrupt */
 int rt_hw_tick_init(void)
 {
+    /* calculate the tick cycles */
+    tick_cycles = CPUTIME_TIMER_FREQ / RT_TICK_PER_SECOND;
+
     /* Clear the Supervisor-Timer bit in SIE */
     clear_csr(sie, SIP_STIP);
 
     /* Set timer */
-    sbi_set_timer(get_ticks() + tick_delta);
+    sbi_set_timer(clock_cpu_gettime() + tick_cycles);
 
+#ifdef RT_USING_KTIME
+    rt_ktime_cputimer_init();
+#endif
     /* Enable the Supervisor-Timer bit in SIE */
     set_csr(sie, SIP_STIP);
 
@@ -61,10 +64,10 @@ void rt_hw_us_delay(rt_uint32_t us)
     unsigned long end_time;
     unsigned long run_time;
 
-    start_time = get_ticks();
-    end_time = start_time + us * (TIMER_CLK_FREQ / 1000000);
+    start_time = clock_cpu_gettime();
+    end_time = start_time + us * (CPUTIME_TIMER_FREQ / 1000000);
     do
     {
-        run_time = get_ticks();
+        run_time = clock_cpu_gettime();
     } while(run_time < end_time);
-}
+}
diff --git a/libcpu/risc-v/t-head/c906/tick.h b/libcpu/risc-v/t-head/c906/tick.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2023, RT-Thread Development Team
+ * Copyright (c) 2006-2024, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -11,10 +11,6 @@
 #ifndef TICK_H__
 #define TICK_H__
 
-/* timer clock is 24 MHZ */
-#ifndef TIMER_CLK_FREQ
-#define TIMER_CLK_FREQ  (24000000)
-#endif
 int tick_isr(void);
 int rt_hw_tick_init(void);
 
diff --git a/libcpu/risc-v/virt64/tick.c b/libcpu/risc-v/virt64/tick.c
@@ -6,52 +6,43 @@
  * Change Logs:
  * Date           Author       Notes
  * 2018/10/28     Bernard      The unify RISC-V porting code.
+ * 2024/07/08     Shell        Using CPUTIME as tick
  */
 
 #include <rthw.h>
 #include <rtthread.h>
 
+#include <drivers/cputime.h>
 #include <encoding.h>
 #include "sbi.h"
 
 #ifdef RT_USING_KTIME
 #include <ktime.h>
 #endif
 
-static volatile uint64_t time_elapsed = 0;
 static volatile unsigned long tick_cycles = 0;
 
-static uint64_t get_ticks()
-{
-    __asm__ __volatile__(
-        "rdtime %0"
-        : "=r"(time_elapsed));
-    return time_elapsed;
-}
-
 int tick_isr(void)
 {
-    // uint64_t core_id = current_coreid();
-    // clint->mtimecmp[core_id] += tick_cycles;
     rt_tick_increase();
-    sbi_set_timer(get_ticks() + tick_cycles);
-
+    sbi_set_timer(clock_cpu_gettime() + tick_cycles);
     return 0;
 }
 
+/* BSP should config clockbase frequency */
+RT_STATIC_ASSERT(defined_clockbase_freq, CPUTIME_TIMER_FREQ != 0);
+
 /* Sets and enable the timer interrupt */
 int rt_hw_tick_init(void)
 {
-    /* Read core id */
-    // unsigned long core_id = current_coreid();
+    /* calculate the tick cycles */
+    tick_cycles = CPUTIME_TIMER_FREQ / RT_TICK_PER_SECOND;
 
     /* Clear the Supervisor-Timer bit in SIE */
     clear_csr(sie, SIP_STIP);
 
-    /* calculate the tick cycles */
-    tick_cycles = CPUTIME_TIMER_FREQ / RT_TICK_PER_SECOND;
     /* Set timer */
-    sbi_set_timer(get_ticks() + tick_cycles);
+    sbi_set_timer(clock_cpu_gettime() + tick_cycles);
 
 #ifdef RT_USING_KTIME
     rt_ktime_cputimer_init();
@@ -61,3 +52,22 @@ int rt_hw_tick_init(void)
 
     return 0;
 }
+
+/**
+ * This function will delay for some us.
+ *
+ * @param us the delay time of us
+ */
+void rt_hw_us_delay(rt_uint32_t us)
+{
+    unsigned long start_time;
+    unsigned long end_time;
+    unsigned long run_time;
+
+    start_time = clock_cpu_gettime();
+    end_time = start_time + us * (CPUTIME_TIMER_FREQ / 1000000);
+    do
+    {
+        run_time = clock_cpu_gettime();
+    } while(run_time < end_time);
+}
diff --git a/libcpu/risc-v/virt64/tick.h b/libcpu/risc-v/virt64/tick.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2024, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2006-2021, RT-Thread Development Team`
	`2`	`+ * Copyright (c) 2006-2024, RT-Thread Development Team`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`*`