[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/13] iommu: Allow PCI to use IOMMU infrastructure
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 12/13] iommu: Allow PCI to use IOMMU infrastructure |
Date: |
Thu, 22 Mar 2012 13:14:47 +1100 |
This patch adds some hooks to let PCI devices and busses use the new IOMMU
infrastructure. When IOMMU support is enabled, each PCI device now
contains a DMAContext * which is used by the pci_dma_*() wrapper functions.
By default, the contexts are initialized to NULL, assuming no IOMMU.
However the platform or host bridge code which sets up the PCI bus can use
pci_setup_iommu() to set a function which will determine the correct
DMAContext for a given PCI device.
Cc: Michael S. Tsirkin <address@hidden>
Cc: Richard Henderson <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Eduard - Gabriel Munteanu <address@hidden>
---
hw/pci.c | 13 +++++++++++++
hw/pci.h | 13 ++++++++++++-
hw/pci_internals.h | 4 ++++
3 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index ed8ec99..eb1c456 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -761,6 +761,11 @@ static PCIDevice *do_pci_register_device(PCIDevice
*pci_dev, PCIBus *bus,
return NULL;
}
pci_dev->bus = bus;
+#ifdef CONFIG_IOMMU
+ if (bus->dma_context_fn) {
+ pci_dev->dma = bus->dma_context_fn(bus, bus->dma_context_opaque,
devfn);
+ }
+#endif
pci_dev->devfn = devfn;
pstrcpy(pci_dev->name, sizeof(pci_dev->name), name);
pci_dev->irq_state = 0;
@@ -2004,6 +2009,14 @@ static void pci_device_class_init(ObjectClass *klass,
void *data)
k->bus_info = &pci_bus_info;
}
+#ifdef CONFIG_IOMMU
+void pci_setup_iommu(PCIBus *bus, PCIDMAContextFunc fn, void *opaque)
+{
+ bus->dma_context_fn = fn;
+ bus->dma_context_opaque = opaque;
+}
+#endif
+
static TypeInfo pci_device_type_info = {
.name = TYPE_PCI_DEVICE,
.parent = TYPE_DEVICE,
diff --git a/hw/pci.h b/hw/pci.h
index 41dcd05..1273dc3 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -170,6 +170,7 @@ typedef struct PCIDeviceClass {
struct PCIDevice {
DeviceState qdev;
+
/* PCI config space */
uint8_t *config;
@@ -191,6 +192,9 @@ struct PCIDevice {
uint32_t devfn;
char name[64];
PCIIORegion io_regions[PCI_NUM_REGIONS];
+#ifdef CONFIG_IOMMU
+ DMAContext *dma;
+#endif
/* do not access the following fields */
PCIConfigReadFunc *config_read;
@@ -311,6 +315,10 @@ int pci_read_devaddr(Monitor *mon, const char *addr, int
*domp, int *busp,
void pci_device_deassert_intx(PCIDevice *dev);
+typedef DMAContext *(*PCIDMAContextFunc)(PCIBus *, void *, int);
+
+void pci_setup_iommu(PCIBus *bus, PCIDMAContextFunc fn, void *opaque);
+
static inline void
pci_set_byte(uint8_t *config, uint8_t val)
{
@@ -547,8 +555,11 @@ static inline uint32_t pci_config_size(const PCIDevice *d)
/* DMA access functions */
static inline DMAContext *pci_dma_context(PCIDevice *dev)
{
- /* Stub for when we have no PCI iommu support */
+#ifdef CONFIG_IOMMU
+ return dev->dma;
+#else
return NULL;
+#endif
}
static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr,
diff --git a/hw/pci_internals.h b/hw/pci_internals.h
index 96690b7..b6b7a0e 100644
--- a/hw/pci_internals.h
+++ b/hw/pci_internals.h
@@ -16,6 +16,10 @@ extern struct BusInfo pci_bus_info;
struct PCIBus {
BusState qbus;
+#ifdef CONFIG_IOMMU
+ PCIDMAContextFunc dma_context_fn;
+ void *dma_context_opaque;
+#endif
uint8_t devfn_min;
pci_set_irq_fn set_irq;
pci_map_irq_fn map_irq;
--
1.7.9.1
- [Qemu-devel] [PATCH 08/13] ide/ahci: Use universal DMA helper functions, (continued)
- [Qemu-devel] [PATCH 08/13] ide/ahci: Use universal DMA helper functions, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 07/13] iommu: Make sglists and dma_bdrv helpers use new universal DMA helpers, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 13/13] pseries: Implement IOMMU and DMA for PAPR PCI devices, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 10/13] iommu: Introduce IOMMU emulation infrastructure, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 05/13] iommu: Add universal DMA helper functions, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 03/13] usb-xhci: Use PCI DMA helper functions, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 09/13] usb: Convert usb_packet_{map, unmap} to universal DMA helpers, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 11/13] pseries: Convert sPAPR TCEs to use generic IOMMU infrastructure, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 12/13] iommu: Allow PCI to use IOMMU infrastructure,
David Gibson <=
- Re: [Qemu-devel] [0/13] RFC: Guest visible IOMMU, Wei Wang, 2012/03/22