Skip to content

Commit eaa9bb1

Browse files
pshimizuPaul Walmsley
authored andcommitted
riscv: clocksource: Fix stimecmp update hazard on RV32
On RV32, updating the 64-bit stimecmp (or vstimecmp) CSR requires two separate 32-bit writes. A race condition exists if the timer triggers during these two writes. The RISC-V Privileged Specification (e.g., Section 3.2.1 for mtimecmp) recommends a specific 3-step sequence to avoid spurious interrupts when updating 64-bit comparison registers on 32-bit systems: 1. Set the low-order bits (stimecmp) to all ones (ULONG_MAX). 2. Set the high-order bits (stimecmph) to the desired value. 3. Set the low-order bits (stimecmp) to the desired value. Current implementation writes the LSB first without ensuring a future value, which may lead to a transient state where the 64-bit comparison is incorrectly evaluated as "expired" by the hardware. This results in spurious timer interrupts. This patch adopts the spec-recommended 3-step sequence to ensure the intermediate 64-bit state is never smaller than the current time. Fixes: 9f7a8ff ("RISC-V: Prefer sstc extension if available") Signed-off-by: Naohiko Shimizu <naohiko.shimizu@gmail.com> Reviewed-by: Anup Patel <anup@brainfault.org> Link: https://patch.msgid.link/20260104135938.524-2-naohiko.shimizu@gmail.com Signed-off-by: Paul Walmsley <pjw@kernel.org>
1 parent 69132c2 commit eaa9bb1

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/clocksource/timer-riscv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ static int riscv_clock_next_event(unsigned long delta,
5050

5151
if (static_branch_likely(&riscv_sstc_available)) {
5252
#if defined(CONFIG_32BIT)
53-
csr_write(CSR_STIMECMP, next_tval & 0xFFFFFFFF);
53+
csr_write(CSR_STIMECMP, ULONG_MAX);
5454
csr_write(CSR_STIMECMPH, next_tval >> 32);
55+
csr_write(CSR_STIMECMP, next_tval & 0xFFFFFFFF);
5556
#else
5657
csr_write(CSR_STIMECMP, next_tval);
5758
#endif

0 commit comments

Comments
 (0)