[Qemu-devel] [RFC PATCH 02/13] pci: add IOMMU support via the generic DMA layer

[Eduard - Gabriel Munteanu]

IOMMUs can now be hooked onto the PCI bus. This makes use of the generic
DMA layer.

Signed-off-by: Eduard - Gabriel Munteanu <address@hidden>
---
 hw/pci.c           |    7 +++++++
 hw/pci.h           |    9 +++++++++
 hw/pci_internals.h |    1 +
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index 0875654..7c8762c 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -745,6 +745,7 @@ static PCIDevice *do_pci_register_device(PCIDevice 
*pci_dev, PCIBus *bus,
         return NULL;
     }
     pci_dev->bus = bus;
+    pci_dev->dma.mmu = &bus->mmu;
     pci_dev->devfn = devfn;
     pstrcpy(pci_dev->name, sizeof(pci_dev->name), name);
     pci_dev->irq_state = 0;
@@ -2161,3 +2162,9 @@ int pci_qdev_find_device(const char *id, PCIDevice **pdev)
 
     return rc;
 }
+
+void pci_register_iommu(PCIDevice *dev, DMATranslateFunc *translate)
+{
+    dev->bus->mmu.iommu = &dev->qdev;
+    dev->bus->mmu.translate = translate;
+}
diff --git a/hw/pci.h b/hw/pci.h
index c6a6eb6..f3b51ec 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -5,6 +5,7 @@
 #include "qobject.h"
 
 #include "qdev.h"
+#include "dma_rw.h"
 
 /* PCI includes legacy ISA access.  */
 #include "isa.h"
@@ -129,6 +130,10 @@ enum {
 
 struct PCIDevice {
     DeviceState qdev;
+
+    /* For devices which do DMA. */
+    DMADevice dma;
+
     /* PCI config space */
     uint8_t *config;
 
@@ -271,6 +276,8 @@ void pci_bridge_update_mappings(PCIBus *b);
 
 void pci_device_deassert_intx(PCIDevice *dev);
 
+void pci_register_iommu(PCIDevice *dev, DMATranslateFunc *translate);
+
 static inline void
 pci_set_byte(uint8_t *config, uint8_t val)
 {
@@ -475,4 +482,6 @@ static inline uint32_t pci_config_size(const PCIDevice *d)
     return pci_is_express(d) ? PCIE_CONFIG_SPACE_SIZE : PCI_CONFIG_SPACE_SIZE;
 }
 
+DEFINE_DMA_OPS(pci, PCIDevice, dma)
+
 #endif
diff --git a/hw/pci_internals.h b/hw/pci_internals.h
index fbe1866..6452e8c 100644
--- a/hw/pci_internals.h
+++ b/hw/pci_internals.h
@@ -16,6 +16,7 @@ extern struct BusInfo pci_bus_info;
 
 struct PCIBus {
     BusState qbus;
+    DMAMmu mmu;
     uint8_t devfn_min;
     pci_set_irq_fn set_irq;
     pci_map_irq_fn map_irq;
-- 
1.7.3.4