Merge tag 'iommu-fix-v6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

torvalds · torvalds · commit d92b86f672a4 · 2022-12-11T09:49:39.000-08:00
Pull iommu fix from Joerg Roedel:

 - Fix device mask to catch all affected devices in the recently added
   quirk for QAT devices in the Intel VT-d driver.

* tag 'iommu-fix-v6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Fix buggy QAT device mask
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1402,7 +1402,7 @@ static void domain_update_iotlb(struct dmar_domain *domain)`
`1402`	`1402`	`* check because it applies only to the built-in QAT devices and it doesn't`
`1403`	`1403`	`* grant additional privileges.`
`1404`	`1404`	`*/`
`1405`		`-#define BUGGY_QAT_DEVID_MASK 0x494c`
	`1405`	`+#define BUGGY_QAT_DEVID_MASK 0x4940`
`1406`	`1406`	`static bool dev_needs_extra_dtlb_flush(struct pci_dev *pdev)`
`1407`	`1407`	`{`
`1408`	`1408`	`if (pdev->vendor != PCI_VENDOR_ID_INTEL)`