crypto: hisilicon/zip - add hashjoin, gather, and UDMA data move features

The new version of the hisilicon zip driver supports the hash join
and gather features, as well as the data move feature (UDMA),
including data copying and memory initialization functions.These
features are registered to the uacce subsystem.

Signed-off-by: Zhushuai Yin <yinzhushuai@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 102aff9ea19a03e04805d9cff3e08151fab239df..98099117bb3839ede8c0bdd3b280f7bd1b1aac43 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -2742,6 +2742,27 @@ static void qm_remove_uacce(struct hisi_qm *qm)
        }
 }
 
+static void qm_uacce_api_ver_init(struct hisi_qm *qm)
+{
+       struct uacce_device *uacce = qm->uacce;
+
+       switch (qm->ver) {
+       case QM_HW_V1:
+               uacce->api_ver = HISI_QM_API_VER_BASE;
+               break;
+       case QM_HW_V2:
+               uacce->api_ver = HISI_QM_API_VER2_BASE;
+               break;
+       case QM_HW_V3:
+       case QM_HW_V4:
+               uacce->api_ver = HISI_QM_API_VER3_BASE;
+               break;
+       default:
+               uacce->api_ver = HISI_QM_API_VER5_BASE;
+               break;
+       }
+}
+
 static int qm_alloc_uacce(struct hisi_qm *qm)
 {
        struct pci_dev *pdev = qm->pdev;
@@ -2775,13 +2796,6 @@ static int qm_alloc_uacce(struct hisi_qm *qm)
        uacce->is_vf = pdev->is_virtfn;
        uacce->priv = qm;
 
-       if (qm->ver == QM_HW_V1)
-               uacce->api_ver = HISI_QM_API_VER_BASE;
-       else if (qm->ver == QM_HW_V2)
-               uacce->api_ver = HISI_QM_API_VER2_BASE;
-       else
-               uacce->api_ver = HISI_QM_API_VER3_BASE;
-
        if (qm->ver == QM_HW_V1)
                mmio_page_nr = QM_DOORBELL_PAGE_NR;
        else if (!test_bit(QM_SUPPORT_DB_ISOLATION, &qm->caps))
@@ -2801,6 +2815,7 @@ static int qm_alloc_uacce(struct hisi_qm *qm)
        uacce->qf_pg_num[UACCE_QFRT_DUS]  = dus_page_nr;
 
        qm->uacce = uacce;
+       qm_uacce_api_ver_init(qm);
        INIT_LIST_HEAD(&qm->isolate_data.qm_hw_errs);
        mutex_init(&qm->isolate_data.isolate_lock);
 

diff --git a/drivers/crypto/hisilicon/zip/dae_main.c b/drivers/crypto/hisilicon/zip/dae_main.c
index 6f22e4c36e494f7500c1ac0633f8f3feeacbdc45..4c5481c774361e4c749ff0b7102ef85329a76f27 100644 (file)
--- a/drivers/crypto/hisilicon/zip/dae_main.c
+++ b/drivers/crypto/hisilicon/zip/dae_main.c
@@ -15,6 +15,7 @@
 #define DAE_REG_RD_TMOUT_US            USEC_PER_SEC
 
 #define DAE_ALG_NAME                   "hashagg"
+#define DAE_V5_ALG_NAME                        "hashagg\nudma\nhashjoin\ngather"
 
 /* error */
 #define DAE_AXI_CFG_OFFSET             0x331000
@@ -82,6 +83,7 @@ int hisi_dae_set_user_domain(struct hisi_qm *qm)
 
 int hisi_dae_set_alg(struct hisi_qm *qm)
 {
+       const char *alg_name;
        size_t len;
 
        if (!dae_is_support(qm))
@@ -90,9 +92,14 @@ int hisi_dae_set_alg(struct hisi_qm *qm)
        if (!qm->uacce)
                return 0;
 
+       if (qm->ver >= QM_HW_V5)
+               alg_name = DAE_V5_ALG_NAME;
+       else
+               alg_name = DAE_ALG_NAME;
+
        len = strlen(qm->uacce->algs);
        /* A line break may be required */
-       if (len + strlen(DAE_ALG_NAME) + 1 >= QM_DEV_ALG_MAX_LEN) {
+       if (len + strlen(alg_name) + 1 >= QM_DEV_ALG_MAX_LEN) {
                pci_err(qm->pdev, "algorithm name is too long!\n");
                return -EINVAL;
        }
@@ -100,7 +107,7 @@ int hisi_dae_set_alg(struct hisi_qm *qm)
        if (len)
                strcat((char *)qm->uacce->algs, "\n");
 
-       strcat((char *)qm->uacce->algs, DAE_ALG_NAME);
+       strcat((char *)qm->uacce->algs, alg_name);
 
        return 0;
 }

diff --git a/include/linux/hisi_acc_qm.h b/include/linux/hisi_acc_qm.h
index 0c4c84b8c3be9e851eff1f89c22a17921011d754..f2254ddc327c6efd7e18a59552ec3ce29cef6134 100644 (file)
--- a/include/linux/hisi_acc_qm.h
+++ b/include/linux/hisi_acc_qm.h
@@ -125,6 +125,7 @@ enum qm_hw_ver {
        QM_HW_V2 = 0x21,
        QM_HW_V3 = 0x30,
        QM_HW_V4 = 0x50,
+       QM_HW_V5 = 0x51,
 };
 
 enum qm_fun_type {

diff --git a/include/uapi/misc/uacce/hisi_qm.h b/include/uapi/misc/uacce/hisi_qm.h
index 3e66dbc2f3236083357ee47ff79401a094430ef3..10504b48eabf71720bcc95434cd15be9980a3d4c 100644 (file)
--- a/include/uapi/misc/uacce/hisi_qm.h
+++ b/include/uapi/misc/uacce/hisi_qm.h
@@ -31,6 +31,7 @@ struct hisi_qp_info {
 #define HISI_QM_API_VER_BASE "hisi_qm_v1"
 #define HISI_QM_API_VER2_BASE "hisi_qm_v2"
 #define HISI_QM_API_VER3_BASE "hisi_qm_v3"
+#define HISI_QM_API_VER5_BASE "hisi_qm_v5"
 
 /* UACCE_CMD_QM_SET_QP_CTX: Set qp algorithm type */
 #define UACCE_CMD_QM_SET_QP_CTX        _IOWR('H', 10, struct hisi_qp_ctx)