[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] pci: Introduce helper to retrieve a PCI device's
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 1/6] pci: Introduce helper to retrieve a PCI device's DMA address space |
Date: |
Mon, 2 Sep 2013 11:07:07 +0300 |
From: Alexey Kardashevskiy <address@hidden>
A PCI device's DMA address space (possibly an IOMMU) is returned by a
method on the PCIBus. At the moment that only has one caller, so the
method is simply open coded. We'll need another caller for VFIO, so
this patch introduces a helper/wrapper function.
If IOMMU is not set, the pci_device_iommu_address_space() function
returns the parent's IOMMU skipping the "bus master" address space as
otherwise proper emulation would require more effort for no benefit.
Signed-off-by: David Gibson <address@hidden>
[aik: added inheritance from parent if iommu is not set for the current bus]
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/pci/pci.h | 1 +
hw/pci/pci.c | 24 ++++++++++++++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index ccec2ba..2374aa9 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -405,6 +405,7 @@ void pci_device_deassert_intx(PCIDevice *dev);
typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int);
+AddressSpace *pci_device_iommu_address_space(PCIDevice *dev);
void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque);
static inline void
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 4c004f5..8c33352 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -812,12 +812,7 @@ static PCIDevice *do_pci_register_device(PCIDevice
*pci_dev, PCIBus *bus,
}
pci_dev->bus = bus;
- if (bus->iommu_fn) {
- dma_as = bus->iommu_fn(bus, bus->iommu_opaque, devfn);
- } else {
- /* FIXME: inherit memory region from bus creator */
- dma_as = &address_space_memory;
- }
+ dma_as = pci_device_iommu_address_space(pci_dev);
memory_region_init_alias(&pci_dev->bus_master_enable_region,
OBJECT(pci_dev), "bus master",
@@ -2239,6 +2234,23 @@ static void pci_device_class_init(ObjectClass *klass,
void *data)
k->props = pci_props;
}
+AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)
+{
+ PCIBus *bus = PCI_BUS(dev->bus);
+
+ if (bus->iommu_fn) {
+ return bus->iommu_fn(bus, bus->iommu_opaque, dev->devfn);
+ }
+
+ if (bus->parent_dev) {
+ /** We are ignoring the bus master DMA bit of the bridge
+ * as it would complicate things such as VFIO for no good reason */
+ return pci_device_iommu_address_space(bus->parent_dev);
+ }
+
+ return &address_space_memory;
+}
+
void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque)
{
bus->iommu_fn = fn;
--
MST
- [Qemu-devel] [PULL 0/6] pc,pci,virtio fixes and cleanups, Michael S. Tsirkin, 2013/09/02
- [Qemu-devel] [PULL 1/6] pci: Introduce helper to retrieve a PCI device's DMA address space,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 2/6] pc: fix regression for 64 bit PCI memory, Michael S. Tsirkin, 2013/09/02
- [Qemu-devel] [PULL 3/6] pci: add config space access traces, Michael S. Tsirkin, 2013/09/02
- [Qemu-devel] [PULL 5/6] pc: reduce duplication, fix PIIX descriptions, Michael S. Tsirkin, 2013/09/02
- [Qemu-devel] [PULL 6/6] virtio_pci: fix level interrupts with irqfd, Michael S. Tsirkin, 2013/09/02
- [Qemu-devel] [PULL 4/6] hw: Clean up bogus default boot order, Michael S. Tsirkin, 2013/09/02