From c79c09ad31e2c0a5ba0166b284f433b95d9c4c18 Mon Sep 17 00:00:00 2001

From: Robin Murphy <robin.murphy@arm.com>

Date: Tue, 5 Apr 2022 13:25:11 +0100

Subject: [PATCH] crypto: qat - stop using iommu_present()

Git-commit: c79c09ad31e2c0a5ba0166b284f433b95d9c4c18

Patch-mainline: v5.19-rc1

References: jsc#PED-1073

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>

Signed-off-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_common/adf_sriov.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/qat/qat_common/adf_sriov.c

index b960bca1f9d2f..7f9c18dc45401 100644

--- a/drivers/crypto/qat/qat_common/adf_sriov.c

+++ b/drivers/crypto/qat/qat_common/adf_sriov.c

@@ -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) {

-- 

2.35.3