[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio regions |
Date: |
Thu, 6 Oct 2011 12:23:18 +0200 |
From: Peter Maydell <address@hidden>
Clean up versatile_pci to expose the various PCI mmio regions
properly as separate mmio regions rather than as a single mmio
which uses callbacks to map and unmap everything.
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/realview.c | 12 ++++++++++--
hw/versatile_pci.c | 42 ++++++++----------------------------------
hw/versatilepb.c | 12 ++++++++++--
3 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/hw/realview.c b/hw/realview.c
index 549bb15..11ffb8a 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -272,8 +272,16 @@ static void realview_init(ram_addr_t ram_size,
sysbus_create_simple("pl031", 0x10017000, pic[10]);
if (!is_pb) {
- dev = sysbus_create_varargs("realview_pci", 0x60000000,
- pic[48], pic[49], pic[50], pic[51], NULL);
+ dev = qdev_create(NULL, "realview_pci");
+ busdev = sysbus_from_qdev(dev);
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(busdev, 0, 0x61000000); /* PCI self-config */
+ sysbus_mmio_map(busdev, 1, 0x62000000); /* PCI config */
+ sysbus_mmio_map(busdev, 2, 0x63000000); /* PCI I/O */
+ sysbus_connect_irq(busdev, 0, pic[48]);
+ sysbus_connect_irq(busdev, 1, pic[49]);
+ sysbus_connect_irq(busdev, 2, pic[50]);
+ sysbus_connect_irq(busdev, 3, pic[51]);
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
if (usb_enabled) {
usb_ohci_init_pci(pci_bus, -1);
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index 98e56f1..8a88696 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -58,38 +58,6 @@ static void pci_vpb_set_irq(void *opaque, int irq_num, int
level)
qemu_set_irq(pic[irq_num], level);
}
-
-static void pci_vpb_map(SysBusDevice *dev, target_phys_addr_t base)
-{
- PCIVPBState *s = (PCIVPBState *)dev;
- /* Selfconfig area. */
- memory_region_add_subregion(get_system_memory(), base + 0x01000000,
- &s->mem_config);
- /* Normal config area. */
- memory_region_add_subregion(get_system_memory(), base + 0x02000000,
- &s->mem_config2);
-
- if (s->realview) {
- /* IO memory area. */
- memory_region_add_subregion(get_system_memory(), base + 0x03000000,
- &s->isa);
- }
-}
-
-static void pci_vpb_unmap(SysBusDevice *dev, target_phys_addr_t base)
-{
- PCIVPBState *s = (PCIVPBState *)dev;
- /* Selfconfig area. */
- memory_region_del_subregion(get_system_memory(), &s->mem_config);
- /* Normal config area. */
- memory_region_del_subregion(get_system_memory(), &s->mem_config2);
-
- if (s->realview) {
- /* IO memory area. */
- memory_region_del_subregion(get_system_memory(), &s->isa);
- }
-}
-
static int pci_vpb_init(SysBusDevice *dev)
{
PCIVPBState *s = FROM_SYSBUS(PCIVPBState, dev);
@@ -106,16 +74,22 @@ static int pci_vpb_init(SysBusDevice *dev)
/* ??? Register memory space. */
+ /* Our memory regions are:
+ * 0 : PCI self config window
+ * 1 : PCI config window
+ * 2 : PCI IO window (realview_pci only)
+ */
memory_region_init_io(&s->mem_config, &pci_vpb_config_ops, bus,
"pci-vpb-selfconfig", 0x1000000);
+ sysbus_init_mmio_region(dev, &s->mem_config);
memory_region_init_io(&s->mem_config2, &pci_vpb_config_ops, bus,
"pci-vpb-config", 0x1000000);
+ sysbus_init_mmio_region(dev, &s->mem_config2);
if (s->realview) {
isa_mmio_setup(&s->isa, 0x0100000);
+ sysbus_init_mmio_region(dev, &s->isa);
}
- sysbus_init_mmio_cb2(dev, pci_vpb_map, pci_vpb_unmap);
-
pci_create_simple(bus, -1, "versatile_pci_host");
return 0;
}
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 49f8f5f..68402cc 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -181,6 +181,7 @@ static void versatile_init(ram_addr_t ram_size,
qemu_irq pic[32];
qemu_irq sic[32];
DeviceState *dev, *sysctl;
+ SysBusDevice *busdev;
PCIBus *pci_bus;
NICInfo *nd;
int n;
@@ -219,8 +220,15 @@ static void versatile_init(ram_addr_t ram_size,
sysbus_create_simple("pl050_keyboard", 0x10006000, sic[3]);
sysbus_create_simple("pl050_mouse", 0x10007000, sic[4]);
- dev = sysbus_create_varargs("versatile_pci", 0x40000000,
- sic[27], sic[28], sic[29], sic[30], NULL);
+ dev = qdev_create(NULL, "versatile_pci");
+ busdev = sysbus_from_qdev(dev);
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(busdev, 0, 0x41000000); /* PCI self-config */
+ sysbus_mmio_map(busdev, 1, 0x42000000); /* PCI config */
+ sysbus_connect_irq(busdev, 0, sic[27]);
+ sysbus_connect_irq(busdev, 1, sic[28]);
+ sysbus_connect_irq(busdev, 2, sic[29]);
+ sysbus_connect_irq(busdev, 3, sic[30]);
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
/* The Versatile PCI bridge does not provide access to PCI IO space,
--
1.7.6.3
- [Qemu-devel] [PATCH 00/25] Memory API converions, batch 11, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 01/25] hw/lan9118.c: Convert to MemoryRegion, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 02/25] PPC: Fix via-cuda memory registration, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 03/25] palm: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 07/25] hw/arm11mpcore: Clean up to avoid using sysbus_mmio_init_cb2, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 05/25] petalogix_s2adsp1800: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 14/25] fdc: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 09/25] ppc_newworld: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 10/25] isa: Tidy support code for isabus_get_fw_dev_path, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 13/25] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 08/25] hw/versatile_pci: Expose multiple sysbus mmio regions,
Avi Kivity <=
- [Qemu-devel] [PATCH 04/25] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 12/25] memory: Fix old portio word accesses, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 19/25] parallel: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 18/25] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 21/25] vga: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 20/25] sb16: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 06/25] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 15/25] gus: Convert to isa_register_portio_list, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 17/25] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/06
- [Qemu-devel] [PATCH 16/25] m48t59: Convert to isa_register_ioport, Avi Kivity, 2011/10/06