From f9f8f2b7415705448118102764076504c0850082 Mon Sep 17 00:00:00 2001

From: Marco Chiappero <marco.chiappero@intel.com>

Date: Thu, 7 Apr 2022 17:54:45 +0100

Subject: [PATCH] crypto: qat - remove unnecessary tests to detect PFVF support

Git-commit: f9f8f2b7415705448118102764076504c0850082

Patch-mainline: v5.19-rc1

References: jsc#PED-1073

Previously, the GEN4 host driver supported SR-IOV but had no working

implementation of the PFVF protocol to communicate with VF drivers.

Since all the host drivers for QAT devices now support both SR-IOV and

PFVF, remove the old and unnecessary checks to test PFVF support.

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>

Reviewed-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 | 10 +++-------

 1 file changed, 3 insertions(+), 7 deletions(-)

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

index 887d95ec1f486..8e8421a46b54e 100644

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

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

@@ -73,8 +73,7 @@ static int adf_enable_sriov(struct adf_accel_dev *accel_dev)

 		hw_data->configure_iov_threads(accel_dev, true);

 	/* Enable VF to PF interrupts for all VFs */

-	if (hw_data->pfvf_ops.get_pf2vf_offset)

-		adf_enable_vf2pf_interrupts(accel_dev, BIT_ULL(totalvfs) - 1);

+	adf_enable_vf2pf_interrupts(accel_dev, BIT_ULL(totalvfs) - 1);

 	/*

 	 * Due to the hardware design, when SR-IOV and the ring arbiter

@@ -103,14 +102,11 @@ void adf_disable_sriov(struct adf_accel_dev *accel_dev)

 	if (!accel_dev->pf.vf_info)

 		return;

-	if (hw_data->pfvf_ops.get_pf2vf_offset)

-		adf_pf2vf_notify_restarting(accel_dev);

-

+	adf_pf2vf_notify_restarting(accel_dev);

 	pci_disable_sriov(accel_to_pci_dev(accel_dev));

 	/* Disable VF to PF interrupts */

-	if (hw_data->pfvf_ops.get_pf2vf_offset)

-		adf_disable_vf2pf_interrupts(accel_dev, GENMASK(31, 0));

+	adf_disable_vf2pf_interrupts(accel_dev, GENMASK(31, 0));

 	/* Clear Valid bits in AE Thread to PCIe Function Mapping */

 	if (hw_data->configure_iov_threads)

-- 

2.35.3