Skip to content

Commit 344c528

Browse files
pshimizuPaul Walmsley
authored andcommitted
riscv: suspend: 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: ffef54a ("riscv: Add stimecmp save and restore") Signed-off-by: Naohiko Shimizu <naohiko.shimizu@gmail.com> Reviewed-by: Anup Patel <anup@brainfault.org> Link: https://patch.msgid.link/20260104135938.524-4-naohiko.shimizu@gmail.com Signed-off-by: Paul Walmsley <pjw@kernel.org>
1 parent 7587063 commit 344c528

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/riscv/kernel/suspend.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ void suspend_restore_csrs(struct suspend_context *context)
5151

5252
#ifdef CONFIG_MMU
5353
if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SSTC)) {
54-
csr_write(CSR_STIMECMP, context->stimecmp);
5554
#if __riscv_xlen < 64
55+
csr_write(CSR_STIMECMP, ULONG_MAX);
5656
csr_write(CSR_STIMECMPH, context->stimecmph);
5757
#endif
58+
csr_write(CSR_STIMECMP, context->stimecmp);
5859
}
5960

6061
csr_write(CSR_SATP, context->satp);

0 commit comments

Comments
 (0)