[PATCH 0/1] [PULL REQUEST] iommu/vt-d: Fixes for v6.1

[PATCH 0/1] [PULL REQUEST] iommu/vt-d: Fixes for v6.1

[Lu Baolu]

Hi Joerg,

Below iommu/vt-d fix is queued for your fixes branch. It aims to:

- Fix buggy QAT device mask.

Please consider it for the iommu/fixes branch.

Best regards,
Lu Baolu

Jacob Pan (1):
  iommu/vt-d: Fix buggy QAT device mask

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

-- 
2.34.1

[PATCH 1/1] iommu/vt-d: Fix buggy QAT device mask

[Lu Baolu]

From: Jacob Pan <jacob.jun.pan@linux.intel.com>

Impacted QAT device IDs that need extra dtlb flush quirk is ranging
from 0x4940 to 0x4943. After bitwise AND device ID with 0xfffc the
result should be 0x4940 instead of 0x494c to identify these devices.

Fixes: e65a6897be5e ("iommu/vt-d: Add a fix for devices need extra dtlb flush")
Reported-by: Raghunathan Srinivasan <raghunathan.srinivasan@intel.com>
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Link: https://lore.kernel.org/r/20221203005610.2927487-1-jacob.jun.pan@linux.intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/intel/iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 5287efe247b1..644ca49e8cf8 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1402,7 +1402,7 @@ static void domain_update_iotlb(struct dmar_domain *domain)
  * check because it applies only to the built-in QAT devices and it doesn't
  * grant additional privileges.
  */
-#define BUGGY_QAT_DEVID_MASK 0x494c
+#define BUGGY_QAT_DEVID_MASK 0x4940
 static bool dev_needs_extra_dtlb_flush(struct pci_dev *pdev)
 {
 	if (pdev->vendor != PCI_VENDOR_ID_INTEL)
-- 
2.34.1

Re: [PATCH 0/1] [PULL REQUEST] iommu/vt-d: Fixes for v6.1

[Joerg Roedel]

On Mon, Dec 05, 2022 at 09:14:11PM +0800, Lu Baolu wrote:
> Jacob Pan (1):
>   iommu/vt-d: Fix buggy QAT device mask

Pulled, thanks.