Commit a42a984c authored Feb 14, 2020 by Adrian Huang Committed by Greg Kroah-Hartman Apr 24, 2020

iommu/amd: Fix the configuration of GCR3 table root pointer



[ Upstream commit c20f36534666e37858a14e591114d93cc1be0d34 ]

The SPA of the GCR3 table root pointer[51:31] masks 20 bits. However,
this requires 21 bits (Please see the AMD IOMMU specification).
This leads to the potential failure when the bit 51 of SPA of
the GCR3 table root pointer is 1'.

Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
Fixes: 52815b75 ("iommu/amd: Add support for IOMMUv2 domain mode")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2567276b

drivers/iommu/amd_iommu_types.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,7 @@

		#define DTE_GCR3_VAL_A(x) (((x) >> 12) & 0x00007ULL)
		#define DTE_GCR3_VAL_B(x) (((x) >> 15) & 0x0ffffULL)
		#define DTE_GCR3_VAL_C(x) (((x) >> 31) & 0xfffffULL)
		#define DTE_GCR3_VAL_C(x) (((x) >> 31) & 0x1fffffULL)

		#define DTE_GCR3_INDEX_A 0
		#define DTE_GCR3_INDEX_B 1