[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [Qemu-devel] [PATCH 4/7] hw/apb: fix PCI bus initialization
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-ppc] [Qemu-devel] [PATCH 4/7] hw/apb: fix PCI bus initialization |
Date: |
Thu, 14 Jul 2016 16:43:43 +0300 |
Create and connect the PCI root bus to the
host bridge before the later is 'realized'.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/pci-host/apb.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index babbbef..16587f8 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -670,6 +670,13 @@ PCIBus *pci_apb_init(hwaddr special_base,
/* Ultrasparc PBM main bus */
dev = qdev_create(NULL, TYPE_APB);
+ d = APB_DEVICE(dev);
+ phb = PCI_HOST_BRIDGE(dev);
+ phb->bus = pci_register_bus(DEVICE(phb), "pci",
+ pci_apb_set_irq, pci_pbm_map_irq, d,
+ &d->pci_mmio,
+ get_system_io(),
+ 0, 32, TYPE_PCI_BUS);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
/* apb_config */
@@ -678,18 +685,10 @@ PCIBus *pci_apb_init(hwaddr special_base,
sysbus_mmio_map(s, 1, special_base + 0x1000000ULL);
/* pci_ioport */
sysbus_mmio_map(s, 2, special_base + 0x2000000ULL);
- d = APB_DEVICE(dev);
memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);
memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio);
- phb = PCI_HOST_BRIDGE(dev);
- phb->bus = pci_register_bus(DEVICE(phb), "pci",
- pci_apb_set_irq, pci_pbm_map_irq, d,
- &d->pci_mmio,
- get_system_io(),
- 0, 32, TYPE_PCI_BUS);
-
*pbm_irqs = d->pbm_irqs;
d->ivec_irqs = ivec_irqs;
--
2.4.3
- [Qemu-ppc] [Qemu-devel] [PATCH 0/7] hw/pci-bus: Fix PCI bus regression on several archs, Marcel Apfelbaum, 2016/07/14
- [Qemu-ppc] [Qemu-devel] [PATCH 1/7] tests/prom-env-test: increase the test timeout, Marcel Apfelbaum, 2016/07/14
- [Qemu-ppc] [Qemu-devel] [PATCH 2/7] hw/alpha: fix PCI bus initialization, Marcel Apfelbaum, 2016/07/14
- [Qemu-ppc] [Qemu-devel] [PATCH 3/7] hw/mips: fix PCI bus initialization, Marcel Apfelbaum, 2016/07/14
- [Qemu-ppc] [Qemu-devel] [PATCH 4/7] hw/apb: fix PCI bus initialization,
Marcel Apfelbaum <=
- [Qemu-ppc] [Qemu-devel] [PATCH 5/7] hw/grackle: fix PCI bus initialization, Marcel Apfelbaum, 2016/07/14
- [Qemu-ppc] [Qemu-devel] [PATCH 6/7] hw/prep: realize the PCI root bus as part of the prep init, Marcel Apfelbaum, 2016/07/14
- [Qemu-ppc] [Qemu-devel] [PATCH 7/7] hw/versatile: realize the PCI root bus as part of the versatile init, Marcel Apfelbaum, 2016/07/14
- Re: [Qemu-ppc] [Qemu-devel] [PATCH 0/7] hw/pci-bus: Fix PCI bus regression on several archs, Mark Cave-Ayland, 2016/07/15