Message ID | 20240206132931.38376-6-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | hw/arm: Implement new machine mps3-an536 (Cortex-R52 MPS3 AN536 FPGA image) | expand |
On 6/2/24 14:29, Peter Maydell wrote: > We currently guard the CFG3 register read with > (scc_partno(s) == 0x524 && scc_partno(s) == 0x547) > which is clearly wrong as it is never true. > > This register is present on all board types except AN524 > and AN527; correct the condition. > > Fixes: 6ac80818941829c0 ("hw/misc/mps2-scc: Implement changes for AN547") Oops. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/misc/mps2-scc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
On 2/6/24 23:29, Peter Maydell wrote: > We currently guard the CFG3 register read with > (scc_partno(s) == 0x524 && scc_partno(s) == 0x547) > which is clearly wrong as it is never true. > > This register is present on all board types except AN524 > and AN527; correct the condition. > > Fixes: 6ac80818941829c0 ("hw/misc/mps2-scc: Implement changes for AN547") > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> > --- > hw/misc/mps2-scc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 6cfb5ff1086..6c1b1cd3795 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -118,7 +118,7 @@ static uint64_t mps2_scc_read(void *opaque, hwaddr offset, unsigned size) r = s->cfg2; break; case A_CFG3: - if (scc_partno(s) == 0x524 && scc_partno(s) == 0x547) { + if (scc_partno(s) == 0x524 || scc_partno(s) == 0x547) { /* CFG3 reserved on AN524 */ goto bad_offset; }
We currently guard the CFG3 register read with (scc_partno(s) == 0x524 && scc_partno(s) == 0x547) which is clearly wrong as it is never true. This register is present on all board types except AN524 and AN527; correct the condition. Fixes: 6ac80818941829c0 ("hw/misc/mps2-scc: Implement changes for AN547") Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/misc/mps2-scc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)