Commit f69539b1 authored by Blue Swirl's avatar Blue Swirl
Browse files

apb_pci: convert PCI space to memory API 



Add a new memory space for PCI instead of using system memory.

This also fixes a bug where VGA region vga.chain4 is
accidentally mapped to 0xa0000 instead of 0x1ff000a0000.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 962d4b28

hw/apb_pci.c

+8 −5
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ typedef struct APBState { 
    PCIBus      *bus;

    MemoryRegion apb_config;

    MemoryRegion pci_config;

    MemoryRegion pci_mmio;

    MemoryRegion pci_ioport;

    uint32_t iommu[4];

    uint32_t pci_control[16];
@@ -336,12 +337,14 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, 
    sysbus_mmio_map(s, 2, special_base + 0x2000000ULL);

    d = FROM_SYSBUS(APBState, s);



    memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL);

    memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio);



    d->bus = pci_register_bus(&d->busdev.qdev, "pci",

                              pci_apb_set_irq, pci_pbm_map_irq, d,

                                         get_system_memory(),

                              &d->pci_mmio,

                              get_system_io(),

                              0, 32);

    pci_bus_set_mem_base(d->bus, mem_base);



    for (i = 0; i < 32; i++) {

        sysbus_connect_irq(s, i, pic[i]);