[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 04/16] sun4u: remove pci_ebus_init() function
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCHv3 04/16] sun4u: remove pci_ebus_init() function |
Date: |
Thu, 21 Dec 2017 08:20:33 +0000 |
This is initialisation that should really take place in the ebus realize
function. As part of this we also rework the ebus IRQ mapping so that
instead of having to pass in the array of pbm_irqs, we obtain a reference
to them by looking up the APB device during ebus realize.
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Artyom Tarasenko <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/pci-host/apb.c | 4 +---
hw/sparc64/sun4u.c | 29 ++++++++++++++---------------
include/hw/pci-host/apb.h | 3 +--
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index f743a4e312..b0f80f63eb 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -614,8 +614,7 @@ static void apb_pci_bridge_realize(PCIDevice *dev, Error
**errp)
PCIBus *pci_apb_init(hwaddr special_base,
hwaddr mem_base,
- qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB,
- qemu_irq **pbm_irqs)
+ qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB)
{
DeviceState *dev;
SysBusDevice *s;
@@ -646,7 +645,6 @@ PCIBus *pci_apb_init(hwaddr special_base,
memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);
memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio);
- *pbm_irqs = d->pbm_irqs;
d->ivec_irqs = ivec_irqs;
pci_create_simple(phb->bus, 0, "pbm-pci");
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 63b4aaa6eb..f3203ea887 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -230,21 +230,11 @@ static void isa_irq_handler(void *opaque, int n, int
level)
}
/* EBUS (Eight bit bus) bridge */
-static ISABus *
-pci_ebus_init(PCIDevice *pci_dev, qemu_irq *irqs)
-{
- qemu_irq *isa_irq;
- ISABus *isa_bus;
-
- isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0"));
- isa_irq = qemu_allocate_irqs(isa_irq_handler, irqs, 16);
- isa_bus_irqs(isa_bus, isa_irq);
- return isa_bus;
-}
-
static void ebus_realize(PCIDevice *pci_dev, Error **errp)
{
EbusState *s = EBUS(pci_dev);
+ APBState *apb;
+ qemu_irq *isa_irq;
s->isa_bus = isa_bus_new(DEVICE(pci_dev), get_system_memory(),
pci_address_space_io(pci_dev), errp);
@@ -253,6 +243,15 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)
return;
}
+ apb = APB_DEVICE(object_resolve_path_type("", TYPE_APB, NULL));
+ if (!apb) {
+ error_setg(errp, "unable to locate APB PCI host bridge");
+ return;
+ }
+
+ isa_irq = qemu_allocate_irqs(isa_irq_handler, apb->pbm_irqs, 16);
+ isa_bus_irqs(s->isa_bus, isa_irq);
+
pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
pci_dev->config[0x05] = 0x00;
pci_dev->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no
error
@@ -443,7 +442,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
PCIDevice *ebus, *pci_dev;
ISABus *isa_bus;
SysBusDevice *s;
- qemu_irq *ivec_irqs, *pbm_irqs;
+ qemu_irq *ivec_irqs;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD];
DeviceState *dev;
@@ -462,7 +461,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
ivec_irqs = qemu_allocate_irqs(sparc64_cpu_set_ivec_irq, cpu, IVEC_MAX);
pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs,
&pci_busA,
- &pci_busB, &pbm_irqs);
+ &pci_busB);
/* Only in-built Simba PBMs can exist on the root bus, slot 0 on busA is
reserved (leaving no slots free after on-board devices) however slots
@@ -474,7 +473,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
ebus = pci_create_multifunction(pci_busA, PCI_DEVFN(1, 0), true,
TYPE_EBUS);
qdev_init_nofail(DEVICE(ebus));
- isa_bus = pci_ebus_init(ebus, pbm_irqs);
+ isa_bus = EBUS(ebus)->isa_bus;
i = 0;
if (hwdef->console_serial_base) {
diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h
index 5d39c03bc4..35d7d5ad7b 100644
--- a/include/hw/pci-host/apb.h
+++ b/include/hw/pci-host/apb.h
@@ -91,6 +91,5 @@ typedef struct PBMPCIBridge {
PCIBus *pci_apb_init(hwaddr special_base,
hwaddr mem_base,
- qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3,
- qemu_irq **pbm_irqs);
+ qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);
#endif
--
2.11.0
- [Qemu-devel] [PATCHv3 00/16] sun4u: tidy-up CPU, APB and ebus, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 06/16] apb: APB QOMify tidy-up, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 07/16] apb: return APBState from pci_apb_init() rather than PCIBus, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 04/16] sun4u: remove pci_ebus_init() function,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCHv3 03/16] sun4u: move ISABus inside of EBusState, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 05/16] sun4u: move initialisation of all ISABus devices into ebus_realize(), Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 02/16] sun4u: ebus QOMify tidy-up, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 01/16] apb: move QOM macros and typedefs from apb.c to apb.h, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 09/16] apb: move the two secondary PCI bridges objects into APBState, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 08/16] apb: use gpios to wire up the apb device to the SPARC CPU IRQs, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 10/16] apb: remove pci_apb_init() and instantiate APB device using qdev, Mark Cave-Ayland, 2017/12/21
- [Qemu-devel] [PATCHv3 16/16] sun4u: switch from EBUS_DPRINTF() macro to trace-events, Mark Cave-Ayland, 2017/12/21