* [PATCH] riscv: errata: mips: Skip vendor extension lookup during early alternatives
@ 2026-11-19 2:43 Karl Mehltretter
0 siblings, 0 replies; only message in thread
From: Karl Mehltretter @ 2026-11-19 2:43 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti
Cc: Karl Mehltretter, Aleksa Paunovic, Djordje Todorovic,
Michael Neuling, Raj Vishwanathan4, Aleksandar Rikalo,
linux-riscv, linux-kernel
When an enabled erratum selects RISCV_ALTERNATIVE_EARLY,
apply_early_boot_alternatives() calls the MIPS errata callback from
setup_vm() with the MMU disabled. Each enabled P8700 probe calls
riscv_isa_vendor_extension_available() before rejecting
RISCV_ALTERNATIVES_EARLY_BOOT, although neither workaround is applied in
that stage.
KASAN instrumentation in __riscv_isa_vendor_extension_available() reads
shadow memory with satp=0. On QEMU's mips-p8700 model and on a Boston
board with a MIPS P8700 CPU under KASAN_INLINE, this faults during early
boot before console output starts.
Move the existing early-stage rejection before the extension lookup in both
probes. All later stages retain their existing lookup and patch selection.
Fixes: 0b0ca959d206 ("riscv: errata: Fix the PAUSE Opcode for MIPS P8700")
Fixes: 2cf0b2992203 ("riscv: Add ERRATA_MIPS_P8700_WFI to replace WFI with mips.pause")
Tested-by: Aleksa Paunovic <aleksa.paunovic@htecgroup.com>
Signed-off-by: Karl Mehltretter <kmehltretter@gmail.com>
---
Assisted by an LLM.
Reposting without RFT after Aleksa Paunovic reproduced the bug and
verified the fix on a Boston board with a single-core MIPS P8700 CPU
under KASAN_INLINE.
Changes since the RFT [1]:
- Dropped the RFT tag and added Aleksa Paunovic's Tested-by.
- Rebased onto riscv/fixes (5c52d52b1b8a); no code changes.
- Dropped the removed Assisted-by trailer.
[1] https://lore.kernel.org/r/20261016203052.2026-1-kmehltretter@gmail.com
arch/riscv/errata/mips/errata.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/riscv/errata/mips/errata.c b/arch/riscv/errata/mips/errata.c
index 6e71555274..9bb1c3de95 100644
--- a/arch/riscv/errata/mips/errata.c
+++ b/arch/riscv/errata/mips/errata.c
@@ -18,10 +18,10 @@ static inline bool errata_probe_pause(unsigned int stage)
if (!IS_ENABLED(CONFIG_ERRATA_MIPS_P8700_PAUSE_OPCODE))
return false;
- if (!riscv_isa_vendor_extension_available(MIPS_VENDOR_ID, XMIPSEXECTL))
+ if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
return false;
- if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
+ if (!riscv_isa_vendor_extension_available(MIPS_VENDOR_ID, XMIPSEXECTL))
return false;
return true;
@@ -32,10 +32,10 @@ static inline bool errata_probe_wfi(unsigned int stage)
if (!IS_ENABLED(CONFIG_ERRATA_MIPS_P8700_WFI))
return false;
- if (!riscv_isa_vendor_extension_available(MIPS_VENDOR_ID, XMIPSEXECTL))
+ if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
return false;
- if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
+ if (!riscv_isa_vendor_extension_available(MIPS_VENDOR_ID, XMIPSEXECTL))
return false;
return true;
base-commit: 5c52d52b1b8a2f884b8fdfe3c74741ad5b48f2ce
--
2.39.5 (Apple Git-154)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-19 2:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 2:43 [PATCH] riscv: errata: mips: Skip vendor extension lookup during early alternatives Karl Mehltretter
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®