summary refs log tree commit diff stats
path: root/hw/misc/mps2-scc.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-02-06 13:29:23 +0000
committerPeter Maydell <peter.maydell@linaro.org>2024-02-15 14:32:38 +0000
commita72e625078d4766367510887552f8c2f49bd7039 (patch)
treec02f9da63a55e5c6b87edefca97006481b3d9c35 /hw/misc/mps2-scc.c
parentf2b4a98930c122648e9dc494e49cea5dffbcc2be (diff)
downloadfocaccia-qemu-a72e625078d4766367510887552f8c2f49bd7039.tar.gz
focaccia-qemu-a72e625078d4766367510887552f8c2f49bd7039.zip
hw/misc/mps2-scc: Fix condition for CFG3 register
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240206132931.38376-6-peter.maydell@linaro.org
Diffstat (limited to 'hw/misc/mps2-scc.c')
-rw-r--r--hw/misc/mps2-scc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index 6cfb5ff108..6c1b1cd379 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;
         }