crypto: octeontx2 - get engine group number for asymmetric engine

Cryptographic Accelerator Unit (CPT) support different engine groups, one
for asymmetric algorithms (only AE engines in this group), one for the
most common symmetric algorithms (all SE and all IE engines in this group),
and one for other symmetric algorithms (only SE engines in this group).

For symmetric engine (SE), we obtain the group number using
"MBOX_MSG_GET_ENG_GRP_NUM" mailbox. Let's follow a similar approach to
determine the group number for asymmetric engine (AE).

Signed-off-by: Amit Singh Tomar <amitsinght@marvell.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptlf.h b/drivers/crypto/marvell/octeontx2/otx2_cptlf.h
index 49ec2b92e86d475676a2eea43ca7a68521c2a5cf..1b9f75214d18aa68c6884d927bfbc02e5187f5f4 100644 (file)
--- a/drivers/crypto/marvell/octeontx2/otx2_cptlf.h
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptlf.h
@@ -125,6 +125,7 @@ struct otx2_cptlfs_info {
        u8 are_lfs_attached;    /* Whether CPT LFs are attached */
        u8 lfs_num;             /* Number of CPT LFs */
        u8 kcrypto_se_eng_grp_num; /* Crypto symmetric engine group number */
+       u8 kcrypto_ae_eng_grp_num; /* Crypto asymmetric engine group number */
        u8 kvf_limits;          /* Kernel crypto limits */
        atomic_t state;         /* LF's state. started/reset */
        int blkaddr;            /* CPT blkaddr: BLKADDR_CPT0/BLKADDR_CPT1 */

diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
index 79adc224066ebed2196c438ad4f9ef038b043eaf..c1c44a7b89fa856ff2802cfb0ff82cd884e389c8 100644 (file)
--- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
@@ -276,7 +276,22 @@ static int cptvf_lf_init(struct otx2_cptvf_dev *cptvf)
                        "Symmetric Engine group for crypto not available\n");
                return -ENOENT;
        }
-       eng_grp_msk = 1 << cptvf->lfs.kcrypto_se_eng_grp_num;
+
+       /* Get engine group number for asymmetric crypto */
+       cptvf->lfs.kcrypto_ae_eng_grp_num = OTX2_CPT_INVALID_CRYPTO_ENG_GRP;
+       ret = otx2_cptvf_send_eng_grp_num_msg(cptvf, OTX2_CPT_AE_TYPES);
+       if (ret)
+               return ret;
+
+       if (cptvf->lfs.kcrypto_ae_eng_grp_num ==
+               OTX2_CPT_INVALID_CRYPTO_ENG_GRP) {
+               dev_err(dev,
+                       "Asymmetric Engine group for crypto not available\n");
+               return -ENOENT;
+       }
+
+       eng_grp_msk = BIT(cptvf->lfs.kcrypto_se_eng_grp_num) |
+                     BIT(cptvf->lfs.kcrypto_ae_eng_grp_num);
 
        ret = otx2_cptvf_send_kvf_limits_msg(cptvf);
        if (ret)

diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
index f36d75f40014921ff104a1add1a502e4208cce57..3078e2375d3b1cf299314a662a5278c22cff3955 100644 (file)
--- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
@@ -126,6 +126,8 @@ static void process_pfvf_mbox_mbox_msg(struct otx2_cptvf_dev *cptvf,
                grp_num = rsp_grp->eng_grp_num;
                if (rsp_grp->eng_type == OTX2_CPT_SE_TYPES)
                        cptvf->lfs.kcrypto_se_eng_grp_num = grp_num;
+               else if (rsp_grp->eng_type == OTX2_CPT_AE_TYPES)
+                       cptvf->lfs.kcrypto_ae_eng_grp_num = grp_num;
                break;
        case MBOX_MSG_GET_KVF_LIMITS:
                rsp_limits = (struct otx2_cpt_kvf_limits_rsp *) msg;

diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c b/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
index 8b4ac269330acebe97531e22b933ae42586334f7..e71494486c64169e82eaa722b237c41853e99bcf 100644 (file)
--- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
@@ -399,6 +399,8 @@ int otx2_cpt_get_eng_grp_num(struct pci_dev *pdev,
        switch (eng_type) {
        case OTX2_CPT_SE_TYPES:
                return cptvf->lfs.kcrypto_se_eng_grp_num;
+       case OTX2_CPT_AE_TYPES:
+               return cptvf->lfs.kcrypto_ae_eng_grp_num;
        default:
                dev_err(&cptvf->pdev->dev, "Unsupported engine type");
                break;