[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management A
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management API |
Date: |
Sun, 17 Jul 2011 14:13:45 +0300 |
Allow registering a BAR using a MemoryRegion. Once all users are converted,
pci_register_bar() and pci_register_bar_simple() will be removed.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pci.c | 47 +++++++++++++++++++++++++++++++++++++++--------
hw/pci.h | 3 +++
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index cf16f3b..36db58b 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -844,10 +844,15 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev)
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),
- r->filtered_size,
- IO_MEM_UNASSIGNED);
+ if (r->memory) {
+ memory_region_del_subregion(pci_dev->bus->address_space,
+ r->memory);
+ } else {
+ cpu_register_physical_memory(pci_to_cpu_addr(pci_dev->bus,
+ r->addr),
+ r->filtered_size,
+ IO_MEM_UNASSIGNED);
+ }
}
}
}
@@ -893,6 +898,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
r->type = type;
r->map_func = map_func;
r->ram_addr = IO_MEM_UNASSIGNED;
+ r->memory = NULL;
wmask = ~(size - 1);
addr = pci_bar(pci_dev, region_num);
@@ -918,6 +924,16 @@ static void pci_simple_bar_mapfunc(PCIDevice *pci_dev, int
region_num,
pci_dev->io_regions[region_num].ram_addr);
}
+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,
+ addr,
+ pci_dev->io_regions[region_num].memory,
+ 1);
+}
+
void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
pcibus_t size, uint8_t attr, ram_addr_t ram_addr)
{
@@ -927,6 +943,15 @@ void pci_register_bar_simple(PCIDevice *pci_dev, int
region_num,
pci_dev->io_regions[region_num].ram_addr = ram_addr;
}
+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,
+ pci_simple_bar_mapfunc_region);
+ pci_dev->io_regions[region_num].memory = memory;
+}
+
static void pci_bridge_filter(PCIDevice *d, pcibus_t *addr, pcibus_t *size,
uint8_t type)
{
@@ -1065,10 +1090,16 @@ static void pci_update_mappings(PCIDevice *d)
isa_unassign_ioport(r->addr, r->filtered_size);
}
} 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);
+ 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);
+ }
}
}
r->addr = new_addr;
diff --git a/hw/pci.h b/hw/pci.h
index cfeb042..c51156d 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -94,6 +94,7 @@ typedef struct PCIIORegion {
uint8_t type;
PCIMapIORegionFunc *map_func;
ram_addr_t ram_addr;
+ MemoryRegion *memory;
} PCIIORegion;
#define PCI_ROM_SLOT 6
@@ -204,6 +205,8 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
PCIMapIORegionFunc *map_func);
void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
pcibus_t size, uint8_t attr, ram_addr_t ram_addr);
+void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
+ uint8_t attr, MemoryRegion *memory);
int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
uint8_t offset, uint8_t size);
--
1.7.5.3
- [Qemu-devel] [RFC v4 04/58] Internal interfaces for memory API, (continued)
- [Qemu-devel] [RFC v4 04/58] Internal interfaces for memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 13/58] ioport: register ranges by byte aligned addresses always, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 25/58] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 02/58] memory: implement dirty tracking, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 30/58] exec.c: fix initialization of system I/O memory region, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 03/58] memory: merge adjacent segments of a single memory region, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 07/58] memory: late initialization of ram_addr, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 37/58] es1370: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 35/58] e1000: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 05/58] memory: abstract address space operations, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management API,
Avi Kivity <=
- [Qemu-devel] [RFC v4 15/58] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 12/58] exec.c: initialize memory map, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 11/58] memory: add ioeventfd support, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 33/58] rtl8139: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 10/58] memory: add backward compatibility for old mmio registration, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 55/58] pci: convert pci rom to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 40/58] virtio-pci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 22/58] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/07/17