Skip to contentSkip to conversation

clocksource: timer-riscv: Clear timer interrupt on timer initialization

PATCH Applied Ley Foon Tan 5 participants 5 messages Mar 6, 2024 – Mar 18, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 clocksource: timer-riscv: Clear timer interrupt on timer initialization

In the RISC-V specification, the stimecmp register doesn't have a default value. To prevent the timer interrupt from being triggered during timer initialization, clear the timer interrupt by writing stimecmp with a maximum value.

Fixes 9f7a8ff6391f ("RISC-V: Prefer sstc extension if available")

---
v3:
Resolved comment from Samuel Holland.
- Function riscv_clock_event_stop() needs to be called before clockevents_config_and_register(), move riscv_clock_event_stop().

v2:
Resolved comments from Anup.
- Moved riscv_clock_event_stop() to riscv_timer_starting_cpu().
- Added Fixes tag

---
 drivers/clocksource/timer-riscv.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/clocksource/timer-riscv.c +3 -0
index e66dcbd66566..79bb9a98baa7 100644
@@ -108,6 +108,9 @@ static int riscv_timer_starting_cpu(unsigned int cpu)
 {
 	struct clock_event_device *ce = per_cpu_ptr(&riscv_clock_event, cpu);
 
+	/* Clear timer interrupt */
+	riscv_clock_event_stop();
+
 	ce->cpumask = cpumask_of(cpu);
 	ce->irq = riscv_clock_event_irq;
 	if (riscv_timer_cannot_wake_cpu)
Signature · 1 line
2.43.0
Reviewed-by Tested-by on v3 1/1
#1 lore raw
Quoted 15 lines · Ley Foon Tan

In the RISC-V specification, the stimecmp register doesn't have a default value. To prevent the timer interrupt from being triggered during timer initialization, clear the timer interrupt by writing stimecmp with a maximum value.

Fixes 9f7a8ff6391f ("RISC-V: Prefer sstc extension if available")

---
v3:
Resolved comment from Samuel Holland.
- Function riscv_clock_event_stop() needs to be called before clockevents_config_and_register(), move riscv_clock_event_stop().

Quoted 7 lines

v2:
Resolved comments from Anup.
- Moved riscv_clock_event_stop() to riscv_timer_starting_cpu().
- Added Fixes tag

---
 drivers/clocksource/timer-riscv.c | 3 +++
 1 file changed, 3 insertions(+)
Reviewed-by
#2 lore raw
Quoted 25 lines · Samuel Holland
Quoted 15 lines · Ley Foon Tan

In the RISC-V specification, the stimecmp register doesn't have a default value. To prevent the timer interrupt from being triggered during timer initialization, clear the timer interrupt by writing stimecmp with a maximum value.

Fixes 9f7a8ff6391f ("RISC-V: Prefer sstc extension if available")

---
v3:
Resolved comment from Samuel Holland.
- Function riscv_clock_event_stop() needs to be called before clockevents_config_and_register(), move riscv_clock_event_stop().

Quoted 7 lines

v2:
Resolved comments from Anup.
- Moved riscv_clock_event_stop() to riscv_timer_starting_cpu().
- Added Fixes tag

---
 drivers/clocksource/timer-riscv.c | 3 +++
 1 file changed, 3 insertions(+)
Quoted 3 lines
#3 lore raw
In reply to Ley Foon Tan
Quoted 10 lines · Ley Foon Tan

In the RISC-V specification, the stimecmp register doesn't have a default value. To prevent the timer interrupt from being triggered during timer initialization, clear the timer interrupt by writing stimecmp with a maximum value.

Fixes 9f7a8ff6391f ("RISC-V: Prefer sstc extension if available")

---

Applied, thanks

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
merge bot Applied
#4 lore raw

[tip: timers/core] clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization

In reply to Ley Foon Tan
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     8248ca30ef89f9cc74ace62ae1b9a22b5f16736c
Gitweb:        https://git.kernel.org/tip/8248ca30ef89f9cc74ace62ae1b9a22b5f16736c
Author:        Ley Foon Tan <[email protected]>
AuthorDate:    Thu, 07 Mar 2024 01:23:30 +08:00
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Wed, 13 Mar 2024 12:08:59 +01:00

clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization

In the RISC-V specification, the stimecmp register doesn't have a default value. To prevent the timer interrupt from being triggered during timer initialization, clear the timer interrupt by writing stimecmp with a maximum value.

---
 drivers/clocksource/timer-riscv.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/clocksource/timer-riscv.c +3 -0
index e66dcbd..79bb9a9 100644
@@ -108,6 +108,9 @@ static int riscv_timer_starting_cpu(unsigned int cpu)
 {
 	struct clock_event_device *ce = per_cpu_ptr(&riscv_clock_event, cpu);
 
+	/* Clear timer interrupt */
+	riscv_clock_event_stop();
+
 	ce->cpumask = cpumask_of(cpu);
 	ce->irq = riscv_clock_event_irq;
 	if (riscv_timer_cannot_wake_cpu)