[PATCH 0/1] [PULL REQUEST] Intel IOMMU fix for 6.19-rc

[PATCH 0/1] [PULL REQUEST] Intel IOMMU fix for 6.19-rc

[Lu Baolu]

Hi Joerg,

Please pull this single fix for the Intel IOMMU driver for v6.19-rc
cycle.

 - iommu/vt-d: Treat PAGE_SNOOP and PWSNP separately

Given that the 6.19-rc merge window is nearly closed, I am also okay
deferring this to the v6.20 cycle if you prefer.

Best regards,
baolu

Viktor Kleen (1):
  iommu/vt-d: Treat PAGE_SNOOP and PWSNP separately

 drivers/iommu/intel/pasid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.43.0

[PATCH 1/1] iommu/vt-d: Treat PAGE_SNOOP and PWSNP separately

[Lu Baolu]

From: Viktor Kleen <viktor@kleen.org>

The PASID_FLAG_PAGE_SNOOP and PASID_FLAG_PWSNP constants are identical.
This will cause the pasid code to always set both or neither of the
PGSNP and PWSNP bits in PASID table entries. However, PWSNP is a
reserved bit if SMPWC is not set in the IOMMU's extended capability
register, even if SC is supported.

This has resulted in DMAR errors when testing the iommufd code on an
Arrow Lake platform. With this patch, those errors disappear and the
PASID table entries look correct.

Fixes: 101a2854110fa ("iommu/vt-d: Follow PT_FEAT_DMA_INCOHERENT into the PASID entry")
Cc: stable@vger.kernel.org
Signed-off-by: Viktor Kleen <viktor@kleen.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20260202192109.1665799-1-viktor@kleen.org
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/intel/pasid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/intel/pasid.h b/drivers/iommu/intel/pasid.h
index c3c8c907983e..48d3bb6b68de 100644
--- a/drivers/iommu/intel/pasid.h
+++ b/drivers/iommu/intel/pasid.h
@@ -24,7 +24,7 @@
 
 #define PASID_FLAG_NESTED		BIT(1)
 #define PASID_FLAG_PAGE_SNOOP		BIT(2)
-#define PASID_FLAG_PWSNP		BIT(2)
+#define PASID_FLAG_PWSNP		BIT(3)
 
 /*
  * The PASID_FLAG_FL5LP flag Indicates using 5-level paging for first-
-- 
2.43.0