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
Quoted 9 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")
Can you please re-send the original patch with the fix? I have removed this patch from my tree
Alistair
Quoted 35 lines
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
Hi Alistair
My fix patch needs to be dropped since Anup took care of this issue in his yesterdays series update in this patch -
[PATCH v8 4/4] target/riscv: Force disable extensions if priv spec version does not match
Thanks
Rahul
Quoted 52 lines · Alistair Francis
Quoted 9 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")Can you please re-send the original patch with the fix? I have removed this patch from my tree
Alistair
Quoted 35 lines
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
Hi Rahul,
Quoted 7 lines · Rahul Pathak
Hi Alistair
My fix patch needs to be dropped since Anup took care of this issue in his yesterdays series update in this patch -
[PATCH v8 4/4] target/riscv: Force disable extensions if priv spec version does not match
I don't understand. Each patch should keep bisectability.
This sounds like to me, that
[PATCH v8 4/4] target/riscv: Force disable extensions if priv spec version does not match
has an issue that it does 2 things: one is to fix this bug, and the other one is to force disable extensions.
Which is not right.
Regards,
Bin
Quoted 5 lines · Bin Meng
Hi Rahul,
Quoted 1 line · Rahul Pathak
Quoted 8 lines
Quoted 6 lines
Hi Alistair
My fix patch needs to be dropped since Anup took care of this issue in his yesterdays series update in this patch -
[PATCH v8 4/4] target/riscv: Force disable extensions if priv spec version does not matchI don't understand. Each patch should keep bisectability.
The patches are already bisectable. There was a compile error until v6 which was fixed in v7 by squashing this patch into PATCH4.
Quoted 9 lines
This sounds like to me, that
[PATCH v8 4/4] target/riscv: Force disable extensions if priv spec version does not matchhas an issue that it does 2 things: one is to fix this bug, and the other one is to force disable extensions.
Which is not right.
The bug is fixed as a result of force disabling extensions which don't match the priv spec version.
Regards,
Anup