ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2011-09-03 16:38:02 +00:00
parent 962d4b2834
commit f69539b14b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/apb_pci.c
View File

@ -71,6 +71,7 @@ typedef struct APBState {
PCIBus *bus; PCIBus *bus;
MemoryRegion apb_config; MemoryRegion apb_config;
MemoryRegion pci_config; MemoryRegion pci_config;
MemoryRegion pci_mmio;
MemoryRegion pci_ioport; MemoryRegion pci_ioport;
uint32_t iommu[4]; uint32_t iommu[4];
uint32_t pci_control[16]; 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); sysbus_mmio_map(s, 2, special_base + 0x2000000ULL);
d = FROM_SYSBUS(APBState, s); 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", d->bus = pci_register_bus(&d->busdev.qdev, "pci",
pci_apb_set_irq, pci_pbm_map_irq, d, pci_apb_set_irq, pci_pbm_map_irq, d,
get_system_memory(), &d->pci_mmio,
get_system_io(), get_system_io(),
0, 32); 0, 32);
pci_bus_set_mem_base(d->bus, mem_base);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
sysbus_connect_irq(s, i, pic[i]); sysbus_connect_irq(s, i, pic[i]);