[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/53] dino: move pci_setup_iommu() to dino_pcihost_init()
From: |
Mark Cave-Ayland |
Subject: |
[PULL 06/53] dino: move pci_setup_iommu() to dino_pcihost_init() |
Date: |
Sun, 8 May 2022 20:56:03 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-7-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/hppa/dino.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index 13b2210462..dcebb9f98f 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -556,7 +556,6 @@ PCIBus *dino_init(MemoryRegion *addr_space,
memory_region_add_subregion(&s->bm, 0xfff00000,
&s->bm_cpu_alias);
address_space_init(&s->bm_as, &s->bm, "pci-bm");
- pci_setup_iommu(b, dino_pcihost_set_iommu, s);
*p_rtc_irq = qemu_allocate_irq(dino_set_timer_irq, s, 0);
*p_ser_irq = qemu_allocate_irq(dino_set_serial_irq, s, 0);
@@ -605,6 +604,8 @@ static void dino_pcihost_init(Object *obj)
g_free(name);
}
+ pci_setup_iommu(phb->bus, dino_pcihost_set_iommu, s);
+
sysbus_init_mmio(sbd, &s->this_mem);
}
--
2.20.1
- [PULL 00/53] qemu-sparc queue 20220508, Mark Cave-Ayland, 2022/05/08
- [PULL 01/53] dino: checkpatch fixes, Mark Cave-Ayland, 2022/05/08
- [PULL 02/53] dino: move registers from dino_init() to DINO_PCI_BRIDGE init function, Mark Cave-Ayland, 2022/05/08
- [PULL 03/53] dino: move PCI bus initialisation to dino_pcihost_init(), Mark Cave-Ayland, 2022/05/08
- [PULL 04/53] dino: move PCI windows initialisation to dino_pcihost_init(), Mark Cave-Ayland, 2022/05/08
- [PULL 05/53] dino: add memory-as property containing a link to the memory address space, Mark Cave-Ayland, 2022/05/08
- [PULL 06/53] dino: move pci_setup_iommu() to dino_pcihost_init(),
Mark Cave-Ayland <=
- [PULL 07/53] dino: move PCI bus master address space setup to dino_pcihost_realize(), Mark Cave-Ayland, 2022/05/08
- [PULL 08/53] dino: move initial register configuration to new dino_pcihost_reset() function, Mark Cave-Ayland, 2022/05/08
- [PULL 09/53] dino: use QOM cast instead of directly referencing parent_obj, Mark Cave-Ayland, 2022/05/08
- [PULL 10/53] dino: return PCIBus from dino_init() using qdev_get_child_bus(), Mark Cave-Ayland, 2022/05/08
- [PULL 11/53] dino: split declarations from dino.c into dino.h, Mark Cave-Ayland, 2022/05/08
- [PULL 12/53] hppa: use new CONFIG_HPPA_B160L option instead of CONFIG_DINO to build hppa machine, Mark Cave-Ayland, 2022/05/08
- [PULL 13/53] dino: change dino_init() to return the DINO device instead of PCIBus, Mark Cave-Ayland, 2022/05/08
- [PULL 14/53] machine.c: map DINO device during board configuration, Mark Cave-Ayland, 2022/05/08
- [PULL 15/53] dino.h: add defines for DINO IRQ numbers, Mark Cave-Ayland, 2022/05/08
- [PULL 16/53] dino: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/05/08