crypto: hisilicon/qm - stop function and write data to memory

When the system is shut down, the process is killed, but the
accelerator device does not stop executing the tasks. If the
accelerator device still accesses the memory and writes back data
to the memory after the memory is reclaimed by the system,
an NFE error may occur. Therefore, before the system is shut
down, the driver needs to stop the device and write data back
to the memory.

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 81c21ca403757da4129014cec53da0f24670acdb..fdff87c09aaf4513dbeea6057fdd50bae03379b6 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -1002,7 +1002,7 @@ static void qm_reset_function(struct hisi_qm *qm)
                return;
        }
 
-       ret = hisi_qm_stop(qm, QM_FLR);
+       ret = hisi_qm_stop(qm, QM_DOWN);
        if (ret) {
                dev_err(dev, "failed to stop qm when reset function\n");
                goto clear_bit;
@@ -3251,7 +3251,7 @@ int hisi_qm_stop(struct hisi_qm *qm, enum qm_stop_reason r)
        }
 
        if (qm->status.stop_reason == QM_SOFT_RESET ||
-           qm->status.stop_reason == QM_FLR) {
+           qm->status.stop_reason == QM_DOWN) {
                hisi_qm_set_hw_reset(qm, QM_RESET_STOP_TX_OFFSET);
                ret = qm_stop_started_qp(qm);
                if (ret < 0) {
@@ -4547,11 +4547,11 @@ void hisi_qm_reset_prepare(struct pci_dev *pdev)
        if (qm->fun_type == QM_HW_PF)
                qm_cmd_uninit(qm);
 
-       ret = qm_try_stop_vfs(qm, QM_PF_FLR_PREPARE, QM_FLR);
+       ret = qm_try_stop_vfs(qm, QM_PF_FLR_PREPARE, QM_DOWN);
        if (ret)
                pci_err(pdev, "failed to stop vfs by pf in FLR.\n");
 
-       ret = hisi_qm_stop(qm, QM_FLR);
+       ret = hisi_qm_stop(qm, QM_DOWN);
        if (ret) {
                pci_err(pdev, "Failed to stop QM, ret = %d.\n", ret);
                hisi_qm_set_hw_reset(qm, QM_RESET_STOP_TX_OFFSET);
@@ -4649,9 +4649,11 @@ void hisi_qm_dev_shutdown(struct pci_dev *pdev)
        struct hisi_qm *qm = pci_get_drvdata(pdev);
        int ret;
 
-       ret = hisi_qm_stop(qm, QM_NORMAL);
+       ret = hisi_qm_stop(qm, QM_DOWN);
        if (ret)
                dev_err(&pdev->dev, "Fail to stop qm in shutdown!\n");
+
+       hisi_qm_cache_wb(qm);
 }
 EXPORT_SYMBOL_GPL(hisi_qm_dev_shutdown);
 
@@ -4815,7 +4817,7 @@ static void qm_handle_cmd_msg(struct hisi_qm *qm, u32 fun_num)
        cmd = msg & QM_MB_CMD_DATA_MASK;
        switch (cmd) {
        case QM_PF_FLR_PREPARE:
-               qm_pf_reset_vf_process(qm, QM_FLR);
+               qm_pf_reset_vf_process(qm, QM_DOWN);
                break;
        case QM_PF_SRST_PREPARE:
                qm_pf_reset_vf_process(qm, QM_SOFT_RESET);

diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h
index a7d54d4d41fdb1df9f1e179a4a6ae41ac52b0044..39fbfb4be944bb0fcb24b134658860302b15e310 100644 (file)
--- a/include/linux/hisi_acc_qm.h
+++ b/include/linux/hisi_acc_qm.h
@@ -104,7 +104,7 @@
 enum qm_stop_reason {
        QM_NORMAL,
        QM_SOFT_RESET,
-       QM_FLR,
+       QM_DOWN,
 };
 
 enum qm_state {