crypto: hisilicon/qm - invalidate queues in use

Before the device reset, although the driver has set the queue
status to intercept doorbells sent by the task process, the reset
thread is isolated from the user-mode task process, so the task process
may still send doorbells. Therefore, before the reset, the queue is
directly invalidated, and the device directly discards the doorbells
sent by the process.

Signed-off-by: Weili Qian <qianweili@huawei.com>
Signed-off-by: Chenghai Huang <huangchenghai2@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 98099117bb3839ede8c0bdd3b280f7bd1b1aac43..c1ffaae78532bbdc94cb435a06ace15a7df949ac 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -45,6 +45,8 @@
 
 #define QM_SQ_TYPE_MASK                        GENMASK(3, 0)
 #define QM_SQ_TAIL_IDX(sqc)            ((le16_to_cpu((sqc).w11) >> 6) & 0x1)
+#define QM_SQC_DISABLE_QP              (1U << 6)
+#define QM_XQC_RANDOM_DATA             0xaaaa
 
 /* cqc shift */
 #define QM_CQ_HOP_NUM_SHIFT            0
@@ -3194,6 +3196,9 @@ static int qm_eq_aeq_ctx_cfg(struct hisi_qm *qm)
 
        qm_init_eq_aeq_status(qm);
 
+       /* Before starting the dev, clear the memory and then configure to device using. */
+       memset(qm->qdma.va, 0, qm->qdma.size);
+
        ret = qm_eq_ctx_cfg(qm);
        if (ret) {
                dev_err(dev, "Set eqc failed!\n");
@@ -3205,9 +3210,13 @@ static int qm_eq_aeq_ctx_cfg(struct hisi_qm *qm)
 
 static int __hisi_qm_start(struct hisi_qm *qm)
 {
+       struct device *dev = &qm->pdev->dev;
        int ret;
 
-       WARN_ON(!qm->qdma.va);
+       if (!qm->qdma.va) {
+               dev_err(dev, "qm qdma is NULL!\n");
+               return -EINVAL;
+       }
 
        if (qm->fun_type == QM_HW_PF) {
                ret = hisi_qm_set_vft(qm, 0, qm->qp_base, qm->qp_num);
@@ -3281,7 +3290,7 @@ static int qm_restart(struct hisi_qm *qm)
        for (i = 0; i < qm->qp_num; i++) {
                qp = &qm->qp_array[i];
                if (atomic_read(&qp->qp_status.flags) == QP_STOP &&
-                   qp->is_resetting == true) {
+                   qp->is_resetting == true && qp->is_in_kernel == true) {
                        ret = qm_start_qp_nolock(qp, 0);
                        if (ret < 0) {
                                dev_err(dev, "Failed to start qp%d!\n", i);
@@ -3313,24 +3322,44 @@ static void qm_stop_started_qp(struct hisi_qm *qm)
 }
 
 /**
- * qm_clear_queues() - Clear all queues memory in a qm.
- * @qm: The qm in which the queues will be cleared.
+ * qm_invalid_queues() - invalid all queues in use.
+ * @qm: The qm in which the queues will be invalidated.
  *
- * This function clears all queues memory in a qm. Reset of accelerator can
- * use this to clear queues.
+ * This function invalid all queues in use. If the doorbell command is sent
+ * to device in user space after the device is reset, the device discards
+ * the doorbell command.
  */
-static void qm_clear_queues(struct hisi_qm *qm)
+static void qm_invalid_queues(struct hisi_qm *qm)
 {
        struct hisi_qp *qp;
+       struct qm_sqc *sqc;
+       struct qm_cqc *cqc;
        int i;
 
+       /*
+        * Normal stop queues is no longer used and does not need to be
+        * invalid queues.
+        */
+       if (qm->status.stop_reason == QM_NORMAL)
+               return;
+
+       if (qm->status.stop_reason == QM_DOWN)
+               hisi_qm_cache_wb(qm);
+
        for (i = 0; i < qm->qp_num; i++) {
                qp = &qm->qp_array[i];
-               if (qp->is_in_kernel && qp->is_resetting)
+               if (!qp->is_resetting)
+                       continue;
+
+               /* Modify random data and set sqc close bit to invalid queue. */
+               sqc = qm->sqc + i;
+               cqc = qm->cqc + i;
+               sqc->w8 = cpu_to_le16(QM_XQC_RANDOM_DATA);
+               sqc->w13 = cpu_to_le16(QM_SQC_DISABLE_QP);
+               cqc->w8 = cpu_to_le16(QM_XQC_RANDOM_DATA);
+               if (qp->is_in_kernel)
                        memset(qp->qdma.va, 0, qp->qdma.size);
        }
-
-       memset(qm->qdma.va, 0, qm->qdma.size);
 }
 
 /**
@@ -3387,7 +3416,7 @@ int hisi_qm_stop(struct hisi_qm *qm, enum qm_stop_reason r)
                }
        }
 
-       qm_clear_queues(qm);
+       qm_invalid_queues(qm);
        qm->status.stop_reason = QM_NORMAL;
 
 err_unlock:
@@ -4785,8 +4814,6 @@ void hisi_qm_dev_shutdown(struct pci_dev *pdev)
        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);