From 5fb8084f31e9df7f0b2d63cfd3d10645d29b5eab Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 19 Apr 2013 11:15:17 +0100 Subject: versatile_pci: Expose PCI I/O region on Versatile PB Comments in the QEMU source code claim that the version of the PCI controller on the VersatilePB board doesn't support the PCI I/O region, but this is incorrect; expose that region, map it in the correct location, and drop the misleading comments. This change removes the only currently implemented difference between the realview-pci and versatile-pci models; however there are other differences in not-yet-implemented functionality, so we retain the distinction between the two device types. Signed-off-by: Peter Maydell Acked-by: Paul Brook --- hw/pci-host/versatile.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'hw/pci-host/versatile.c') diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 04d0029119..a50a18b54a 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -77,7 +77,7 @@ static int pci_vpb_init(SysBusDevice *dev) /* Our memory regions are: * 0 : PCI self config window * 1 : PCI config window - * 2 : PCI IO window (realview_pci only) + * 2 : PCI IO window */ memory_region_init_io(&s->mem_config, &pci_vpb_config_ops, bus, "pci-vpb-selfconfig", 0x1000000); @@ -85,10 +85,8 @@ static int pci_vpb_init(SysBusDevice *dev) memory_region_init_io(&s->mem_config2, &pci_vpb_config_ops, bus, "pci-vpb-config", 0x1000000); sysbus_init_mmio(dev, &s->mem_config2); - if (s->realview) { - isa_mmio_setup(&s->isa, 0x0100000); - sysbus_init_mmio(dev, &s->isa); - } + isa_mmio_setup(&s->isa, 0x0100000); + sysbus_init_mmio(dev, &s->isa); pci_create_simple(bus, -1, "versatile_pci_host"); return 0; -- cgit 1.4.1