[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 03/20] nubus-device: expose separate super slot memory region
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v6 03/20] nubus-device: expose separate super slot memory region |
Date: |
Fri, 24 Sep 2021 08:37:51 +0100 |
According to "Designing Cards and Drivers for the Macintosh Family" each
physical
nubus slot can access 2 separate address ranges: a super slot memory region
which
is 256MB and a standard slot memory region which is 16MB.
Currently a Nubus device uses the physical slot number to determine whether it
is
using a standard slot memory region or a super slot memory region rather than
exposing both memory regions for use as required.
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>
---
hw/nubus/nubus-device.c | 36 ++++++++++++++++++------------------
include/hw/nubus/nubus.h | 1 +
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index be01269563..4e23df1280 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -168,26 +168,26 @@ static void nubus_device_realize(DeviceState *dev, Error
**errp)
}
nd->slot = nubus->current_slot++;
- name = g_strdup_printf("nubus-slot-%d", nd->slot);
-
- if (nd->slot < NUBUS_FIRST_SLOT) {
- /* Super */
- slot_offset = (nd->slot - 6) * NUBUS_SUPER_SLOT_SIZE;
-
- memory_region_init(&nd->slot_mem, OBJECT(dev), name,
- NUBUS_SUPER_SLOT_SIZE);
- memory_region_add_subregion(&nubus->super_slot_io, slot_offset,
- &nd->slot_mem);
- } else {
- /* Normal */
- slot_offset = nd->slot * NUBUS_SLOT_SIZE;
-
- memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
- memory_region_add_subregion(&nubus->slot_io, slot_offset,
- &nd->slot_mem);
- }
+ /* Super */
+ slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;
+
+ name = g_strdup_printf("nubus-super-slot-%x", nd->slot);
+ memory_region_init(&nd->super_slot_mem, OBJECT(dev), name,
+ NUBUS_SUPER_SLOT_SIZE);
+ memory_region_add_subregion(&nubus->super_slot_io, slot_offset,
+ &nd->super_slot_mem);
+ g_free(name);
+
+ /* Normal */
+ slot_offset = nd->slot * NUBUS_SLOT_SIZE;
+
+ name = g_strdup_printf("nubus-slot-%x", nd->slot);
+ memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
+ memory_region_add_subregion(&nubus->slot_io, slot_offset,
+ &nd->slot_mem);
g_free(name);
+
nubus_register_format_block(nd);
}
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 424309dd73..89b0976aaa 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -43,6 +43,7 @@ struct NubusDevice {
DeviceState qdev;
int slot;
+ MemoryRegion super_slot_mem;
MemoryRegion slot_mem;
/* Format Block */
--
2.20.1
- [PATCH v6 00/20] nubus: bus, device, bridge, IRQ and address space improvements, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 02/20] nubus-device: rename slot_nb variable to slot, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 03/20] nubus-device: expose separate super slot memory region,
Mark Cave-Ayland <=
- [PATCH v6 01/20] nubus: add comment indicating reference documents, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 04/20] nubus: use bitmap to manage available slots, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), Mark Cave-Ayland, 2021/09/24
- [PATCH v6 06/20] nubus: implement BusClass get_dev_path(), Mark Cave-Ayland, 2021/09/24
- [PATCH v6 08/20] nubus: generate bus error when attempting to access empty slots, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 07/20] nubus: add trace-events for empty slot accesses, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 09/20] macfb: don't register declaration ROM, Mark Cave-Ayland, 2021/09/24
- [PATCH v6 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Mark Cave-Ayland, 2021/09/24