summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLiu Yi L <yi.l.liu@intel.com>2020-07-24 09:49:14 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-21 11:02:10 +0200
commitb15fa8563e54e6cb7ed9db8e8f006530510e7dca (patch)
tree486f8c25f78baf3bf1321d91fe23daa02fd18a34 /include
parentbfe998e5c66efe54be87ffaa0a9c51245fa4645c (diff)
downloadlinux-stable-b15fa8563e54e6cb7ed9db8e8f006530510e7dca.tar.gz
linux-stable-b15fa8563e54e6cb7ed9db8e8f006530510e7dca.tar.bz2
linux-stable-b15fa8563e54e6cb7ed9db8e8f006530510e7dca.zip
iommu/vt-d: Enforce PASID devTLB field mask
[ Upstream commit 5f77d6ca5ca74e4b4a5e2e010f7ff50c45dea326 ] Set proper masks to avoid invalid input spillover to reserved bits. Signed-off-by: Liu Yi L <yi.l.liu@intel.com> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Link: https://lore.kernel.org/r/20200724014925.15523-2-baolu.lu@linux.intel.com Signed-off-by: Joerg Roedel <jroedel@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/intel-iommu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 27dbab59f034..d86ac620f0aa 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -317,8 +317,8 @@ enum {
#define QI_DEV_EIOTLB_ADDR(a) ((u64)(a) & VTD_PAGE_MASK)
#define QI_DEV_EIOTLB_SIZE (((u64)1) << 11)
-#define QI_DEV_EIOTLB_GLOB(g) ((u64)g)
-#define QI_DEV_EIOTLB_PASID(p) (((u64)p) << 32)
+#define QI_DEV_EIOTLB_GLOB(g) ((u64)(g) & 0x1)
+#define QI_DEV_EIOTLB_PASID(p) ((u64)((p) & 0xfffff) << 32)
#define QI_DEV_EIOTLB_SID(sid) ((u64)((sid) & 0xffff) << 16)
#define QI_DEV_EIOTLB_QDEP(qd) ((u64)((qd) & 0x1f) << 4)
#define QI_DEV_EIOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) | \