]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Fri, 25 Oct 2019 11:01:14 +0000 (13:01 +0200)
committerLaurent Vivier <laurent@vivier.eu>
Tue, 5 Nov 2019 14:02:33 +0000 (15:02 +0100)
The Plug & Play region of the AHB/APB bridge can be accessed
by various word size, however the implementation is clearly
restricted to 32-bit:

  static uint64_t grlib_apb_pnp_read(void *opaque, hwaddr offset, unsigned size)
  {
      APBPnp *apb_pnp = GRLIB_APB_PNP(opaque);

      return apb_pnp->regs[offset >> 2];
  }

Set the MemoryRegionOps::impl min/max fields to 32-bit, so
memory.c::access_with_adjusted_size() can adjust when the
access is not 32-bit.

This is required to run RTEMS on leon3, the grlib scanning
functions do byte accesses.

Reported-by: Jiri Gaisler <jiri@gaisler.se>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Message-Id: <20191025110114.27091-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
hw/misc/grlib_ahb_apb_pnp.c

index f3c015d2c35fc2e6a86ca4de538b40ad6a7fcbbb..e230e2536361bfc02e87136f6f90a0c4ef86dc4c 100644 (file)
@@ -242,6 +242,10 @@ static const MemoryRegionOps grlib_apb_pnp_ops = {
     .read       = grlib_apb_pnp_read,
     .write      = grlib_apb_pnp_write,
     .endianness = DEVICE_BIG_ENDIAN,
+    .impl = {
+        .min_access_size = 4,
+        .max_access_size = 4,
+    },
 };
 
 static void grlib_apb_pnp_realize(DeviceState *dev, Error **errp)