[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/14] mac_newworld: Clean up creation of Uninorth devices
From: |
Mark Cave-Ayland |
Subject: |
[PULL 05/14] mac_newworld: Clean up creation of Uninorth devices |
Date: |
Mon, 31 Oct 2022 20:14:26 +0000 |
From: BALATON Zoltan <balaton@eik.bme.hu>
Map regions in ascending order and reorganise code a bit to avoid some
casts and move Uninorth parts together.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id:
<a6263b23757dd4a1e1b17a9aa9fb87115f3a1e71.1666957578.git.balaton@eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/ppc/mac_newworld.c | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 6bc3bd19be..e2f456b547 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -228,13 +228,6 @@ static void ppc_core99_init(MachineState *machine)
}
}
- /* UniN init */
- dev = qdev_new(TYPE_UNI_NORTH);
- s = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(s, &error_fatal);
- memory_region_add_subregion(get_system_memory(), 0xf8000000,
- sysbus_mmio_get_region(s, 0));
-
openpic_irqs = g_new0(IrqLines, machine->smp.cpus);
for (i = 0; i < machine->smp.cpus; i++) {
/* Mac99 IRQ connection between OpenPIC outputs pins
@@ -275,24 +268,30 @@ static void ppc_core99_init(MachineState *machine)
}
}
+ /* UniN init */
+ s = SYS_BUS_DEVICE(qdev_new(TYPE_UNI_NORTH));
+ sysbus_realize_and_unref(s, &error_fatal);
+ memory_region_add_subregion(get_system_memory(), 0xf8000000,
+ sysbus_mmio_get_region(s, 0));
+
if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) {
+ machine_arch = ARCH_MAC99_U3;
/* 970 gets a U3 bus */
/* Uninorth AGP bus */
dev = qdev_new(TYPE_U3_AGP_HOST_BRIDGE);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
uninorth_pci = U3_AGP_HOST_BRIDGE(dev);
s = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(s, &error_fatal);
+ sysbus_mmio_map(s, 0, 0xf0800000);
+ sysbus_mmio_map(s, 1, 0xf0c00000);
/* PCI hole */
- memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
+ memory_region_add_subregion(get_system_memory(), 0x80000000,
sysbus_mmio_get_region(s, 2));
/* Register 8 MB of ISA IO space */
memory_region_add_subregion(get_system_memory(), 0xf2000000,
sysbus_mmio_get_region(s, 3));
- sysbus_mmio_map(s, 0, 0xf0800000);
- sysbus_mmio_map(s, 1, 0xf0c00000);
-
- machine_arch = ARCH_MAC99_U3;
} else {
+ machine_arch = ARCH_MAC99;
/* Use values found on a real PowerMac */
/* Uninorth AGP bus */
uninorth_agp_dev = qdev_new(TYPE_UNI_NORTH_AGP_HOST_BRIDGE);
@@ -309,22 +308,20 @@ static void ppc_core99_init(MachineState *machine)
sysbus_mmio_map(s, 0, 0xf4800000);
sysbus_mmio_map(s, 1, 0xf4c00000);
- /* Uninorth main bus */
+ /* Uninorth main bus - this must be last to make it the default */
dev = qdev_new(TYPE_UNI_NORTH_PCI_HOST_BRIDGE);
qdev_prop_set_uint32(dev, "ofw-addr", 0xf2000000);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
uninorth_pci = UNI_NORTH_PCI_HOST_BRIDGE(dev);
s = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(s, &error_fatal);
+ sysbus_mmio_map(s, 0, 0xf2800000);
+ sysbus_mmio_map(s, 1, 0xf2c00000);
/* PCI hole */
- memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
+ memory_region_add_subregion(get_system_memory(), 0x80000000,
sysbus_mmio_get_region(s, 2));
/* Register 8 MB of ISA IO space */
memory_region_add_subregion(get_system_memory(), 0xf2000000,
sysbus_mmio_get_region(s, 3));
- sysbus_mmio_map(s, 0, 0xf2800000);
- sysbus_mmio_map(s, 1, 0xf2c00000);
-
- machine_arch = ARCH_MAC99;
}
machine->usb |= defaults_enabled() && !machine->usb_disabled;
--
2.30.2
- [PULL 00/14] qemu-macppc queue 20221031, Mark Cave-Ayland, 2022/10/31
- [PULL 01/14] mac_newworld: Drop some variables, Mark Cave-Ayland, 2022/10/31
- [PULL 02/14] mac_oldworld: Drop some more variables, Mark Cave-Ayland, 2022/10/31
- [PULL 04/14] mac_{old|new}world: Avoid else branch by setting default value, Mark Cave-Ayland, 2022/10/31
- [PULL 05/14] mac_newworld: Clean up creation of Uninorth devices,
Mark Cave-Ayland <=
- [PULL 03/14] mac_{old|new}world: Set tbfreq at declaration, Mark Cave-Ayland, 2022/10/31
- [PULL 06/14] mac_{old|new}world: Reduce number of QOM casts, Mark Cave-Ayland, 2022/10/31
- [PULL 07/14] hw/ppc/mac.h: Move newworld specific parts out from shared header, Mark Cave-Ayland, 2022/10/31
- [PULL 08/14] hw/ppc/mac.h: Move macio specific parts out from shared header, Mark Cave-Ayland, 2022/10/31
- [PULL 09/14] hw/ppc/mac.h: Move grackle-pcihost type declaration out to a header, Mark Cave-Ayland, 2022/10/31
- [PULL 10/14] hw/ppc/mac.h: Move PROM and KERNEL defines to board code, Mark Cave-Ayland, 2022/10/31
- [PULL 12/14] mac_nvram: Use NVRAM_SIZE constant, Mark Cave-Ayland, 2022/10/31
- [PULL 11/14] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h, Mark Cave-Ayland, 2022/10/31
- [PULL 13/14] mac_{old|new}world: Code style fix adding missing braces to if-s, Mark Cave-Ayland, 2022/10/31
- [PULL 14/14] mac_newworld: Turn CORE99_VIA_CONFIG defines into an enum, Mark Cave-Ayland, 2022/10/31