[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/50] dino: move PCI bus initialisation to dino_pcihost_init(
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 03/50] dino: move PCI bus initialisation to dino_pcihost_init() |
Date: |
Wed, 4 May 2022 10:25:13 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/dino.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index 9401b68ff7..c6c01ea14c 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -526,13 +526,7 @@ PCIBus *dino_init(MemoryRegion *addr_space,
s->iar0 = s->iar1 = CPU_HPA + 3;
s->toc_addr = 0xFFFA0030; /* IO_COMMAND of CPU */
- /* Dino PCI bus memory. */
- memory_region_init(&s->pci_mem, OBJECT(s), "pci-memory", 4 * GiB);
-
- b = pci_register_root_bus(dev, "pci", dino_set_irq, dino_pci_map_irq, s,
- &s->pci_mem, get_system_io(),
- PCI_DEVFN(0, 0), 32, TYPE_PCI_BUS);
- s->parent_obj.bus = b;
+ b = s->parent_obj.bus;
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
memory_region_add_subregion(addr_space, DINO_HPA,
@@ -598,6 +592,14 @@ static void dino_pcihost_init(Object *obj)
memory_region_add_subregion(&s->this_mem, DINO_CONFIG_DATA,
&phb->data_mem);
+ /* Dino PCI bus memory. */
+ memory_region_init(&s->pci_mem, OBJECT(s), "pci-memory", 4 * GiB);
+
+ phb->bus = pci_register_root_bus(DEVICE(s), "pci",
+ dino_set_irq, dino_pci_map_irq, s,
+ &s->pci_mem, get_system_io(),
+ PCI_DEVFN(0, 0), 32, TYPE_PCI_BUS);
+
sysbus_init_mmio(sbd, &s->this_mem);
}
--
2.20.1
- [PATCH v2 00/50] hppa: general improvements and tidy-ups, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 01/50] dino: checkpatch fixes, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 02/50] dino: move registers from dino_init() to DINO_PCI_BRIDGE init function, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 03/50] dino: move PCI bus initialisation to dino_pcihost_init(),
Mark Cave-Ayland <=
- [PATCH v2 07/50] dino: move PCI bus master address space setup to dino_pcihost_realize(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 05/50] dino: add memory-as property containing a link to the memory address space, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 04/50] dino: move PCI windows initialisation to dino_pcihost_init(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 08/50] dino: move initial register configuration to new dino_pcihost_reset() function, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 09/50] dino: use QOM cast instead of directly referencing parent_obj, Mark Cave-Ayland, 2022/05/04