[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/10] sabre: don't call sysbus_mmio_map() in sabre_realize()
From: |
Mark Cave-Ayland |
Subject: |
[PULL 05/10] sabre: don't call sysbus_mmio_map() in sabre_realize() |
Date: |
Wed, 28 Oct 2020 08:23:53 +0000 |
The device should not map itself but instead should be mapped to sysbus by the
sun4u machine.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200926140216.7368-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/pci-host/sabre.c | 8 --------
hw/sparc64/sun4u.c | 7 +++++++
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 5ac6283623..5394ad5cd0 100644
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -378,16 +378,8 @@ static void sabre_realize(DeviceState *dev, Error **errp)
{
SabreState *s = SABRE(dev);
PCIHostState *phb = PCI_HOST_BRIDGE(dev);
- SysBusDevice *sbd = SYS_BUS_DEVICE(s);
PCIDevice *pci_dev;
- /* sabre_config */
- sysbus_mmio_map(sbd, 0, s->special_base);
- /* PCI configuration space */
- sysbus_mmio_map(sbd, 1, s->special_base + 0x1000000ULL);
- /* pci_ioport */
- sysbus_mmio_map(sbd, 2, s->special_base + 0x2000000ULL);
-
memory_region_init(&s->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);
memory_region_add_subregion(get_system_memory(), s->mem_base,
&s->pci_mmio);
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 05e659c8a4..2f8fc670cf 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -588,6 +588,13 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
&error_abort);
sysbus_realize_and_unref(SYS_BUS_DEVICE(sabre), &error_fatal);
+ /* sabre_config */
+ sysbus_mmio_map(SYS_BUS_DEVICE(sabre), 0, PBM_SPECIAL_BASE);
+ /* PCI configuration space */
+ sysbus_mmio_map(SYS_BUS_DEVICE(sabre), 1, PBM_SPECIAL_BASE + 0x1000000ULL);
+ /* pci_ioport */
+ sysbus_mmio_map(SYS_BUS_DEVICE(sabre), 2, PBM_SPECIAL_BASE + 0x2000000ULL);
+
/* Wire up PCI interrupts to CPU */
for (i = 0; i < IVEC_MAX; i++) {
qdev_connect_gpio_out_named(DEVICE(sabre), "ivec-irq", i,
--
2.20.1
- [PULL 00/10] qemu-sparc queue 20201028, Mark Cave-Ayland, 2020/10/28
- [PULL 01/10] sparc32-dma: use object_initialize_child() for espdma and ledma child objects, Mark Cave-Ayland, 2020/10/28
- [PULL 02/10] sparc32-ledma: use object_initialize_child() for lance child object, Mark Cave-Ayland, 2020/10/28
- [PULL 03/10] sparc32-espdma: use object_initialize_child() for esp child object, Mark Cave-Ayland, 2020/10/28
- [PULL 04/10] sparc32-ledma: don't reference nd_table directly within the device, Mark Cave-Ayland, 2020/10/28
- [PULL 05/10] sabre: don't call sysbus_mmio_map() in sabre_realize(),
Mark Cave-Ayland <=
- [PULL 06/10] hw/display/tcx: Allow 64-bit accesses to framebuffer stippler and blitter, Mark Cave-Ayland, 2020/10/28
- [PULL 07/10] sabre: increase number of PCI bus IRQs from 32 to 64, Mark Cave-Ayland, 2020/10/28
- [PULL 08/10] hw/pci-host/sabre: Update documentation link, Mark Cave-Ayland, 2020/10/28
- [PULL 09/10] hw/pci-host/sabre: Remove superfluous address range check, Mark Cave-Ayland, 2020/10/28
- [PULL 10/10] hw/pci-host/sabre: Simplify code initializing variable once, Mark Cave-Ayland, 2020/10/28
- Re: [PULL 00/10] qemu-sparc queue 20201028, Peter Maydell, 2020/10/31