[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-6.1 09/10] hw/m68k/q800: Add MacIO container
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH-for-6.1 09/10] hw/m68k/q800: Add MacIO container |
|
Date: |
Fri, 26 Mar 2021 01:27:27 +0100 |
Instead of having devices mapped onto some main memory range,
then having many aliases pointing to this memory range, add
a container, map the devices onto it, and map aliases of the
container onto the main memory.
We gain a better visibility of the devices on the mac-io bus.
- before:
(qemu) info mtree
address-space: memory
0000000000000000-ffffffffffffffff (prio 0, i/o): system
0000000000000000-0000000007ffffff (prio 0, ram): m68k_mac.ram
0000000040800000-00000000408fffff (prio 0, rom): m68k_mac.rom
0000000050000000-0000000050003fff (prio 0, i/o): mac-via
0000000050000000-0000000050001fff (prio 0, i/o): via1
0000000050002000-0000000050003fff (prio 0, i/o): via2
0000000050008000-0000000050008fff (prio 0, rom): dp8393x-prom
000000005000a000-000000005000a0ff (prio 0, i/o): dp8393x-regs
000000005000c020-000000005000c027 (prio 0, i/o): escc
0000000050010000-00000000500100ff (prio 0, i/o): esp-regs
0000000050010100-0000000050010103 (prio 0, i/o): esp-pdma
000000005001e000-000000005001ffff (prio 0, i/o): swim
0000000050040000-000000005007ffff (prio 0, i/o): alias mac_m68k.io[1]
@system 0000000050000000-000000005003ffff
0000000050080000-00000000500bffff (prio 0, i/o): alias mac_m68k.io[2]
@system 0000000050000000-000000005003ffff
00000000500c0000-00000000500fffff (prio 0, i/o): alias mac_m68k.io[3]
@system 0000000050000000-000000005003ffff
...
0000000053f40000-0000000053f7ffff (prio 0, i/o): alias mac_m68k.io[253]
@system 0000000050000000-000000005003ffff
0000000053f80000-0000000053fbffff (prio 0, i/o): alias mac_m68k.io[254]
@system 0000000050000000-000000005003ffff
0000000053fc0000-0000000053ffffff (prio 0, i/o): alias mac_m68k.io[255]
@system 0000000050000000-000000005003ffff
0000000060000000-00000000efffffff (prio 0, i/o): nubus-super-slots
00000000f0000000-00000000feffffff (prio 0, i/o): nubus-slots
00000000f9000000-00000000f9ffffff (prio 0, i/o): nubus-slot-9
00000000f9001000-00000000f9400fff (prio 0, ram): macfb-vram
00000000f9800000-00000000f9800fff (prio 0, i/o): macfb-ctrl
00000000f9ffffe8-00000000f9ffffeb (prio 0, i/o): nubus-slot-9-rom
00000000f9ffffec-00000000f9ffffff (prio 0, i/o):
nubus-slot-9-format-block
- after:
address-space: memory
0000000000000000-0000000007ffffff (prio 0, ram): m68k_mac.ram
0000000040800000-00000000408fffff (prio 0, rom): m68k_mac.rom
0000000050000000-000000005003ffff (prio 0, i/o): alias mac_m68k.io[0]
@mac-io 0000000000000000-000000000003ffff
0000000050040000-000000005007ffff (prio 0, i/o): alias mac_m68k.io[1]
@mac-io 0000000000000000-000000000003ffff
0000000050080000-00000000500bffff (prio 0, i/o): alias mac_m68k.io[2]
@mac-io 0000000000000000-000000000003ffff
...
0000000053f40000-0000000053f7ffff (prio 0, i/o): alias mac_m68k.io[253]
@mac-io 0000000000000000-000000000003ffff
0000000053f80000-0000000053fbffff (prio 0, i/o): alias mac_m68k.io[254]
@mac-io 0000000000000000-000000000003ffff
0000000053fc0000-0000000053ffffff (prio 0, i/o): alias mac_m68k.io[255]
@mac-io 0000000000000000-000000000003ffff
0000000060000000-00000000efffffff (prio 0, i/o): nubus-super-slots
00000000f0000000-00000000feffffff (prio 0, i/o): nubus-slots
00000000f9000000-00000000f9ffffff (prio 0, i/o): nubus-slot-9
00000000f9001000-00000000f9400fff (prio 0, ram): macfb-vram
00000000f9800000-00000000f9800fff (prio 0, i/o): macfb-ctrl
00000000f9ffffe8-00000000f9ffffeb (prio 0, i/o): nubus-slot-9-rom
00000000f9ffffec-00000000f9ffffff (prio 0, i/o):
nubus-slot-9-format-block
memory-region: mac-io
0000000000000000-000000000003ffff (prio 0, i/o): mac-io
0000000000000000-0000000000003fff (prio 0, i/o): mac-via
0000000000000000-0000000000001fff (prio 0, i/o): via1
0000000000002000-0000000000003fff (prio 0, i/o): via2
0000000000008000-0000000000008fff (prio 0, rom): dp8393x-prom
000000000000a000-000000000000a0ff (prio 0, i/o): dp8393x-regs
000000000000c020-000000000000c027 (prio 0, i/o): escc
0000000000010000-00000000000100ff (prio 0, i/o): esp-regs
0000000000010100-0000000000010103 (prio 0, i/o): esp-pdma
000000000001e000-000000000001ffff (prio 0, i/o): swim
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/m68k/q800.c | 54 ++++++++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 21 deletions(-)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 4d2e866eec7..8f14e677077 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -61,14 +61,14 @@
#define IO_SLICE 0x00040000
#define IO_SIZE 0x04000000
-#define VIA_BASE (IO_BASE + 0x00000)
-#define SONIC_PROM_BASE (IO_BASE + 0x08000)
-#define SONIC_BASE (IO_BASE + 0x0a000)
-#define SCC_BASE (IO_BASE + 0x0c020)
-#define ESP_BASE (IO_BASE + 0x10000)
-#define ESP_PDMA (IO_BASE + 0x10100)
-#define ASC_BASE (IO_BASE + 0x14000)
-#define SWIM_BASE (IO_BASE + 0x1E000)
+#define VIA_OFFSET (0x00000)
+#define SONIC_PROM_OFFSET (0x08000)
+#define SONIC_IO_OFFSET (0x0a000)
+#define SCC_OFFSET (0x0c020)
+#define ESP_OFFSET (0x10000)
+#define ESP_PDMA_OFFSET (0x10100)
+#define ASC_OFFSET (0x14000)
+#define SWIM_OFFSET (0x1e000)
#define NUBUS_SUPER_SLOT_BASE 0x60000000
#define NUBUS_SLOT_BASE 0xf0000000
@@ -213,8 +213,9 @@ static void q800_init(MachineState *machine)
ram_addr_t initrd_base;
int32_t initrd_size;
MemoryRegion *rom;
+ MemoryRegion *macio;
MemoryRegion *io;
- const int io_slice_nb = (IO_SIZE / IO_SLICE) - 1;
+ const int io_slice_nb = (IO_SIZE / IO_SLICE);
int i;
ram_addr_t ram_size = machine->ram_size;
const char *kernel_filename = machine->kernel_filename;
@@ -249,18 +250,21 @@ static void q800_init(MachineState *machine)
/* RAM */
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
+ /* MacIO bus */
+ macio = g_new(MemoryRegion, 1);
+ memory_region_init(macio, NULL, "mac-io", 256 * KiB); /* FIXME or 128K? */
+
/*
* Memory from IO_BASE to IO_BASE + IO_SLICE is repeated
* from IO_BASE + IO_SLICE to IO_BASE + IO_SIZE
*/
io = g_new(MemoryRegion, io_slice_nb);
for (i = 0; i < io_slice_nb; i++) {
- char *name = g_strdup_printf("mac_m68k.io[%d]", i + 1);
+ char *name = g_strdup_printf("mac_m68k.io[%d]", i);
- memory_region_init_alias(&io[i], NULL, name, get_system_memory(),
- IO_BASE, IO_SLICE);
+ memory_region_init_alias(&io[i], NULL, name, macio, 0, IO_SLICE);
memory_region_add_subregion(get_system_memory(),
- IO_BASE + (i + 1) * IO_SLICE, &io[i]);
+ IO_BASE + i * IO_SLICE, &io[i]);
g_free(name);
}
@@ -278,7 +282,8 @@ static void q800_init(MachineState *machine)
}
sysbus = SYS_BUS_DEVICE(via_dev);
sysbus_realize_and_unref(sysbus, &error_fatal);
- sysbus_mmio_map(sysbus, 0, VIA_BASE);
+ memory_region_add_subregion(macio, VIA_OFFSET,
+ sysbus_mmio_get_region(sysbus, 0));
qdev_connect_gpio_out_named(DEVICE(sysbus), "irq", 0,
qdev_get_gpio_in(glue, 0));
qdev_connect_gpio_out_named(DEVICE(sysbus), "irq", 1,
@@ -321,9 +326,11 @@ static void q800_init(MachineState *machine)
OBJECT(get_system_memory()), &error_abort);
sysbus = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(sysbus, &error_fatal);
- sysbus_mmio_map(sysbus, 0, SONIC_BASE);
- sysbus_mmio_map(sysbus, 1, SONIC_PROM_BASE);
sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(glue, 2));
+ memory_region_add_subregion(macio, SONIC_IO_OFFSET,
+ sysbus_mmio_get_region(sysbus, 0));
+ memory_region_add_subregion(macio, SONIC_PROM_OFFSET,
+ sysbus_mmio_get_region(sysbus, 1));
/* SCC */
@@ -346,7 +353,8 @@ static void q800_init(MachineState *machine)
sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(escc_orgate, 0));
sysbus_connect_irq(sysbus, 1, qdev_get_gpio_in(escc_orgate, 1));
qdev_connect_gpio_out(DEVICE(escc_orgate), 0, qdev_get_gpio_in(glue, 3));
- sysbus_mmio_map(sysbus, 0, SCC_BASE);
+ memory_region_add_subregion(macio, SCC_OFFSET,
+ sysbus_mmio_get_region(sysbus, 0));
/* SCSI */
@@ -367,8 +375,10 @@ static void q800_init(MachineState *machine)
sysbus_connect_irq(sysbus, 1,
qdev_get_gpio_in_named(via_dev, "via2-irq",
VIA2_IRQ_SCSI_DATA_BIT));
- sysbus_mmio_map(sysbus, 0, ESP_BASE);
- sysbus_mmio_map(sysbus, 1, ESP_PDMA);
+ memory_region_add_subregion(macio, ESP_OFFSET,
+ sysbus_mmio_get_region(sysbus, 0));
+ memory_region_add_subregion(macio, ESP_PDMA_OFFSET,
+ sysbus_mmio_get_region(sysbus, 1));
scsi_bus_legacy_handle_cmdline(&esp->bus);
@@ -376,7 +386,8 @@ static void q800_init(MachineState *machine)
dev = qdev_new(TYPE_SWIM);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, SWIM_BASE);
+ memory_region_add_subregion(macio, SWIM_OFFSET,
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),
0));
/* NuBus */
@@ -423,7 +434,8 @@ static void q800_init(MachineState *machine)
(graphic_height << 16) | graphic_width);
BOOTINFO1(cs->as, parameters_base, BI_MAC_VROW,
(graphic_width * graphic_depth + 7) / 8);
- BOOTINFO1(cs->as, parameters_base, BI_MAC_SCCBASE, SCC_BASE);
+ BOOTINFO1(cs->as, parameters_base, BI_MAC_SCCBASE,
+ IO_BASE + SCC_OFFSET);
rom = g_malloc(sizeof(*rom));
memory_region_init_ram_ptr(rom, NULL, "m68k_fake_mac.rom",
--
2.26.2
- [RFC PATCH-for-6.1 03/10] hw/arm/musicpal: Map flash using memory_region_add_subregion_aliased(), (continued)
- [RFC PATCH-for-6.1 03/10] hw/arm/musicpal: Map flash using memory_region_add_subregion_aliased(), Philippe Mathieu-Daudé, 2021/03/25
- [PATCH-for-6.1 02/10] hw/arm/musicpal: Open-code pflash_cfi02_register() call, Philippe Mathieu-Daudé, 2021/03/25
- [PATCH-for-6.1 04/10] hw/arm/digic: Open-code pflash_cfi02_register() call, Philippe Mathieu-Daudé, 2021/03/25
- [RFC PATCH-for-6.1 05/10] hw/arm/digic: Map flash using memory_region_add_subregion_aliased(), Philippe Mathieu-Daudé, 2021/03/25
- [PATCH-for-6.1 06/10] hw/block/pflash_cfi02: Remove pflash_setup_mappings(), Philippe Mathieu-Daudé, 2021/03/25
- [PATCH-for-6.1 07/10] hw/block/pflash_cfi02: Simplify pflash_cfi02_register() prototype, Philippe Mathieu-Daudé, 2021/03/25
- [RFC PATCH-for-6.1 08/10] hw/misc/aliased_region: Simplify aliased I/O regions, Philippe Mathieu-Daudé, 2021/03/25
- [PATCH-for-6.1 09/10] hw/m68k/q800: Add MacIO container,
Philippe Mathieu-Daudé <=
- [RFC PATCH-for-6.1 10/10] hw/m68k/q800: Map MacIO using memory_region_add_subregion_aliased(), Philippe Mathieu-Daudé, 2021/03/25
- Re: [RFC PATCH-for-6.1 00/10] hw/misc: Add memory_region_add_subregion_aliased() helper, Richard Henderson, 2021/03/26
- Re: [RFC PATCH-for-6.1 00/10] hw/misc: Add memory_region_add_subregion_aliased() helper, Mark Cave-Ayland, 2021/03/27