[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/13] pseries: Implement IOMMU and DMA for PAPR PCI
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 13/13] pseries: Implement IOMMU and DMA for PAPR PCI devices |
Date: |
Thu, 22 Mar 2012 13:14:48 +1100 |
Currently the pseries machine emulation does not support DMA for emulated
PCI devices, because the PAPR spec always requires a (guest visible,
paravirtualized) IOMMU which was not implemented. Now that we have
infrastructure for IOMMU emulation, we can correct this and allow PCI DMA
for pseries.
With the existing PAPR IOMMU code used for VIO devices, this is almost
trivial. We use a single DMAContext for each (virtual) PCI host bridge,
which is the usual configuration on real PAPR machines (which often have
_many_ PCI host bridges).
Cc: Alex Graf <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/spapr.h | 1 +
hw/spapr_pci.c | 15 +++++++++++++++
hw/spapr_pci.h | 1 +
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/hw/spapr.h b/hw/spapr.h
index d11f618..291546f 100644
--- a/hw/spapr.h
+++ b/hw/spapr.h
@@ -328,6 +328,7 @@ typedef struct sPAPRTCE {
} sPAPRTCE;
#define SPAPR_VIO_BASE_LIOBN 0x00000000
+#define SPAPR_PCI_BASE_LIOBN 0x80000000
void spapr_iommu_init(void);
DMAContext *spapr_tce_new_dma_context(uint32_t liobn, size_t window_size);
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index 77f3e52..76e74dc 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -201,12 +201,21 @@ static const MemoryRegionOps spapr_io_ops = {
/*
* PHB PCI device
*/
+static DMAContext *spapr_pci_dma_context_fn(PCIBus *bus, void *opaque,
+ int devfn)
+{
+ sPAPRPHBState *phb = opaque;
+
+ return phb->dma;
+}
+
static int spapr_phb_init(SysBusDevice *s)
{
sPAPRPHBState *phb = FROM_SYSBUS(sPAPRPHBState, s);
char *namebuf;
int i;
PCIBus *bus;
+ uint32_t liobn;
phb->dtbusname = g_strdup_printf("address@hidden" PRIx64, phb->buid);
namebuf = alloca(strlen(phb->dtbusname) + 32);
@@ -247,6 +256,10 @@ static int spapr_phb_init(SysBusDevice *s)
PCI_DEVFN(0, 0), SPAPR_PCI_NUM_LSI);
phb->host_state.bus = bus;
+ liobn = SPAPR_PCI_BASE_LIOBN | (pci_find_domain(bus) << 16);
+ phb->dma = spapr_tce_new_dma_context(liobn, 0x40000000);
+ pci_setup_iommu(bus, spapr_pci_dma_context_fn, phb);
+
QLIST_INSERT_HEAD(&spapr->phbs, phb, list);
/* Initialize the LSI table */
@@ -404,6 +417,8 @@ int spapr_populate_pci_devices(sPAPRPHBState *phb,
_FDT(fdt_setprop(fdt, bus_off, "interrupt-map", &interrupt_map,
7 * sizeof(interrupt_map[0])));
+ spapr_dma_dt(fdt, bus_off, "ibm,dma-window", phb->dma);
+
return 0;
}
diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h
index 039f85b..153a968 100644
--- a/hw/spapr_pci.h
+++ b/hw/spapr_pci.h
@@ -39,6 +39,7 @@ typedef struct sPAPRPHBState {
MemoryRegion memspace, iospace;
target_phys_addr_t mem_win_addr, mem_win_size, io_win_addr, io_win_size;
MemoryRegion memwindow, iowindow;
+ DMAContext *dma;
struct {
uint32_t dt_irq;
--
1.7.9.1
- [Qemu-devel] [0/13] RFC: Guest visible IOMMU, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 04/13] Implement cpu_physical_memory_zero(), David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 02/13] Better support for dma_addr_t variables, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 01/13] Use DMADirection type for dma_bdrv_io, David Gibson, 2012/03/21
- [Qemu-devel] [PATCH 06/13] usb-ohci: Use universal DMA helper functions, David Gibson, 2012/03/21
- [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 <=
- [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, 2012/03/21
- Re: [Qemu-devel] [0/13] RFC: Guest visible IOMMU, Wei Wang, 2012/03/22