target/riscv: fix user-mode build issue because mhartid
PATCH v2 1/1 target/riscv: fix user-mode build issue because mhartid
mhartid csr is not available in user-mode code path and user-mode build fails because of its reference in riscv_cpu_realize function
Commit causing the issue is currently in Alistair's riscv-to-apply.next branch and need to be squashed there.
---
Changes in V2:
- remove the stray format specifier
- add the Fixes tag and reference to external tree
--- target/riscv/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+)
target/riscv/cpu.c +6 -0
@@ -636,9 +636,15 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)if (isa_ext_is_enabled (cpu, &isa_edata_arr[i]) && (env->priv_ver < isa_edata_arr[i].min_version)) {isa_ext_update_enabled (cpu, &isa_edata_arr[i], false); +#ifndef CONFIG_USER_ONLY warn_report ("disabling %s extension for hart 0x%lx because " "privilege spec version does not match" , isa_edata_arr[i].name, (unsigned long )env->mhartid); +#else +warn_report ("disabling %s extension for hart because " +"privilege spec version does not match" , + isa_edata_arr[i].name); +#endif } }
Signature · 1 line
2.34.1
Sorry for spamming but my send-email script misbehaved and sent the v2 patch two times. Please ignore one of the v2 patch
Quoted 43 lines · Rahul Pathak
mhartid csr is not available in user-mode code path and user-mode build fails because of its reference in
riscv_cpu_realizefunctionCommit causing the issue is currently in Alistair's riscv-to-apply.next branch and need to be squashed there.
Fixes 7ecee770d40 ("target/riscv: Force disable extensions if priv spec version does not match")Signed-off-by Rahul Pathak <[email protected]>---
Changes in V2:
- remove the stray format specifier
- add the Fixes tag and reference to external tree--- target/riscv/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+)target/riscv/cpu.c +6
-1@@ -636,9 +636,15 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)if (isa_ext_is_enabled (cpu, &isa_edata_arr[i]) && (env->priv_ver < isa_edata_arr[i].min_version)) {isa_ext_update_enabled (cpu, &isa_edata_arr[i], false); +#ifndef CONFIG_USER_ONLY warn_report ("disabling %s extension for hart 0x%lx because " "privilege spec version does not match" , isa_edata_arr[i].name, (unsigned long )env->mhartid); +#else +warn_report ("disabling %s extension for hart because " +"privilege spec version does not match" , + isa_edata_arr[i].name); +#endif } } --2.34.1
Signature · 2 lines
Thanks Rahul Pathak