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

pci: allow I/O BARs to be registered with pci_register_bar_region() 

Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-08-08 16:09:05 +03:00 committed by Anthony Liguori
parent aee97b840f
commit 5968eca3a3
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/pci.c
View File

@ -271,7 +271,8 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name); qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name);
assert(PCI_FUNC(devfn_min) == 0); assert(PCI_FUNC(devfn_min) == 0);
bus->devfn_min = devfn_min; bus->devfn_min = devfn_min;
bus->address_space = address_space_mem; bus->address_space_mem = address_space_mem;
bus->address_space_io = address_space_io;
/* host bridge */ /* host bridge */
QLIST_INIT(&bus->child); QLIST_INIT(&bus->child);
@ -847,12 +848,11 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev)
r = &pci_dev->io_regions[i]; r = &pci_dev->io_regions[i];
if (!r->size || r->addr == PCI_BAR_UNMAPPED) if (!r->size || r->addr == PCI_BAR_UNMAPPED)
continue; continue;
if (r->memory) {
memory_region_del_subregion(r->address_space, r->memory);
} else {
if (r->type == PCI_BASE_ADDRESS_SPACE_IO) { if (r->type == PCI_BASE_ADDRESS_SPACE_IO) {
isa_unassign_ioport(r->addr, r->filtered_size); isa_unassign_ioport(r->addr, r->filtered_size);
} else {
if (r->memory) {
memory_region_del_subregion(pci_dev->bus->address_space,
r->memory);
} else { } else {
cpu_register_physical_memory(pci_to_cpu_addr(pci_dev->bus, cpu_register_physical_memory(pci_to_cpu_addr(pci_dev->bus,
r->addr), r->addr),
@ -934,9 +934,11 @@ static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num,
pcibus_t addr, pcibus_t size, pcibus_t addr, pcibus_t size,
int type) int type)
{ {
memory_region_add_subregion_overlap(pci_dev->bus->address_space, PCIIORegion *r = &pci_dev->io_regions[region_num];
memory_region_add_subregion_overlap(r->address_space,
addr, addr,
pci_dev->io_regions[region_num].memory, r->memory,
1); 1);
} }
@ -953,9 +955,13 @@ void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory) uint8_t attr, MemoryRegion *memory)
{ {
pci_register_bar(pci_dev, region_num, memory_region_size(memory), pci_register_bar(pci_dev, region_num, memory_region_size(memory),
PCI_BASE_ADDRESS_SPACE_MEMORY | attr, attr,
pci_simple_bar_mapfunc_region); pci_simple_bar_mapfunc_region);
pci_dev->io_regions[region_num].memory = memory; pci_dev->io_regions[region_num].memory = memory;
pci_dev->io_regions[region_num].address_space
= attr & PCI_BASE_ADDRESS_SPACE_IO
? pci_dev->bus->address_space_io
: pci_dev->bus->address_space_mem;
} }
pcibus_t pci_get_bar_addr(PCIDevice *pci_dev, int region_num) pcibus_t pci_get_bar_addr(PCIDevice *pci_dev, int region_num)
@ -1090,7 +1096,9 @@ static void pci_update_mappings(PCIDevice *d)
/* now do the real mapping */ /* now do the real mapping */
if (r->addr != PCI_BAR_UNMAPPED) { if (r->addr != PCI_BAR_UNMAPPED) {
if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { if (r->memory) {
memory_region_del_subregion(r->address_space, r->memory);
} else if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
int class; int class;
/* NOTE: specific hack for IDE in PC case: /* NOTE: specific hack for IDE in PC case:
only one byte must be mapped. */ only one byte must be mapped. */
@ -1100,10 +1108,6 @@ static void pci_update_mappings(PCIDevice *d)
} else { } else {
isa_unassign_ioport(r->addr, r->filtered_size); isa_unassign_ioport(r->addr, r->filtered_size);
} }
} else {
if (r->memory) {
memory_region_del_subregion(d->bus->address_space,
r->memory);
} else { } else {
cpu_register_physical_memory(pci_to_cpu_addr(d->bus, cpu_register_physical_memory(pci_to_cpu_addr(d->bus,
r->addr), r->addr),
@ -1112,7 +1116,6 @@ static void pci_update_mappings(PCIDevice *d)
qemu_unregister_coalesced_mmio(r->addr, r->filtered_size); qemu_unregister_coalesced_mmio(r->addr, r->filtered_size);
} }
} }
}
r->addr = new_addr; r->addr = new_addr;
r->filtered_size = filtered_size; r->filtered_size = filtered_size;
if (r->addr != PCI_BAR_UNMAPPED) { if (r->addr != PCI_BAR_UNMAPPED) {

1
hw/pci.h
View File

@ -95,6 +95,7 @@ typedef struct PCIIORegion {
PCIMapIORegionFunc *map_func; PCIMapIORegionFunc *map_func;
ram_addr_t ram_addr; ram_addr_t ram_addr;
MemoryRegion *memory; MemoryRegion *memory;
MemoryRegion *address_space;
} PCIIORegion; } PCIIORegion;
#define PCI_ROM_SLOT 6 #define PCI_ROM_SLOT 6

3
hw/pci_internals.h
View File

@ -25,7 +25,8 @@ struct PCIBus {
PCIDevice *devices[PCI_SLOT_MAX * PCI_FUNC_MAX]; PCIDevice *devices[PCI_SLOT_MAX * PCI_FUNC_MAX];
PCIDevice *parent_dev; PCIDevice *parent_dev;
target_phys_addr_t mem_base; target_phys_addr_t mem_base;
MemoryRegion *address_space; MemoryRegion *address_space_mem;
MemoryRegion *address_space_io;
QLIST_HEAD(, PCIBus) child; /* this will be replaced by qdev later */ QLIST_HEAD(, PCIBus) child; /* this will be replaced by qdev later */
QLIST_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */ QLIST_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */