diff options
| author | Linus Torvalds | 2016-02-16 08:04:06 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-02-16 08:04:06 -0800 |
| commit | 87bbcfdecc5579042459bb42ede81ed23e4b9a79 (patch) | |
| tree | 87dd2ea0914784961e15f7e24ec9d5e9df816c37 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/intel-iommu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 821273ca4873..2d9b650047a5 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -235,6 +235,9 @@ static inline void dmar_writeq(void __iomem *addr, u64 val) /* low 64 bit */ #define dma_frcd_page_addr(d) (d & (((u64)-1) << PAGE_SHIFT)) +/* PRS_REG */ +#define DMA_PRS_PPR ((u32)1) + #define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \ do { \ cycles_t start_time = get_cycles(); \ |