| Message ID | 20240802-hvf-v1-1-e2c0292037e5@daynix.com |
|---|---|
| State | New |
| Headers | show |
| Series | hvf: arm: Fix hvf_sysreg_read_cp() call | expand |
On Fri, 2 Aug 2024 at 09:37, Akihiko Odaki <akihiko.odaki@daynix.com> wrote: > > Commit 05b8d7249109 ("hvf: arm: Do not advance PC when raising an > exception") changed val from uint64_t to a pointer to uint64_t in > hvf_sysreg_read(), but didn't change its hvf_sysreg_read_cp() call. > > Fixes: 05b8d7249109 ("hvf: arm: Do not advance PC when raising an exception") > Reported-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> Richard: I'm not going to be back at work til next Thursday: feel free to grab this and apply directly to fix the cirrus build. thanks -- PMM
On 8/2/24 18:44, Peter Maydell wrote: > On Fri, 2 Aug 2024 at 09:37, Akihiko Odaki <akihiko.odaki@daynix.com> wrote: >> >> Commit 05b8d7249109 ("hvf: arm: Do not advance PC when raising an >> exception") changed val from uint64_t to a pointer to uint64_t in >> hvf_sysreg_read(), but didn't change its hvf_sysreg_read_cp() call. >> >> Fixes: 05b8d7249109 ("hvf: arm: Do not advance PC when raising an exception") >> Reported-by: Richard Henderson <richard.henderson@linaro.org> >> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > > Richard: I'm not going to be back at work til next Thursday: > feel free to grab this and apply directly to fix the cirrus > build. Will do, thanks for the heads up. r~
On 2/8/24 10:37, Akihiko Odaki wrote: > Commit 05b8d7249109 ("hvf: arm: Do not advance PC when raising an > exception") changed val from uint64_t to a pointer to uint64_t in > hvf_sysreg_read(), but didn't change its hvf_sysreg_read_cp() call. > > Fixes: 05b8d7249109 ("hvf: arm: Do not advance PC when raising an exception") Not 05b8d7249109 but e9e640148c. Fixes: e9e640148c ("hvf: arm: Raise an exception for sysreg by default") Updating description: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reported-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > target/arm/hvf/hvf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
On 8/2/24 18:37, Akihiko Odaki wrote: > Commit 05b8d7249109 ("hvf: arm: Do not advance PC when raising an > exception") changed val from uint64_t to a pointer to uint64_t in > hvf_sysreg_read(), but didn't change its hvf_sysreg_read_cp() call. > > Fixes: 05b8d7249109 ("hvf: arm: Do not advance PC when raising an exception") > Reported-by: Richard Henderson<richard.henderson@linaro.org> > Signed-off-by: Akihiko Odaki<akihiko.odaki@daynix.com> > --- > target/arm/hvf/hvf.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. r~
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index c1496ad5be9b..ace83671b594 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1280,7 +1280,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint64_t *val) case SYSREG_ICC_SRE_EL1: case SYSREG_ICC_CTLR_EL1: /* Call the TCG sysreg handler. This is only safe for GICv3 regs. */ - if (hvf_sysreg_read_cp(cpu, reg, &val)) { + if (hvf_sysreg_read_cp(cpu, reg, val)) { return 0; } break;
Commit 05b8d7249109 ("hvf: arm: Do not advance PC when raising an exception") changed val from uint64_t to a pointer to uint64_t in hvf_sysreg_read(), but didn't change its hvf_sysreg_read_cp() call. Fixes: 05b8d7249109 ("hvf: arm: Do not advance PC when raising an exception") Reported-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- target/arm/hvf/hvf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 31669121a01a14732f57c49400bc239cf9fd505f change-id: 20240802-hvf-40971c54eccf Best regards,