diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-16 08:04:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-16 08:04:06 -0800 |
| commit | 87bbcfdecc5579042459bb42ede81ed23e4b9a79 (patch) | |
| tree | 87dd2ea0914784961e15f7e24ec9d5e9df816c37 /drivers/iommu/intel_irq_remapping.c | |
| parent | e5310a1cb4f56c54488ecaf29b1abf3b790cfddc (diff) | |
| parent | 46924008273ed03bd11dbb32136e3da4cfe056e1 (diff) | |
| download | talos-obmc-linux-87bbcfdecc5579042459bb42ede81ed23e4b9a79.tar.gz talos-obmc-linux-87bbcfdecc5579042459bb42ede81ed23e4b9a79.zip | |
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/intel_irq_remapping.c')
| -rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index c12ba4516df2..ac596928f6b4 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -629,7 +629,7 @@ static void iommu_disable_irq_remapping(struct intel_iommu *iommu) raw_spin_lock_irqsave(&iommu->register_lock, flags); - sts = dmar_readq(iommu->reg + DMAR_GSTS_REG); + sts = readl(iommu->reg + DMAR_GSTS_REG); if (!(sts & DMA_GSTS_IRES)) goto end; |
