crypto: hisilicon/qm - inject error before stopping queue

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>

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index b2b5f15abdf72ec753f35a336e4b0b306f9e8688..07983af9e3e22904cb9aadd2dbdb14feaf6ffefd 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -4015,6 +4015,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)
 {
@@ -4079,6 +4101,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);
 
@@ -4125,28 +4149,6 @@ static int qm_master_ooo_check(struct hisi_qm *qm)
        return ret;
 }
 
-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_prepare(struct hisi_qm *qm)
 {
        struct pci_dev *pdev = qm->pdev;
@@ -4171,7 +4173,6 @@ static int qm_soft_reset_prepare(struct hisi_qm *qm)
                return ret;
        }
 
-       qm_dev_ecc_mbit_handle(qm);
        ret = qm_master_ooo_check(qm);
        if (ret)
                return ret;