Re: [PATCH] riscv: cpu: Fix incorrect cached machine IDs on secondary harts

From: Inochi Amaoto

Date: Wed Nov 18 2026 - 06:30:06 EST


On Wed, Nov 18, 2026 at 11:04:33AM +0800, Peixin Xie wrote:
> During early ISA-string parsing, the boot hart stores its mvendorid
> and marchid in riscv_cpuinfo. This happens before setup_per_cpu_areas(),
> which copies the static per-CPU data to each CPU's allocated area.
>
> When riscv_cpuinfo_starting() runs on the other harts, the copied IDs
> are already nonzero, so it skips reading their own IDs. As a result,
> secondary harts can retain the boot hart's IDs.
>
> Read mvendorid and marchid unconditionally on each hart, as already
> done for mimpid.
>
> Fixes: e482eab4d1eb ("riscv: cpufeature: Fix thead vector hwcap removal")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Peixin Xie <peixin.xie@xxxxxxxxxxxxxxxxxx>
> ---
> arch/riscv/kernel/cpu.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
> index af84b97af3a1..64c0c83eff76 100644
> --- a/arch/riscv/kernel/cpu.c
> +++ b/arch/riscv/kernel/cpu.c
> @@ -197,16 +197,12 @@ static int riscv_cpuinfo_starting(unsigned int cpu)
> struct riscv_cpuinfo *ci = this_cpu_ptr(&riscv_cpuinfo);
>
> #if IS_ENABLED(CONFIG_RISCV_SBI)
> - if (!ci->mvendorid)
> - ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
> - if (!ci->marchid)
> - ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
> + ci->mvendorid = sbi_spec_is_0_1() ? 0 : sbi_get_mvendorid();
> + ci->marchid = sbi_spec_is_0_1() ? 0 : sbi_get_marchid();
> ci->mimpid = sbi_spec_is_0_1() ? 0 : sbi_get_mimpid();
> #elif IS_ENABLED(CONFIG_RISCV_M_MODE)
> - if (!ci->mvendorid)
> - ci->mvendorid = csr_read(CSR_MVENDORID);
> - if (!ci->marchid)
> - ci->marchid = csr_read(CSR_MARCHID);
> + ci->mvendorid = csr_read(CSR_MVENDORID);
> + ci->marchid = csr_read(CSR_MARCHID);
> ci->mimpid = csr_read(CSR_MIMPID);
> #else
> ci->mvendorid = 0;
>
> ---
> base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
> change-id: 20261118-riscv-marchid-fix-3ea3672d1e0e
>
> Best regards,
> --
> Peixin Xie <peixin.xie@xxxxxxxxxxxxxxxxxx>
>

LGTM.

Reviewed-by: Inochi Amaoto <inochiama@xxxxxxxxx>