[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/11] versatile_pci: Use separate PCI I/O space
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v3 05/11] versatile_pci: Use separate PCI I/O space rather than system I/O space |
Date: |
Thu, 4 Apr 2013 13:58:27 +0100 |
Rather than overloading the system I/O space (which doesn't even make
any sense on ARM) for PCI I/O, create an memory region in the PCI
controller and use that to represent the I/O space.
Signed-off-by: Peter Maydell <address@hidden>
Acked-by: Paul Brook <address@hidden>
---
hw/versatile_pci.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index dfd3001..777e9b1 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -19,7 +19,8 @@ typedef struct {
qemu_irq irq[4];
MemoryRegion mem_config;
MemoryRegion mem_config2;
- MemoryRegion isa;
+ MemoryRegion pci_io_space;
+ MemoryRegion pci_io_window;
PCIBus pci_bus;
PCIDevice pci_dev;
@@ -77,8 +78,10 @@ static void pci_vpb_init(Object *obj)
PCIHostState *h = PCI_HOST_BRIDGE(obj);
PCIVPBState *s = PCI_VPB(obj);
+ memory_region_init(&s->pci_io_space, "pci_io", 1ULL << 32);
+
pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), "pci",
- get_system_memory(), get_system_io(),
+ get_system_memory(), &s->pci_io_space,
PCI_DEVFN(11, 0));
h->bus = &s->pci_bus;
@@ -111,8 +114,14 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)
memory_region_init_io(&s->mem_config2, &pci_vpb_config_ops, &s->pci_bus,
"pci-vpb-config", 0x1000000);
sysbus_init_mmio(sbd, &s->mem_config2);
- isa_mmio_setup(&s->isa, 0x0100000);
- sysbus_init_mmio(sbd, &s->isa);
+
+ /* The window into I/O space is always into a fixed base address;
+ * its size is the same for both realview and versatile.
+ */
+ memory_region_init_alias(&s->pci_io_window, "pci-vbp-io-window",
+ &s->pci_io_space, 0, 0x100000);
+
+ sysbus_init_mmio(sbd, &s->pci_io_space);
/* TODO Remove once realize propagates to child devices. */
object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp);
--
1.7.9.5
- [Qemu-devel] [PATCH v3 00/11] Fix versatile_pci (without breaking linux), Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 09/11] arm/realview: Fix mapping of PCI regions, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 10/11] versatile_pci: Expose PCI memory space to system, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 05/11] versatile_pci: Use separate PCI I/O space rather than system I/O space,
Peter Maydell <=
- [Qemu-devel] [PATCH v3 04/11] versatile_pci: Change to subclassing TYPE_PCI_HOST_BRIDGE, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 01/11] versatile_pci: Fix hardcoded tabs, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 07/11] versatile_pci: Implement the correct PCI IRQ mapping, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 02/11] versatile_pci: Expose PCI I/O region on Versatile PB, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 06/11] versatile_pci: Put the host bridge PCI device at slot 29, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 08/11] versatile_pci: Implement the PCI controller's control registers, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 03/11] versatile_pci: Update to realize and instance init functions, Peter Maydell, 2013/04/04
- [Qemu-devel] [PATCH v3 11/11] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr(), Peter Maydell, 2013/04/04