clocksource/drivers/timer-clint: Add T-Head C9xx clint
Subsystems (2)
PATCH v5 1/1 clocksource/drivers/timer-clint: Add T-Head C9xx clint
From: Jisheng Zhang <[email protected]>
To use the T-HEAD C9xx clint in RISCV-M NOMMU env, we need to take care two points:
1.The mtimecmp in T-Head C9xx clint only supports 32bit read/write, implement such support.
2. As pointed out by commit ca7810aecdba ("lib: utils/timer: mtimer:
add a quirk for lacking mtime register") of opensbi:
"T-Head developers surely have a different understanding of time CSR and CLINT's mtime register with SiFive ones, that they did not implement the mtime register at all -- as shown in openC906 source code, their time CSR value is just exposed at the top of their processor IP block and expects an external continous counter, which makes it not overrideable, and thus mtime register is not implemented, even not for reading. However, if CLINTEE is not enabled in T-Head's MXSTATUS extended CSR, these systems still rely on the mtimecmp registers to generate timer interrupts. This makes it necessary to implement T-Head C9xx CLINT support in OpenSBI MTIMER driver, which skips implementing reading mtime register and falls back to default code that reads time CSR."
So, we need to fall back to read time CSR instead of mtime register. Add riscv_csr_time_available static key for this purpose.
---
Treat this as a completely new patch, as it is mostly rewritten. Original:
https://lore.kernel.org/all/[email protected]/
V3 -> V4:
- Add riscv,csr-clint
- Allow using of CSRs in S mode
- Change if return else return to if return return
- Change static_branch_likely to static_branch_unlikely
- Fix 32-bit clint_get_cycles64 csr_available check being inverted
- Fix is_c900_clint being uninitialized
V4 -> V5:
- Remove riscv,csr-clint
- Remove riscv_csr_time_available
- Replace all static_branch_unlikely(&riscv_csr_time_available) with riscv_has_extension_likely(RISCV_ISA_EXT_ZICNTR)
--- arch/riscv/include/asm/timex.h | 12 +++++++- drivers/clocksource/timer-clint.c | 50 +++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 6 deletions(-)
arch/riscv/include/asm/timex.h +11 -1
@@ -17,17 +17,26 @@ typedef unsigned long cycles_t;#ifdef CONFIG_64BIT static inline cycles_t get_cycles (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return readq_relaxed (clint_time_val); }#else /* !CONFIG_64BIT */ static inline u32 get_cycles (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return readl_relaxed (((u32 *)clint_time_val)); }#define get_cycles get_cyclesstatic inline u32 get_cycles_hi (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIMEH ); +return readl_relaxed (((u32 *)clint_time_val) +1 ); }#define get_cycles_hi get_cycles_hi
@@ -40,7 +49,8 @@ static inline u32 get_cycles_hi(void)*/ static inline unsigned long random_get_entropy (void ) { -if (unlikely (clint_time_val ==NULL )) +if (!riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR ) && + (unlikely (clint_time_val ==NULL )))return random_get_entropy_fallback ();return get_cycles (); }
drivers/clocksource/timer-clint.c +45 -5
91 lines not on this page · raw message
Signature · 1 line
2.45.2
Quoted 195 lines · Jesse Taube
From: Jisheng Zhang <[email protected]>
To use the T-HEAD C9xx clint in RISCV-M NOMMU env, we need to take care two points:
1.The mtimecmp in T-Head C9xx clint only supports 32bit read/write, implement such support.
2. As pointed out by commit
ca7810aecdba("lib: utils/timer: mtimer:
add a quirk for lacking mtime register") of opensbi:"T-Head developers surely have a different understanding of time CSR and CLINT's mtime register with SiFive ones, that they did not implement the mtime register at all -- as shown in openC906 source code, their time CSR value is just exposed at the top of their processor IP block and expects an external continous counter, which makes it not overrideable, and thus mtime register is not implemented, even not for reading. However, if CLINTEE is not enabled in T-Head's MXSTATUS extended CSR, these systems still rely on the mtimecmp registers to generate timer interrupts. This makes it necessary to implement T-Head C9xx CLINT support in OpenSBI MTIMER driver, which skips implementing reading mtime register and falls back to default code that reads time CSR."
So, we need to fall back to read time CSR instead of mtime register. Add
riscv_csr_time_availablestatic key for this purpose.Signed-off-by Jisheng Zhang <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
Treat this as a completely new patch, as it is mostly rewritten. Original:
https://lore.kernel.org/all/[email protected]/
V3 -> V4:
- Add riscv,csr-clint
- Allow using of CSRs in S mode
- Change if return else return to if return return
- Changestatic_branch_likelytostatic_branch_unlikely
- Fix 32-bitclint_get_cycles64csr_availablecheck being inverted
- Fixis_c900_clintbeing uninitialized
V4 -> V5:
- Remove riscv,csr-clint
- Removeriscv_csr_time_available
- Replace allstatic_branch_unlikely(&riscv_csr_time_available)withriscv_has_extension_likely(RISCV_ISA_EXT_ZICNTR)--- arch/riscv/include/asm/timex.h | 12 +++++++- drivers/clocksource/timer-clint.c | 50 +++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 6 deletions(-)arch/riscv/include/asm/timex.h +11
-1@@ -17,17 +17,26 @@ typedef unsigned long cycles_t;#ifdef CONFIG_64BIT static inline cycles_t get_cycles (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return readq_relaxed (clint_time_val); }#else /* !CONFIG_64BIT */ static inline u32 get_cycles (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return readl_relaxed (((u32 *)clint_time_val)); }#define get_cycles get_cyclesstatic inline u32 get_cycles_hi (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIMEH ); +return readl_relaxed (((u32 *)clint_time_val) +1 ); }#define get_cycles_hi get_cycles_hi@@ -40,7 +49,8 @@ static inline u32 get_cycles_hi(void)*/ static inline unsigned long random_get_entropy (void ) { -if (unlikely (clint_time_val ==NULL )) +if (!riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR ) && + (unlikely (clint_time_val ==NULL )))return random_get_entropy_fallback ();return get_cycles (); }drivers/clocksource/timer-clint.c +45
-6@@ -39,6 +39,7 @@ static u64 __iomem *clint_timer_cmp;static u64 __iomem *clint_timer_val;static unsigned long clint_timer_freq;static unsigned int clint_timer_irq; +static bool is_c900_clint;#ifdef CONFIG_RISCV_M_MODE u64 __iomem *clint_time_val;@@ -79,6 +80,9 @@ static void clint_ipi_interrupt(struct irq_desc *desc)#ifdef CONFIG_64BIT static u64 notrace clint_get_cycles64(void) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return clint_get_cycles (); }#else /* CONFIG_64BIT */ @@ -86,10 +90,17 @@ static u64 notrace clint_get_cycles64(void) {u32 hi, lo; -do { - hi =clint_get_cycles_hi (); - lo =clint_get_cycles (); - }while (hi !=clint_get_cycles_hi ()); +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) { +do { + hi =csr_read (CSR_TIMEH ); + lo =csr_read (CSR_TIME ); + }while (hi !=csr_read (CSR_TIMEH )); + }else { +do { + hi =clint_get_cycles_hi (); + lo =clint_get_cycles (); + }while (hi !=clint_get_cycles_hi ()); + }return ((u64 )hi <<32 ) | lo; }@@ -119,6 +130,19 @@ static int clint_clock_next_event(unsigned long delta,return 0 ; } +static int c900_clint_clock_next_event (unsigned long delta, +struct clock_event_device *ce) +{ +void __iomem *r = clint_timer_cmp + +cpuid_to_hartid_map (smp_processor_id ()); +u64 val =clint_get_cycles64 () + delta; + +csr_set (CSR_IE ,IE_TIE ); +writel_relaxed (val, r); +writel_relaxed (val >>32 , r +4 ); +return 0 ; +} + static DEFINE_PER_CPU(struct clock_event_device, clint_clock_event) = { .name ="clint_clockevent" , .features =CLOCK_EVT_FEAT_ONESHOT ,@@ -130,6 +154,9 @@ static int clint_timer_starting_cpu(unsigned int cpu) {struct clock_event_device *ce =per_cpu_ptr (&clint_clock_event, cpu); +if (is_c900_clint) + ce->set_next_event = c900_clint_clock_next_event; + ce->cpumask =cpumask_of (cpu);clockevents_config_and_register (ce, clint_timer_freq,100 ,ULONG_MAX );@@ -161,7 +188,7 @@ static irqreturn_t clint_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __init clint_timer_init_dt (struct device_node *np) +static int __init clint_timer_init (struct device_node *np) {int rc;u32 i, nr_irqs;@@ -273,5 +300,18 @@ static int __init clint_timer_init_dt(struct device_node *np)return rc; } +static int __init clint_timer_init_dt (struct device_node *np) +{ + is_c900_clint = false; +return clint_timer_init (np); +} + +static int __init c900_clint_timer_init_dt (struct device_node *np) +{ + is_c900_clint = true; +return clint_timer_init (np); +} +TIMER_OF_DECLARE (clint_timer,"riscv,clint0" , clint_timer_init_dt);TIMER_OF_DECLARE (clint_timer1,"sifive,clint0" , clint_timer_init_dt); +TIMER_OF_DECLARE (clint_timer2,"thead,c900-clint" , c900_clint_timer_init_dt); --
Quoted 2 lines
2.45.2
Any updates on this palmer?
It seems to be marked as handled elsewhere on patchwork, but i'm not sure where and iirc i didn't mark it as that.
https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
Thanks,
Jesse Taube
Quoted 104 lines · Jesse Taube
From: Jisheng Zhang <[email protected]>
To use the T-HEAD C9xx clint in RISCV-M NOMMU env, we need to take care two points:
1.The mtimecmp in T-Head C9xx clint only supports 32bit read/write, implement such support.
2. As pointed out by commit
ca7810aecdba("lib: utils/timer: mtimer:
add a quirk for lacking mtime register") of opensbi:"T-Head developers surely have a different understanding of time CSR and CLINT's mtime register with SiFive ones, that they did not implement the mtime register at all -- as shown in openC906 source code, their time CSR value is just exposed at the top of their processor IP block and expects an external continous counter, which makes it not overrideable, and thus mtime register is not implemented, even not for reading. However, if CLINTEE is not enabled in T-Head's MXSTATUS extended CSR, these systems still rely on the mtimecmp registers to generate timer interrupts. This makes it necessary to implement T-Head C9xx CLINT support in OpenSBI MTIMER driver, which skips implementing reading mtime register and falls back to default code that reads time CSR."
So, we need to fall back to read time CSR instead of mtime register. Add
riscv_csr_time_availablestatic key for this purpose.Signed-off-by Jisheng Zhang <[email protected]>Signed-off-by Jesse Taube <[email protected]>---
Treat this as a completely new patch, as it is mostly rewritten. Original:
https://lore.kernel.org/all/[email protected]/
V3 -> V4:
- Add riscv,csr-clint
- Allow using of CSRs in S mode
- Change if return else return to if return return
- Changestatic_branch_likelytostatic_branch_unlikely
- Fix 32-bitclint_get_cycles64csr_availablecheck being inverted
- Fixis_c900_clintbeing uninitialized
V4 -> V5:
- Remove riscv,csr-clint
- Removeriscv_csr_time_available
- Replace allstatic_branch_unlikely(&riscv_csr_time_available)withriscv_has_extension_likely(RISCV_ISA_EXT_ZICNTR)--- arch/riscv/include/asm/timex.h | 12 +++++++- drivers/clocksource/timer-clint.c | 50 +++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 6 deletions(-)arch/riscv/include/asm/timex.h +11
-1@@ -17,17 +17,26 @@ typedef unsigned long cycles_t;#ifdef CONFIG_64BIT static inline cycles_t get_cycles (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return readq_relaxed (clint_time_val); }#else /* !CONFIG_64BIT */ static inline u32 get_cycles (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +return readl_relaxed (((u32 *)clint_time_val)); }#define get_cycles get_cyclesstatic inline u32 get_cycles_hi (void ) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIMEH ); +return readl_relaxed (((u32 *)clint_time_val) +1 ); }#define get_cycles_hi get_cycles_hi@@ -40,7 +49,8 @@ static inline u32 get_cycles_hi(void)*/ static inline unsigned long random_get_entropy (void ) { -if (unlikely (clint_time_val ==NULL )) +if (!riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR ) && + (unlikely (clint_time_val ==NULL )))return random_get_entropy_fallback ();return get_cycles (); }drivers/clocksource/timer-clint.c +1
-0@@ -39,6 +39,7 @@ static u64 __iomem *clint_timer_cmp;static u64 __iomem *clint_timer_val;static unsigned long clint_timer_freq;static unsigned int clint_timer_irq; +static bool is_c900_clint;#ifdef CONFIG_RISCV_M_MODE u64 __iomem *clint_time_val;
drivers/clocksource/timer-clint.c static void clint_ipi_interrupt(struct irq_desc *desc) · line 85
Quoted 6 lines
drivers/clocksource/timer-clint.c +3
-0@@ -79,6 +80,9 @@ static void clint_ipi_interrupt(struct irq_desc *desc)#ifdef CONFIG_64BIT static u64 notrace clint_get_cycles64(void) { +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) +return csr_read (CSR_TIME ); +
Given the critical path from where this routine is called, I suggest to create a different function and figure out which one to use when calling sched_clock_register().
Quoted 12 lines
drivers/clocksource/timer-clint.c +1
-4return clint_get_cycles(); }#else /* CONFIG_64BIT */ @@ -86,10 +90,17 @@ static u64 notrace clint_get_cycles64(void) {u32 hi, lo; -do { - hi =clint_get_cycles_hi (); - lo =clint_get_cycles (); - }while (hi !=clint_get_cycles_hi ()); +if (riscv_has_extension_likely (RISCV_ISA_EXT_ZICNTR )) {
drivers/clocksource/timer-clint.c static u64 notrace clint_get_cycles64(void) · line 103
Quoted 10 lines
drivers/clocksource/timer-clint.c +10
-0+do { + hi =csr_read (CSR_TIMEH ); + lo =csr_read (CSR_TIME ); + }while (hi !=csr_read (CSR_TIMEH )); + }else { +do { + hi =clint_get_cycles_hi (); + lo =clint_get_cycles (); + }while (hi !=clint_get_cycles_hi ()); + }
Same comment here.
Quoted 60 lines
drivers/clocksource/timer-clint.c +30
-1return ((u64 )hi <<32 ) | lo; }@@ -119,6 +130,19 @@ static int clint_clock_next_event(unsigned long delta,return 0 ; } +static int c900_clint_clock_next_event (unsigned long delta, +struct clock_event_device *ce) +{ +void __iomem *r = clint_timer_cmp + +cpuid_to_hartid_map (smp_processor_id ()); +u64 val =clint_get_cycles64 () + delta; + +csr_set (CSR_IE ,IE_TIE ); +writel_relaxed (val, r); +writel_relaxed (val >>32 , r +4 ); +return 0 ; +} + static DEFINE_PER_CPU(struct clock_event_device, clint_clock_event) = { .name ="clint_clockevent" , .features =CLOCK_EVT_FEAT_ONESHOT ,@@ -130,6 +154,9 @@ static int clint_timer_starting_cpu(unsigned int cpu) {struct clock_event_device *ce =per_cpu_ptr (&clint_clock_event, cpu); +if (is_c900_clint) + ce->set_next_event = c900_clint_clock_next_event; + ce->cpumask =cpumask_of (cpu);clockevents_config_and_register (ce, clint_timer_freq,100 ,ULONG_MAX );@@ -161,7 +188,7 @@ static irqreturn_t clint_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int __init clint_timer_init_dt (struct device_node *np) +static int __init clint_timer_init (struct device_node *np) {int rc;u32 i, nr_irqs;@@ -273,5 +300,18 @@ static int __init clint_timer_init_dt(struct device_node *np)return rc; } +static int __init clint_timer_init_dt (struct device_node *np) +{ + is_c900_clint = false; +return clint_timer_init (np); +} + +static int __init c900_clint_timer_init_dt (struct device_node *np) +{ + is_c900_clint = true; +return clint_timer_init (np); +} +TIMER_OF_DECLARE (clint_timer,"riscv,clint0" , clint_timer_init_dt);TIMER_OF_DECLARE (clint_timer1,"sifive,clint0" , clint_timer_init_dt); +TIMER_OF_DECLARE (clint_timer2,"thead,c900-clint" , c900_clint_timer_init_dt);
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog