diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-27 08:24:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-27 08:24:46 -0800 |
| commit | 105ecadc6d9c1effd23dd46fcc340f62d467cd6c (patch) | |
| tree | 594d2302bf4d52dedfc5ad131a6093558fb28f9e /drivers/iommu/dmar.c | |
| parent | ff17bf8a0d2d60a343db304b835c0e83efa660d9 (diff) | |
| parent | 910170442944e1f8674fd5ddbeeb8ccd1877ea98 (diff) | |
| download | linux-105ecadc6d9c1effd23dd46fcc340f62d467cd6c.tar.gz linux-105ecadc6d9c1effd23dd46fcc340f62d467cd6c.tar.xz | |
Merge git://git.infradead.org/intel-iommu
Pull IOMMU fixes from David Woodhouse:
"Two minor fixes.
The first fixes the assignment of SR-IOV virtual functions to the
correct IOMMU unit, and the second fixes the excessively large (and
physically contiguous) PASID tables used with SVM"
* git://git.infradead.org/intel-iommu:
iommu/vt-d: Fix PASID table allocation
iommu/vt-d: Fix IOMMU lookup for SR-IOV Virtual Functions
Diffstat (limited to 'drivers/iommu/dmar.c')
| -rw-r--r-- | drivers/iommu/dmar.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 58470f5ced04..8c53748a769d 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -338,7 +338,9 @@ static int dmar_pci_bus_notifier(struct notifier_block *nb, struct pci_dev *pdev = to_pci_dev(data); struct dmar_pci_notify_info *info; - /* Only care about add/remove events for physical functions */ + /* Only care about add/remove events for physical functions. + * For VFs we actually do the lookup based on the corresponding + * PF in device_to_iommu() anyway. */ if (pdev->is_virtfn) return NOTIFY_DONE; if (action != BUS_NOTIFY_ADD_DEVICE && |