crypto: hisilicon/qm - inject error before stopping queue

commit b04f06fc0243600665b3b50253869533b7938468 upstream.

The master ooo cannot be completely closed when the
accelerator core reports memory error. Therefore, the driver
needs to inject the qm error to close the master ooo. Currently,
the qm error is injected after stopping queue, memory may be
released immediately after stopping queue, causing the device to
access the released memory. Therefore, error is injected to close master
ooo before stopping queue to ensure that the device does not access
the released memory.

Fixes: 6c6dd5802c2d ("crypto: hisilicon/qm - add controller reset interface")
Signed-off-by: Weili Qian <qianweili@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Libo Chen <libo.chen.cn@windriver.com>

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index fd89918abd1918c610f8ec57d2fb779ac67c215e..58e995db37838565679b28f82c7d5234bb6c551e 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -4638,6 +4638,28 @@ static int qm_set_vf_mse(struct hisi_qm *qm, bool set)
        return -ETIMEDOUT;
 }
 
+static void qm_dev_ecc_mbit_handle(struct hisi_qm *qm)
+{
+       u32 nfe_enb = 0;
+
+       /* Kunpeng930 hardware automatically close master ooo when NFE occurs */
+       if (qm->ver >= QM_HW_V3)
+               return;
+
+       if (!qm->err_status.is_dev_ecc_mbit &&
+           qm->err_status.is_qm_ecc_mbit &&
+           qm->err_ini->close_axi_master_ooo) {
+               qm->err_ini->close_axi_master_ooo(qm);
+       } else if (qm->err_status.is_dev_ecc_mbit &&
+                  !qm->err_status.is_qm_ecc_mbit &&
+                  !qm->err_ini->close_axi_master_ooo) {
+               nfe_enb = readl(qm->io_base + QM_RAS_NFE_ENABLE);
+               writel(nfe_enb & QM_RAS_NFE_MBIT_DISABLE,
+                      qm->io_base + QM_RAS_NFE_ENABLE);
+               writel(QM_ECC_MBIT, qm->io_base + QM_ABNORMAL_INT_SET);
+       }
+}
+
 static int qm_vf_reset_prepare(struct hisi_qm *qm,
                               enum qm_stop_reason stop_reason)
 {
@@ -4742,6 +4764,8 @@ static int qm_controller_reset_prepare(struct hisi_qm *qm)
                return ret;
        }
 
+       qm_dev_ecc_mbit_handle(qm);
+
        /* PF obtains the information of VF by querying the register. */
        qm_cmd_uninit(qm);
 
@@ -4766,31 +4790,6 @@ static int qm_controller_reset_prepare(struct hisi_qm *qm)
        return 0;
 }
 
-static void qm_dev_ecc_mbit_handle(struct hisi_qm *qm)
-{
-       u32 nfe_enb = 0;
-
-       /* Kunpeng930 hardware automatically close master ooo when NFE occurs */
-       if (qm->ver >= QM_HW_V3)
-               return;
-
-       if (!qm->err_status.is_dev_ecc_mbit &&
-           qm->err_status.is_qm_ecc_mbit &&
-           qm->err_ini->close_axi_master_ooo) {
-
-               qm->err_ini->close_axi_master_ooo(qm);
-
-       } else if (qm->err_status.is_dev_ecc_mbit &&
-                  !qm->err_status.is_qm_ecc_mbit &&
-                  !qm->err_ini->close_axi_master_ooo) {
-
-               nfe_enb = readl(qm->io_base + QM_RAS_NFE_ENABLE);
-               writel(nfe_enb & QM_RAS_NFE_MBIT_DISABLE,
-                      qm->io_base + QM_RAS_NFE_ENABLE);
-               writel(QM_ECC_MBIT, qm->io_base + QM_ABNORMAL_INT_SET);
-       }
-}
-
 static int qm_soft_reset(struct hisi_qm *qm)
 {
        struct pci_dev *pdev = qm->pdev;
@@ -4816,8 +4815,6 @@ static int qm_soft_reset(struct hisi_qm *qm)
                return ret;
        }
 
-       qm_dev_ecc_mbit_handle(qm);
-
        /* OOO register set and check */
        writel(ACC_MASTER_GLOBAL_CTRL_SHUTDOWN,
               qm->io_base + ACC_MASTER_GLOBAL_CTRL);