From 3660f25186aff60fb7d2f5aba784dddf400aec99 Mon Sep 17 00:00:00 2001

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Date: Thu, 12 Aug 2021 09:18:15 +0100

Subject: [PATCH] crypto: qat - disable AER if an error occurs in probe

 functions

Git-commit: 3660f25186aff60fb7d2f5aba784dddf400aec99

Patch-mainline: v5.15-rc1

References: jsc#PED-1073

If an error occurs after a 'adf_enable_aer()' call, it must be undone by a

corresponding 'adf_disable_aer()' call, as already done in the remove

function.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Signed-off-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_c3xxx/adf_drv.c    | 6 ++++--

 drivers/crypto/qat/qat_c62x/adf_drv.c     | 6 ++++--

 drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 6 ++++--

 3 files changed, 12 insertions(+), 6 deletions(-)

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

index 2df26643dbc97..cc6e75dc60de9 100644

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

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

@@ -201,12 +201,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	if (pci_save_state(pdev)) {

 		dev_err(&pdev->dev, "Failed to save pci state\n");

 		ret = -ENOMEM;

-		goto out_err_free_reg;

+		goto out_err_disable_aer;

 	}

 	ret = qat_crypto_dev_config(accel_dev);

 	if (ret)

-		goto out_err_free_reg;

+		goto out_err_disable_aer;

 	ret = adf_dev_init(accel_dev);

 	if (ret)

@@ -222,6 +222,8 @@ out_err_dev_stop:

 	adf_dev_stop(accel_dev);

 out_err_dev_shutdown:

 	adf_dev_shutdown(accel_dev);

+out_err_disable_aer:

+	adf_disable_aer(accel_dev);

 out_err_free_reg:

 	pci_release_regions(accel_pci_dev->pci_dev);

 out_err_disable:

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

index efdba841d720c..bf251dfe74b36 100644

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

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

@@ -201,12 +201,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	if (pci_save_state(pdev)) {

 		dev_err(&pdev->dev, "Failed to save pci state\n");

 		ret = -ENOMEM;

-		goto out_err_free_reg;

+		goto out_err_disable_aer;

 	}

 	ret = qat_crypto_dev_config(accel_dev);

 	if (ret)

-		goto out_err_free_reg;

+		goto out_err_disable_aer;

 	ret = adf_dev_init(accel_dev);

 	if (ret)

@@ -222,6 +222,8 @@ out_err_dev_stop:

 	adf_dev_stop(accel_dev);

 out_err_dev_shutdown:

 	adf_dev_shutdown(accel_dev);

+out_err_disable_aer:

+	adf_disable_aer(accel_dev);

 out_err_free_reg:

 	pci_release_regions(accel_pci_dev->pci_dev);

 out_err_disable:

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

index e1c167507157c..3976a81bd99b8 100644

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

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

@@ -201,12 +201,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	if (pci_save_state(pdev)) {

 		dev_err(&pdev->dev, "Failed to save pci state\n");

 		ret = -ENOMEM;

-		goto out_err_free_reg;

+		goto out_err_disable_aer;

 	}

 	ret = qat_crypto_dev_config(accel_dev);

 	if (ret)

-		goto out_err_free_reg;

+		goto out_err_disable_aer;

 	ret = adf_dev_init(accel_dev);

 	if (ret)

@@ -222,6 +222,8 @@ out_err_dev_stop:

 	adf_dev_stop(accel_dev);

 out_err_dev_shutdown:

 	adf_dev_shutdown(accel_dev);

+out_err_disable_aer:

+	adf_disable_aer(accel_dev);

 out_err_free_reg:

 	pci_release_regions(accel_pci_dev->pci_dev);

 out_err_disable:

-- 

2.35.3