crypto: hisilicon - remove use_dma_api related codes

The codes related use_dma_api is useless which should be removed.

Signed-off-by: Shukun Tan <tanshukun1@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
index 3475b1999635fa61ad7ea3310a2a2196af804cf5..dba7b6012c5dc1060744459d6c29d681423027d4 100644 (file)
--- a/drivers/crypto/hisilicon/hpre/hpre_main.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
@@ -679,7 +679,6 @@ static int hpre_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)
                qm->qp_base = HPRE_PF_DEF_Q_BASE;
                qm->qp_num = pf_q_num;
        }
-       qm->use_dma_api = true;
 
        return hisi_qm_init(qm);
 }

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index c30df080b9d06711fedaf7fef4a164d120bd03ec..800beef2639f39b94dc65c378dd6a8695d8633bc 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -1267,20 +1267,18 @@ static struct hisi_qp *qm_create_qp_nolock(struct hisi_qm *qm, u8 alg_type)
        qm->qp_in_used++;
        qp->qm = qm;
 
-       if (qm->use_dma_api) {
-               qp->qdma.size = qm->sqe_size * QM_Q_DEPTH +
-                               sizeof(struct qm_cqe) * QM_Q_DEPTH;
-               qp->qdma.va = dma_alloc_coherent(dev, qp->qdma.size,
-                                                &qp->qdma.dma, GFP_KERNEL);
-               if (!qp->qdma.va) {
-                       ret = -ENOMEM;
-                       goto err_clear_bit;
-               }
-
-               dev_dbg(dev, "allocate qp dma buf(va=%pK, dma=%pad, size=%zx)\n",
-                       qp->qdma.va, &qp->qdma.dma, qp->qdma.size);
+       qp->qdma.size = qm->sqe_size * QM_Q_DEPTH +
+                       sizeof(struct qm_cqe) * QM_Q_DEPTH;
+       qp->qdma.va = dma_alloc_coherent(dev, qp->qdma.size,
+                                        &qp->qdma.dma, GFP_KERNEL);
+       if (!qp->qdma.va) {
+               ret = -ENOMEM;
+               goto err_clear_bit;
        }
 
+       dev_dbg(dev, "allocate qp dma buf(va=%pK, dma=%pad, size=%zx)\n",
+               qp->qdma.va, &qp->qdma.dma, qp->qdma.size);
+
        qp->qp_id = qp_id;
        qp->alg_type = alg_type;
        atomic_set(&qp->qp_status.flags, QP_INIT);
@@ -1334,7 +1332,7 @@ void hisi_qm_release_qp(struct hisi_qp *qp)
                return;
        }
 
-       if (qm->use_dma_api && qdma->va)
+       if (qdma->va)
                dma_free_coherent(dev, qdma->size, qdma->va, qdma->dma);
 
        qm->qp_array[qp->qp_id] = NULL;
@@ -1992,8 +1990,6 @@ int hisi_qm_init(struct hisi_qm *qm)
        INIT_WORK(&qm->work, qm_work_process);
 
        atomic_set(&qm->status.flags, QM_INIT);
-       dev_dbg(dev, "init qm %s with %s\n", pdev->is_physfn ? "pf" : "vf",
-               qm->use_dma_api ? "dma api" : "iommu api");
 
        return 0;
 
@@ -2034,7 +2030,7 @@ void hisi_qm_uninit(struct hisi_qm *qm)
        uacce_remove(qm->uacce);
        qm->uacce = NULL;
 
-       if (qm->use_dma_api && qm->qdma.va) {
+       if (qm->qdma.va) {
                hisi_qm_cache_wb(qm);
                dma_free_coherent(dev, qm->qdma.size,
                                  qm->qdma.va, qm->qdma.dma);
@@ -2259,11 +2255,7 @@ int hisi_qm_start(struct hisi_qm *qm)
                }
        }
 
-       if (!qm->use_dma_api) {
-               dev_dbg(&qm->pdev->dev, "qm delay start\n");
-               up_write(&qm->qps_lock);
-               return 0;
-       } else if (!qm->qdma.va) {
+       if (!qm->qdma.va) {
                qm->qdma.size = QMC_ALIGN(sizeof(struct qm_eqe) * QM_Q_DEPTH) +
                                QMC_ALIGN(sizeof(struct qm_aeqe) * QM_Q_DEPTH) +
                                QMC_ALIGN(sizeof(struct qm_sqc) * qm->qp_num) +

diff --git a/drivers/crypto/hisilicon/qm.h b/drivers/crypto/hisilicon/qm.h
index 25934e3c7acd33f9d30253da57f1972731560742..743cb63d2de6130b07a4b2031346f15654abc95d 100644 (file)
--- a/drivers/crypto/hisilicon/qm.h
+++ b/drivers/crypto/hisilicon/qm.h
@@ -230,7 +230,6 @@ struct hisi_qm {
        struct work_struct work;
 
        const char *algs;
-       bool use_dma_api;
        bool use_sva;
        resource_size_t phys_base;
        resource_size_t phys_size;

diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index 067d1c22fc005bbe9f4eafc6d008f350789f30e0..8ff6e52a58d6e9e650ef812cc9d525a3b757e634 100644 (file)
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -749,7 +749,6 @@ static int sec_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)
                qm->qp_base = SEC_PF_DEF_Q_NUM;
                qm->qp_num = SEC_QUEUE_NUM_V1 - SEC_PF_DEF_Q_NUM;
        }
-       qm->use_dma_api = true;
 
        return hisi_qm_init(qm);
 }

diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index da90218207cb3a455f95cd361798c0f8c09bc4ad..903dff968c404ece5b04772c8a216f4f440513c1 100644 (file)
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -692,7 +692,6 @@ static int hisi_zip_qm_init(struct hisi_qm *qm, struct pci_dev *pdev)
        if (rev_id == QM_HW_UNKNOWN)
                return -EINVAL;
 
-       qm->use_dma_api = true;
        qm->pdev = pdev;
        qm->ver = rev_id;