All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support
@ 2026-09-11 13:35 Nikita Shubin
  2026-09-11 13:35 ` [PATCH v5 1/2] riscv: timer: Make RISCV_TIMER definitions weak Nikita Shubin
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Nikita Shubin @ 2026-09-11 13:35 UTC (permalink / raw)
  To: u-boot; +Cc: Yao Zi, Tom Rini, Michal Simek, Nikita Shubin

This series addresses two issues with the generic RISC-V timer driver.

Patch 1 marks timer_early_get_rate() and timer_early_get_count() as __weak
to prevent link conflicts with other drivers (e.g., ACLINT MTIMER) that may
also provide their own implementation.

Patch 2 adds proper M‑mode support: timer_early_get_rate() is now defined
for M‑mode using RISCV_MMODE_TIMER_FREQ, and timer_early_get_count() is
no longer guarded by RISCV_SMODE, making it available whenever
CONFIG_TIMER_EARLY is enabled. This is necessary because functions like
net_random_ethaddr() rely on get_ticks() which uses timer_early_get_count().

Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
Changes in v5:
- Rephrased commit message for Patch 2.

- Link to v4: https://lore.kernel.org/r/20260911-riscv_fix_early_timer_mmode-v4-0-87a7b5abf958@maquefel.me

Changes in v4:
- Change KConfig description for RISCV_TIMER: drop ACLINT warning as we
  define funcs as weak, rephrase note about macros and make int make it
  more compact.

- Link to v3: https://lore.kernel.org/r/20260910-riscv_fix_early_timer_mmode-v3-0-52b569fa1d6d@maquefel.me

Changes in v3:
- reoder patches so weak definitions come first

- Link to v2: https://lore.kernel.org/r/20260909-riscv_fix_early_timer_mmode-v2-0-563bff2a50c5@maquefel.me

Changes in v2:
- Updated Kconfig help text and driver comments to clarify M-mode support
- Simplified code a bit
- Add patch to make timer_early_get_count() weak (optional)

- Link to v1: https://lore.kernel.org/r/20260904-riscv_fix_early_timer_mmode-v1-1-210e769b0ac2@maquefel.me

---
Nikita Shubin (2):
      riscv: timer: Make RISCV_TIMER definitions weak
      riscv: timer: Enable early timer for M‑mode

 drivers/timer/Kconfig       |  9 +++++++--
 drivers/timer/riscv_timer.c | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)
---
base-commit: cc557af4553382f6f50e3ed62b9577054e7bc54f
change-id: 20260904-riscv_fix_early_timer_mmode-174f3ee4e106

Best regards,
-- 
Nikita Shubin


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v5 1/2] riscv: timer: Make RISCV_TIMER definitions weak
  2026-09-11 13:35 [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Nikita Shubin
@ 2026-09-11 13:35 ` Nikita Shubin
  2026-09-11 13:35 ` [PATCH v5 2/2] riscv: timer: Enable early timer for M‑mode Nikita Shubin
  2026-09-13 18:48 ` [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Yao Zi
  2 siblings, 0 replies; 4+ messages in thread
From: Nikita Shubin @ 2026-09-11 13:35 UTC (permalink / raw)
  To: u-boot; +Cc: Yao Zi, Tom Rini, Michal Simek, Nikita Shubin

Mark timer_early_get_rate() and timer_early_get_count()
as __weak to avoid link conflict with other drivers
(e.g., ACLINT MTIMER) that also provide this function
when both are enabled.

Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
 drivers/timer/riscv_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/timer/riscv_timer.c b/drivers/timer/riscv_timer.c
index 1f4980ceb38..eb7c78c3bdd 100644
--- a/drivers/timer/riscv_timer.c
+++ b/drivers/timer/riscv_timer.c
@@ -37,7 +37,7 @@ static u64 notrace riscv_timer_get_count(struct udevice *dev)
 /**
  * timer_early_get_rate() - Get the timer rate before driver model
  */
-unsigned long notrace timer_early_get_rate(void)
+unsigned long notrace __weak timer_early_get_rate(void)
 {
 	return RISCV_SMODE_TIMER_FREQ;
 }
@@ -46,7 +46,7 @@ unsigned long notrace timer_early_get_rate(void)
  * timer_early_get_count() - Get the timer count before driver model
  *
  */
-u64 notrace timer_early_get_count(void)
+u64 notrace __weak timer_early_get_count(void)
 {
 	return riscv_timer_get_count(NULL);
 }

-- 
2.54.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v5 2/2] riscv: timer: Enable early timer for M‑mode
  2026-09-11 13:35 [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Nikita Shubin
  2026-09-11 13:35 ` [PATCH v5 1/2] riscv: timer: Make RISCV_TIMER definitions weak Nikita Shubin
@ 2026-09-11 13:35 ` Nikita Shubin
  2026-09-13 18:48 ` [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Yao Zi
  2 siblings, 0 replies; 4+ messages in thread
From: Nikita Shubin @ 2026-09-11 13:35 UTC (permalink / raw)
  To: u-boot; +Cc: Yao Zi, Tom Rini, Michal Simek, Nikita Shubin

The generic RISC-V timer driver currently defines
timer_early_get_count() only when CONFIG_IS_ENABLED(RISCV_SMODE),
even though reading the TIME CSR is not inherently limited
to S‑mode; it works in M‑mode as well when the CSR is implemented
in hardware (e.g., with the Zicntr extension).

Moreover, timer_early_get_rate() is missing entirely for M‑mode,
causing early timer functions to be unavailable on such systems.

Fix this by:
- Moving timer_early_get_count() out of the RISCV_SMODE guard
  so it is always available when CONFIG_TIMER_EARLY is set.
- Adding M‑mode support to timer_early_get_rate(), returning
  RISCV_MMODE_TIMER_FREQ when running in M‑mode
  and RISCV_SMODE_TIMER_FREQ in S‑mode.

This is also necessary because functions like net_random_ethaddr()
rely on get_ticks() which uses timer_early_get_count(), so we
should provide one if CONFIG_TIMER_EARLY is enabled.

Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
 drivers/timer/Kconfig       |  9 +++++++--
 drivers/timer/riscv_timer.c | 12 +++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 500a25638a9..2b912302053 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -227,8 +227,13 @@ config RISCV_TIMER
 	bool "RISC-V timer support"
 	depends on TIMER && RISCV
 	help
-	  Select this to enable support for a generic RISC-V S-Mode timer
-	  driver.
+	  Enable support for the generic RISC-V timer driver using the TIME CSR.
+
+	  This driver works in S-Mode and M-Mode if the TIME CSR is implemented
+	  in hardware (e.g., when the Zicntr extension is present).
+	  If CONFIG_TIMER_EARLY is also set, then timer frequency must be provided
+	  via the macros RISCV_SMODE_TIMER_FREQ/RISCV_MMODE_TIMER_FREQ for
+	  S-Mode/M-Mode respectively.
 
 config ROCKCHIP_TIMER
 	bool "Rockchip timer support"
diff --git a/drivers/timer/riscv_timer.c b/drivers/timer/riscv_timer.c
index eb7c78c3bdd..72cfde57e93 100644
--- a/drivers/timer/riscv_timer.c
+++ b/drivers/timer/riscv_timer.c
@@ -7,7 +7,9 @@
  *
  * RISC-V architecturally-defined generic timer driver
  *
- * This driver provides generic timer support for S-mode U-Boot.
+ * This driver provides generic timer support for S-mode
+ * and M-Mode U-Boot if the TIME CSR is implemented in hardware
+ * (e.g., when the Zicntr extension is present).
  */
 
 #include <config.h>
@@ -33,14 +35,19 @@ static u64 notrace riscv_timer_get_count(struct udevice *dev)
 	return ((u64)hi << 32) | lo;
 }
 
-#if CONFIG_IS_ENABLED(RISCV_SMODE) && IS_ENABLED(CONFIG_TIMER_EARLY)
+#if IS_ENABLED(CONFIG_TIMER_EARLY)
 /**
  * timer_early_get_rate() - Get the timer rate before driver model
  */
 unsigned long notrace __weak timer_early_get_rate(void)
 {
+#if CONFIG_IS_ENABLED(RISCV_SMODE)
 	return RISCV_SMODE_TIMER_FREQ;
+#elif CONFIG_IS_ENABLED(RISCV_MMODE)
+	return RISCV_MMODE_TIMER_FREQ;
+#endif
 }
+#endif
 
 /**
  * timer_early_get_count() - Get the timer count before driver model
@@ -50,7 +57,6 @@ u64 notrace __weak timer_early_get_count(void)
 {
 	return riscv_timer_get_count(NULL);
 }
-#endif
 
 #if CONFIG_IS_ENABLED(RISCV_SMODE) && CONFIG_IS_ENABLED(BOOTSTAGE)
 ulong timer_get_boot_us(void)

-- 
2.54.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support
  2026-09-11 13:35 [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Nikita Shubin
  2026-09-11 13:35 ` [PATCH v5 1/2] riscv: timer: Make RISCV_TIMER definitions weak Nikita Shubin
  2026-09-11 13:35 ` [PATCH v5 2/2] riscv: timer: Enable early timer for M‑mode Nikita Shubin
@ 2026-09-13 18:48 ` Yao Zi
  2 siblings, 0 replies; 4+ messages in thread
From: Yao Zi @ 2026-09-13 18:48 UTC (permalink / raw)
  To: Nikita Shubin, u-boot; +Cc: Yao Zi, Tom Rini, Michal Simek

On Fri, Sep 11, 2026 at 04:35:22PM +0300, Nikita Shubin wrote:
> This series addresses two issues with the generic RISC-V timer driver.
> 
> Patch 1 marks timer_early_get_rate() and timer_early_get_count() as __weak
> to prevent link conflicts with other drivers (e.g., ACLINT MTIMER) that may
> also provide their own implementation.
> 
> Patch 2 adds proper M‑mode support: timer_early_get_rate() is now defined
> for M‑mode using RISCV_MMODE_TIMER_FREQ, and timer_early_get_count() is
> no longer guarded by RISCV_SMODE, making it available whenever
> CONFIG_TIMER_EARLY is enabled. This is necessary because functions like
> net_random_ethaddr() rely on get_ticks() which uses timer_early_get_count().

For the whole series,

Reviewed-by: Yao Zi <me@ziyao.cc>

Thanks for your work!

Regards,
Yao Zi

> ---
> Nikita Shubin (2):
>       riscv: timer: Make RISCV_TIMER definitions weak
>       riscv: timer: Enable early timer for M‑mode
> 
>  drivers/timer/Kconfig       |  9 +++++++--
>  drivers/timer/riscv_timer.c | 16 +++++++++++-----
>  2 files changed, 18 insertions(+), 7 deletions(-)
> ---
> base-commit: cc557af4553382f6f50e3ed62b9577054e7bc54f
> change-id: 20260904-riscv_fix_early_timer_mmode-174f3ee4e106
> 
> Best regards,
> -- 
> Nikita Shubin
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-09-13 18:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-11 13:35 [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Nikita Shubin
2026-09-11 13:35 ` [PATCH v5 1/2] riscv: timer: Make RISCV_TIMER definitions weak Nikita Shubin
2026-09-11 13:35 ` [PATCH v5 2/2] riscv: timer: Enable early timer for M‑mode Nikita Shubin
2026-09-13 18:48 ` [PATCH v5 0/2] riscv: timer: Fix M-mode early timer support Yao Zi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.