From: Naohiko Shimizu <naohiko.shimizu@gmail.com>
To: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu
Cc: alex@ghiti.fr, anup@brainfault.org, atish.patra@linux.dev,
daniel.lezcano@linaro.org, tglx@linutronix.de,
nick.hu@sifive.com, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
kvm-riscv@lists.infradead.org,
Naohiko Shimizu <naohiko.shimizu@gmail.com>
Subject: [PATCH v3 3/3] riscv: suspend: Fix stimecmp update hazard on RV32
Date: Sun, 4 Jan 2026 22:59:38 +0900 [thread overview]
Message-ID: <20260104135938.524-4-naohiko.shimizu@gmail.com> (raw)
In-Reply-To: <20260104135938.524-1-naohiko.shimizu@gmail.com>
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: ffef54ad4110 ("riscv: Add stimecmp save and restore")
Signed-off-by: Naohiko Shimizu <naohiko.shimizu@gmail.com>
---
arch/riscv/kernel/suspend.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/kernel/suspend.c b/arch/riscv/kernel/suspend.c
index 24b3f57d467f..aff93090c4ef 100644
--- a/arch/riscv/kernel/suspend.c
+++ b/arch/riscv/kernel/suspend.c
@@ -51,10 +51,11 @@ void suspend_restore_csrs(struct suspend_context *context)
#ifdef CONFIG_MMU
if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SSTC)) {
- csr_write(CSR_STIMECMP, context->stimecmp);
#if __riscv_xlen < 64
+ csr_write(CSR_STIMECMP, ULONG_MAX);
csr_write(CSR_STIMECMPH, context->stimecmph);
#endif
+ csr_write(CSR_STIMECMP, context->stimecmp);
}
csr_write(CSR_SATP, context->satp);
--
2.39.5
next prev parent reply other threads:[~2026-01-04 14:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-04 13:59 [PATCH v3 0/3] riscv: fix timer update hazards " Naohiko Shimizu
2026-01-04 13:59 ` [PATCH v3 1/3] riscv: clocksource: Fix stimecmp update hazard " Naohiko Shimizu
2026-01-05 4:31 ` Anup Patel
2026-01-04 13:59 ` [PATCH v3 2/3] riscv: kvm: Fix vstimecmp " Naohiko Shimizu
2026-01-05 4:31 ` Anup Patel
2026-01-15 1:11 ` Naohiko Shimizu
2026-01-04 13:59 ` Naohiko Shimizu [this message]
2026-01-05 4:31 ` [PATCH v3 3/3] riscv: suspend: Fix stimecmp " Anup Patel
2026-01-15 0:39 ` [PATCH v3 0/3] riscv: fix timer update hazards " Paul Walmsley
2026-01-15 1:11 ` Naohiko Shimizu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260104135938.524-4-naohiko.shimizu@gmail.com \
--to=naohiko.shimizu@gmail.com \
--cc=alex@ghiti.fr \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atish.patra@linux.dev \
--cc=daniel.lezcano@linaro.org \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=nick.hu@sifive.com \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®