[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/20] nubus: generate bus error when attempting to access empty s
From: |
Laurent Vivier |
Subject: |
[PULL 08/20] nubus: generate bus error when attempting to access empty slots |
Date: |
Wed, 29 Sep 2021 11:28:31 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
According to "Designing Cards and Drivers for the Macintosh Family" any attempt
to access an unimplemented address location on Nubus generates a bus error.
MacOS
uses a custom bus error handler to detect empty Nubus slots, and with the
current
implementation assumes that all slots are occupied as the Nubus transactions
never fail.
Switch nubus_slot_ops and nubus_super_slot_ops over to use
{read,write}_with_attrs
and hard-code them to return MEMTX_DECODE_ERROR so that unoccupied Nubus slots
will generate the expected bus error.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210924073808.1041-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/nubus/nubus-bus.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/hw/nubus/nubus-bus.c b/hw/nubus/nubus-bus.c
index a9fb6ded9e4e..215fdb6b4ec2 100644
--- a/hw/nubus/nubus-bus.c
+++ b/hw/nubus/nubus-bus.c
@@ -28,23 +28,23 @@ static NubusBus *nubus_find(void)
return NUBUS_BUS(object_resolve_path_type("", TYPE_NUBUS_BUS, NULL));
}
-static void nubus_slot_write(void *opaque, hwaddr addr, uint64_t val,
- unsigned int size)
+static MemTxResult nubus_slot_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned size, MemTxAttrs attrs)
{
- /* read only */
trace_nubus_slot_write(addr, val, size);
+ return MEMTX_DECODE_ERROR;
}
-static uint64_t nubus_slot_read(void *opaque, hwaddr addr,
- unsigned int size)
+static MemTxResult nubus_slot_read(void *opaque, hwaddr addr, uint64_t *data,
+ unsigned size, MemTxAttrs attrs)
{
trace_nubus_slot_read(addr, size);
- return 0;
+ return MEMTX_DECODE_ERROR;
}
static const MemoryRegionOps nubus_slot_ops = {
- .read = nubus_slot_read,
- .write = nubus_slot_write,
+ .read_with_attrs = nubus_slot_read,
+ .write_with_attrs = nubus_slot_write,
.endianness = DEVICE_BIG_ENDIAN,
.valid = {
.min_access_size = 1,
@@ -52,23 +52,25 @@ static const MemoryRegionOps nubus_slot_ops = {
},
};
-static void nubus_super_slot_write(void *opaque, hwaddr addr, uint64_t val,
- unsigned int size)
+static MemTxResult nubus_super_slot_write(void *opaque, hwaddr addr,
+ uint64_t val, unsigned size,
+ MemTxAttrs attrs)
{
- /* read only */
trace_nubus_super_slot_write(addr, val, size);
+ return MEMTX_DECODE_ERROR;
}
-static uint64_t nubus_super_slot_read(void *opaque, hwaddr addr,
- unsigned int size)
+static MemTxResult nubus_super_slot_read(void *opaque, hwaddr addr,
+ uint64_t *data, unsigned size,
+ MemTxAttrs attrs)
{
trace_nubus_super_slot_read(addr, size);
- return 0;
+ return MEMTX_DECODE_ERROR;
}
static const MemoryRegionOps nubus_super_slot_ops = {
- .read = nubus_super_slot_read,
- .write = nubus_super_slot_write,
+ .read_with_attrs = nubus_super_slot_read,
+ .write_with_attrs = nubus_super_slot_write,
.endianness = DEVICE_BIG_ENDIAN,
.valid = {
.min_access_size = 1,
--
2.31.1
- [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), (continued)
- [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Laurent Vivier, 2021/09/29
- [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs, Laurent Vivier, 2021/09/29
- [PULL 12/20] nubus: move nubus to its own 32-bit address space, Laurent Vivier, 2021/09/29
- [PULL 02/20] nubus-device: rename slot_nb variable to slot, Laurent Vivier, 2021/09/29
- [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 03/20] nubus-device: expose separate super slot memory region, Laurent Vivier, 2021/09/29
- [PULL 06/20] nubus: implement BusClass get_dev_path(), Laurent Vivier, 2021/09/29
- [PULL 18/20] nubus: add support for slot IRQs, Laurent Vivier, 2021/09/29
- [PULL 07/20] nubus: add trace-events for empty slot accesses, Laurent Vivier, 2021/09/29
- [PULL 08/20] nubus: generate bus error when attempting to access empty slots,
Laurent Vivier <=
- [PULL 20/20] q800: configure nubus available slots for Quadra 800, Laurent Vivier, 2021/09/29
- [PULL 13/20] nubus-bridge: introduce separate NubusBridge structure, Laurent Vivier, 2021/09/29
- [PULL 19/20] q800: wire up nubus IRQs, Laurent Vivier, 2021/09/29
- [PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Laurent Vivier, 2021/09/29
- [PULL 17/20] nubus-bridge: make slot_available_mask a qdev property, Laurent Vivier, 2021/09/29
- Re: [PULL 00/20] Q800 for 6.2 patches, Peter Maydell, 2021/09/30