[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/13] ppc440: Stop using system io region for PCIe buses
From: |
BALATON Zoltan |
Subject: |
[PATCH 05/13] ppc440: Stop using system io region for PCIe buses |
Date: |
Tue, 4 Jul 2023 00:02:37 +0200 (CEST) |
Add separate memory regions for the mem and io spaces of the PCIe bus
to avoid different buses using the same system io region.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/ppc/ppc440_uc.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 38ee27f437..0c5d999878 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -776,6 +776,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PPC460EXPCIEState,
PPC460EX_PCIE_HOST)
struct PPC460EXPCIEState {
PCIExpressHost host;
+ MemoryRegion busmem;
MemoryRegion iomem;
qemu_irq irq[4];
int32_t dcrn_base;
@@ -1056,15 +1057,17 @@ static void ppc460ex_pcie_realize(DeviceState *dev,
Error **errp)
error_setg(errp, "invalid PCIe DCRN base");
return;
}
+ snprintf(buf, sizeof(buf), "pcie%d-mem", id);
+ memory_region_init(&s->busmem, OBJECT(s), buf, UINT64_MAX);
snprintf(buf, sizeof(buf), "pcie%d-io", id);
- memory_region_init(&s->iomem, OBJECT(s), buf, UINT64_MAX);
+ memory_region_init(&s->iomem, OBJECT(s), buf, 0x10000);
for (i = 0; i < 4; i++) {
sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[i]);
}
snprintf(buf, sizeof(buf), "pcie.%d", id);
pci->bus = pci_register_root_bus(DEVICE(s), buf, ppc460ex_set_irq,
- pci_swizzle_map_irq_fn, s, &s->iomem,
- get_system_io(), 0, 4, TYPE_PCIE_BUS);
+ pci_swizzle_map_irq_fn, s, &s->busmem,
+ &s->iomem, 0, 4, TYPE_PCIE_BUS);
ppc460ex_pcie_register_dcrs(s);
}
--
2.30.9
- Re: [PATCH 01/13] ppc440: Change ppc460ex_pcie_init() parameter type, (continued)
- [PATCH 02/13] ppc440: Add cpu link property to PCIe controller model, BALATON Zoltan, 2023/07/03
- [PATCH 04/13] ppc440: Rename local variable in dcr_read_pcie(), BALATON Zoltan, 2023/07/03
- [PATCH 06/13] sam460ex: Remove address_space_mem local variable, BALATON Zoltan, 2023/07/03
- [PATCH 05/13] ppc440: Stop using system io region for PCIe buses,
BALATON Zoltan <=
- [PATCH 07/13] ppc440: Add busnum property to PCIe controller model, BALATON Zoltan, 2023/07/03
- [PATCH 08/13] ppc440: Remove ppc460ex_pcie_init legacy init function, BALATON Zoltan, 2023/07/03
- [PATCH 09/13] ppc4xx_pci: Rename QOM type name define, BALATON Zoltan, 2023/07/03
- [PATCH 10/13] ppc4xx_pci: Add define for ppc4xx-host-bridge type name, BALATON Zoltan, 2023/07/03