crypto: qat - stop using iommu_present()
authorRobin Murphy <robin.murphy@arm.com>
Tue, 5 Apr 2022 12:25:11 +0000 (13:25 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 15 Apr 2022 08:34:25 +0000 (16:34 +0800)
Even if an IOMMU might be present for some PCI segment in the system,
that doesn't necessarily mean it provides translation for the device
we care about. Replace iommu_present() with a more appropriate check.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qat/qat_common/adf_sriov.c

index b960bca..7f9c18d 100644 (file)
@@ -3,7 +3,6 @@
 #include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/device.h>
-#include <linux/iommu.h>
 #include "adf_common_drv.h"
 #include "adf_cfg.h"
 #include "adf_pfvf_pf_msg.h"
@@ -176,7 +175,7 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
                return -EFAULT;
        }
 
-       if (!iommu_present(&pci_bus_type))
+       if (!device_iommu_mapped(&pdev->dev))
                dev_warn(&pdev->dev, "IOMMU should be enabled for SR-IOV to work correctly\n");
 
        if (accel_dev->pf.vf_info) {