[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/39] pci: allow I/O BARs to be registered with pci
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 12/39] pci: allow I/O BARs to be registered with pci_register_bar_region() |
Date: |
Sun, 31 Jul 2011 20:57:35 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pci.c | 43 +++++++++++++++++++++++--------------------
hw/pci.h | 1 +
hw/pci_internals.h | 3 ++-
3 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 2659d96..980840f 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -271,7 +271,8 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name);
assert(PCI_FUNC(devfn_min) == 0);
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 */
QLIST_INIT(&bus->child);
@@ -847,12 +848,11 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev)
r = &pci_dev->io_regions[i];
if (!r->size || r->addr == PCI_BAR_UNMAPPED)
continue;
- if (r->type == PCI_BASE_ADDRESS_SPACE_IO) {
- isa_unassign_ioport(r->addr, r->filtered_size);
+ if (r->memory) {
+ memory_region_del_subregion(r->address_space, r->memory);
} else {
- if (r->memory) {
- memory_region_del_subregion(pci_dev->bus->address_space,
- r->memory);
+ if (r->type == PCI_BASE_ADDRESS_SPACE_IO) {
+ isa_unassign_ioport(r->addr, r->filtered_size);
} else {
cpu_register_physical_memory(pci_to_cpu_addr(pci_dev->bus,
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,
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,
- pci_dev->io_regions[region_num].memory,
+ r->memory,
1);
}
@@ -953,9 +955,13 @@ void pci_register_bar_region(PCIDevice *pci_dev, int
region_num,
uint8_t attr, MemoryRegion *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_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)
@@ -1090,7 +1096,9 @@ static void pci_update_mappings(PCIDevice *d)
/* now do the real mapping */
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;
/* NOTE: specific hack for IDE in PC case:
only one byte must be mapped. */
@@ -1101,16 +1109,11 @@ static void pci_update_mappings(PCIDevice *d)
isa_unassign_ioport(r->addr, r->filtered_size);
}
} else {
- if (r->memory) {
- memory_region_del_subregion(d->bus->address_space,
- r->memory);
- } else {
- cpu_register_physical_memory(pci_to_cpu_addr(d->bus,
- r->addr),
- r->filtered_size,
- IO_MEM_UNASSIGNED);
- qemu_unregister_coalesced_mmio(r->addr, r->filtered_size);
- }
+ cpu_register_physical_memory(pci_to_cpu_addr(d->bus,
+ r->addr),
+ r->filtered_size,
+ IO_MEM_UNASSIGNED);
+ qemu_unregister_coalesced_mmio(r->addr, r->filtered_size);
}
}
r->addr = new_addr;
diff --git a/hw/pci.h b/hw/pci.h
index 45b30fa..928e96c 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -95,6 +95,7 @@ typedef struct PCIIORegion {
PCIMapIORegionFunc *map_func;
ram_addr_t ram_addr;
MemoryRegion *memory;
+ MemoryRegion *address_space;
} PCIIORegion;
#define PCI_ROM_SLOT 6
diff --git a/hw/pci_internals.h b/hw/pci_internals.h
index c3a463a..c7fd23d 100644
--- a/hw/pci_internals.h
+++ b/hw/pci_internals.h
@@ -25,7 +25,8 @@ struct PCIBus {
PCIDevice *devices[PCI_SLOT_MAX * PCI_FUNC_MAX];
PCIDevice *parent_dev;
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_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */
--
1.7.5.3
- [Qemu-devel] [PATCH 00/39] Memory API, batch 2: PCI devices, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 01/39] pci: add API to get a BAR's mapped address, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 02/39] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 36/39] pci: remove pci_register_bar(), Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 15/39] e1000: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 10/39] exec.c: fix initialization of system I/O memory region, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 27/39] i6300esb: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 39/39] pci: remove support for pre memory API BARs, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 13/39] rtl8139: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 21/39] ahci: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 12/39] pci: allow I/O BARs to be registered with pci_register_bar_region(),
Avi Kivity <=
- [Qemu-devel] [PATCH 05/39] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 04/39] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 25/39] ne2000: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 31/39] uhci: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 09/39] Integrate I/O memory regions into qemu, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 22/39] intel-hda: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 30/39] ehci: convert to memory API, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 08/39] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/07/31
- [Qemu-devel] [PATCH 06/39] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/31