From d09144745959bf7852ccafd73243dd7d1eaeb163 Mon Sep 17 00:00:00 2001

From: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Date: Mon, 9 May 2022 14:34:17 +0100

Subject: [PATCH] crypto: qat - re-enable registration of algorithms

Git-commit: d09144745959bf7852ccafd73243dd7d1eaeb163

Patch-mainline: v5.19-rc1

References: jsc#PED-1073

Re-enable the registration of algorithms after fixes to (1) use

pre-allocated buffers in the datapath and (2) support the

CRYPTO_TFM_REQ_MAY_BACKLOG flag.

This reverts commit 8893d27ffcaf6ec6267038a177cb87bcde4dd3de.

Cc: stable@vger.kernel.org

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

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

Reviewed-by: Adam Guerin <adam.guerin@intel.com>

Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

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

---

 drivers/crypto/qat/qat_4xxx/adf_drv.c      | 7 -------

 drivers/crypto/qat/qat_common/qat_crypto.c | 7 -------

 2 files changed, 14 deletions(-)

diff --git a/drivers/crypto/qat/qat_4xxx/adf_drv.c b/drivers/crypto/qat/qat_4xxx/adf_drv.c

index fa4c350c1bf92..a6c78b9c730bc 100644

--- a/drivers/crypto/qat/qat_4xxx/adf_drv.c

+++ b/drivers/crypto/qat/qat_4xxx/adf_drv.c

@@ -75,13 +75,6 @@ static int adf_crypto_dev_config(struct adf_accel_dev *accel_dev)

 	if (ret)

 		goto err;

-	/* Temporarily set the number of crypto instances to zero to avoid

-	 * registering the crypto algorithms.

-	 * This will be removed when the algorithms will support the

-	 * CRYPTO_TFM_REQ_MAY_BACKLOG flag

-	 */

-	instances = 0;

-

 	for (i = 0; i < instances; i++) {

 		val = i;

 		bank = i * 2;

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

index 80d905ed102e3..9341d892533a7 100644

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

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

@@ -161,13 +161,6 @@ int qat_crypto_dev_config(struct adf_accel_dev *accel_dev)

 	if (ret)

 		goto err;

-	/* Temporarily set the number of crypto instances to zero to avoid

-	 * registering the crypto algorithms.

-	 * This will be removed when the algorithms will support the

-	 * CRYPTO_TFM_REQ_MAY_BACKLOG flag

-	 */

-	instances = 0;

-

 	for (i = 0; i < instances; i++) {

 		val = i;

 		snprintf(key, sizeof(key), ADF_CY "%d" ADF_RING_ASYM_BANK_NUM, i);

-- 

2.35.3