[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] pci: add pci_register_bar_simple() API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 01/10] pci: add pci_register_bar_simple() API |
Date: |
Mon, 4 Apr 2011 18:27:58 +0300 |
This is similar to pci_register_bar(), but automatically registers a single
memory region spanning the entire BAR.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pci.c | 17 +++++++++++++++++
hw/pci.h | 3 +++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 6b577e1..65ae196 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -859,6 +859,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
r->filtered_size = size;
r->type = type;
r->map_func = map_func;
+ r->ram_addr = IO_MEM_UNASSIGNED;
wmask = ~(size - 1);
addr = pci_bar(pci_dev, region_num);
@@ -877,6 +878,22 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
}
}
+static void pci_simple_bar_mapfunc(PCIDevice *pci_dev, int region_num,
+ pcibus_t addr, pcibus_t size, int type)
+{
+ cpu_register_physical_memory(addr, size,
+ pci_dev->io_regions[region_num].ram_addr);
+}
+
+void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
+ pcibus_t size, uint8_t attr, ram_addr_t ram_addr)
+{
+ pci_register_bar(pci_dev, region_num, size,
+ PCI_BASE_ADDRESS_SPACE_MEMORY | attr,
+ pci_simple_bar_mapfunc);
+ pci_dev->io_regions[region_num].ram_addr = ram_addr;
+}
+
static void pci_bridge_filter(PCIDevice *d, pcibus_t *addr, pcibus_t *size,
uint8_t type)
{
diff --git a/hw/pci.h b/hw/pci.h
index 52ee8c9..3230764 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -92,6 +92,7 @@ typedef struct PCIIORegion {
pcibus_t filtered_size;
uint8_t type;
PCIMapIORegionFunc *map_func;
+ ram_addr_t ram_addr;
} PCIIORegion;
#define PCI_ROM_SLOT 6
@@ -200,6 +201,8 @@ PCIDevice *pci_register_device(PCIBus *bus, const char
*name,
void pci_register_bar(PCIDevice *pci_dev, int region_num,
pcibus_t size, uint8_t type,
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);
int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
uint8_t offset, uint8_t size);
--
1.7.1
- [Qemu-devel] [PATCH 00/10] pci: pci_register_bar_simple, Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 03/10] cirrus-vga: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 05/10] ich/ahci: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 01/10] pci: add pci_register_bar_simple() API,
Avi Kivity <=
- [Qemu-devel] [PATCH 08/10] pcnet-pci: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 02/10] rtl8139: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 09/10] usb-ohci: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 04/10] eepro100: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 06/10] hda-intel: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 07/10] hda-intel: convert to pci_register_bar_simple() (partial), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 10/10] wdt_i6300esb: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] Re: [PATCH 00/10] pci: pci_register_bar_simple, Michael S. Tsirkin, 2011/04/04