| Message ID | 1579613871-301529-5-git-send-email-jonathan.derrick@intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 2b0140c69637e6f3cf9f8a0b7629567de9645680 |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | Clean up VMD DMA Map Ops | expand |
On 1/21/20 9:37 PM, Jon Derrick wrote: > The PCI device may have a DMA requester on another bus, such as VMD > subdevices needing to use the VMD endpoint. This case requires the real > DMA device when mapping to IOMMU. > > Signed-off-by: Jon Derrick<jonathan.derrick@intel.com> Acked-by: Lu Baolu <baolu.lu@linux.intel.com> Thanks, baolu
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 0c8d81f..72f26e8 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -782,6 +782,8 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf return NULL; #endif + pdev = pci_real_dma_dev(pdev); + /* VFs aren't listed in scope tables; we need to look up * the PF instead to find the IOMMU. */ pf_pdev = pci_physfn(pdev); @@ -2428,6 +2430,9 @@ static struct dmar_domain *find_domain(struct device *dev) dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO)) return NULL; + if (dev_is_pci(dev)) + dev = &pci_real_dma_dev(to_pci_dev(dev))->dev; + /* No lock here, assumes no domain exit in normal case */ info = dev->archdata.iommu; if (likely(info))
The PCI device may have a DMA requester on another bus, such as VMD subdevices needing to use the VMD endpoint. This case requires the real DMA device when mapping to IOMMU. Signed-off-by: Jon Derrick <jonathan.derrick@intel.com> --- drivers/iommu/intel-iommu.c | 5 +++++ 1 file changed, 5 insertions(+)