Commit d92b86f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 4cee37b3 81c95fba

drivers/iommu/intel/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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)