diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-16 11:04:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-16 11:04:06 -0500 |
commit | 87bbcfdecc5579042459bb42ede81ed23e4b9a79 (patch) | |
tree | 87dd2ea0914784961e15f7e24ec9d5e9df816c37 /drivers/iommu/dmar.c | |
parent | e5310a1cb4f56c54488ecaf29b1abf3b790cfddc (diff) | |
parent | 46924008273ed03bd11dbb32136e3da4cfe056e1 (diff) |
Merge tag 'for-linus-20160216' of git://git.infradead.org/intel-iommu
Pull IOMMU SVM fixes from David Woodhouse:
"Minor register size and interrupt acknowledgement fixes which only
showed up in testing on newer hardware, but mostly a fix to the MM
refcount handling to prevent a recursive refcount issue when mmap() is
used on the file descriptor associated with a bound PASID"
* tag 'for-linus-20160216' of git://git.infradead.org/intel-iommu:
iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts
iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG
iommu/vt-d: Fix mm refcounting to hold mm_count not mm_users
Diffstat (limited to 'drivers/iommu/dmar.c')
-rw-r--r-- | drivers/iommu/dmar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 62a400c5ba06..fb092f3f11cb 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c | |||
@@ -1353,7 +1353,7 @@ void dmar_disable_qi(struct intel_iommu *iommu) | |||
1353 | 1353 | ||
1354 | raw_spin_lock_irqsave(&iommu->register_lock, flags); | 1354 | raw_spin_lock_irqsave(&iommu->register_lock, flags); |
1355 | 1355 | ||
1356 | sts = dmar_readq(iommu->reg + DMAR_GSTS_REG); | 1356 | sts = readl(iommu->reg + DMAR_GSTS_REG); |
1357 | if (!(sts & DMA_GSTS_QIES)) | 1357 | if (!(sts & DMA_GSTS_QIES)) |
1358 | goto end; | 1358 | goto end; |
1359 | 1359 | ||