diff mbox series

[RFC,PATCH-not-for-5.1?] hw/isa/isa-bus: Ensure ISA I/O regions are 8/16/32-bit accessible

Message ID 20200720182613.10857-1-f4bug@amsat.org
State New
Headers show
Series [RFC,PATCH-not-for-5.1?] hw/isa/isa-bus: Ensure ISA I/O regions are 8/16/32-bit accessible | expand

Commit Message

Philippe Mathieu-Daudé July 20, 2020, 6:26 p.m. UTC 
Since commit 5d971f9e67 we don't accept mismatching sizes
in memory_region_access_valid(). This gives troubles when
a device is on an ISA bus, because the CPU is free to use
8/16/32-bit accesses on the bus, regardless what range is
valid for the device.

Add a check to ensure devices plugged on the ISA bus can
accept 8/16/32-bits accesses.

Related bug reports:

- https://lore.kernel.org/xen-devel/20200630170913.123646-1-anthony.perard@citrix.com/T/
- https://bugs.debian.org/964793
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964247
- https://bugs.launchpad.net/bugs/1886318

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
MST: I really don't like this approach, I think the ISA bus
     should adjust the access.
---
 hw/isa/isa-bus.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
diff mbox series

Patch

diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 58fde178f9..3d97ad1bdd 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -132,6 +132,17 @@  static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport)
 
 void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start)
 {
+    if (io->ops->valid.min_access_size > 1) {
+        /* CPU can always use 8-bit accesses on an ISA bus */
+        error_report("ISA device '%s' requires I/O min_access_size of 1",
+                     object_get_typename(OBJECT(dev)));
+        exit(1);
+    } else if (io->ops->valid.max_access_size < 4) {
+        /* CPU can always use 32-bit accesses on an ISA bus */
+        error_report("ISA device '%s' requires I/O max_access_size of 4",
+                     object_get_typename(OBJECT(dev)));
+        exit(1);
+    }
     memory_region_add_subregion(isabus->address_space_io, start, io);
     isa_init_ioport(dev, start);
 }