summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-27 19:24:46 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-27 19:24:46 +0300
commit105ecadc6d9c1effd23dd46fcc340f62d467cd6c (patch)
tree594d2302bf4d52dedfc5ad131a6093558fb28f9e /include
parentff17bf8a0d2d60a343db304b835c0e83efa660d9 (diff)
parent910170442944e1f8674fd5ddbeeb8ccd1877ea98 (diff)
downloadlinux-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 'include')
-rw-r--r--include/linux/intel-iommu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 2d9b650047a5..d49e26c6cdc7 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -429,6 +429,7 @@ struct intel_iommu {
struct page_req_dsc *prq;
unsigned char prq_name[16]; /* Name for PRQ interrupt */
struct idr pasid_idr;
+ u32 pasid_max;
#endif
struct q_inval *qi; /* Queued invalidation info */
u32 *iommu_state; /* Store iommu states between suspend and resume.*/