From d55db36986a06b78b8b16e9651b93c9737524699 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Tue, 10 Dec 2019 18:20:33 +0530 Subject: [PATCH] common/dpaax: remove unnecessary jump for PDCP In case of LX2160, PROTOCOL command can be used in some of the PDCP cases, in those the jump command prior to KEY command may not be required. The issue observed due to these JUMP command on LX2160 is that, the CAAM gets stuck and the processing never get completed. The system becomes unusable. Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal --- drivers/common/dpaax/caamflib/desc/pdcp.h | 51 ++++++++++++++--------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 476115323c..95d1416c2f 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1887,17 +1887,13 @@ pdcp_insert_cplane_snow_zuc_op(struct program *p, return -ENOTSUP; } - pkeyjump = JUMP(p, keyjump, LOCAL_JUMP, ALL_TRUE, SHRD | SELF | BOTH); - KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, - cipherdata->keylen, INLINE_KEY(cipherdata)); - KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, - INLINE_KEY(authdata)); - - SET_LABEL(p, keyjump); - if ((rta_sec_era >= RTA_SEC_ERA_8 && sn_size != PDCP_SN_SIZE_18) || (rta_sec_era == RTA_SEC_ERA_10)) { int pclid; + KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, + cipherdata->keylen, INLINE_KEY(cipherdata)); + KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, + INLINE_KEY(authdata)); if (sn_size == PDCP_SN_SIZE_5) pclid = OP_PCLID_LTE_PDCP_CTRL_MIXED; @@ -1931,6 +1927,13 @@ pdcp_insert_cplane_snow_zuc_op(struct program *p, } + pkeyjump = JUMP(p, keyjump, LOCAL_JUMP, ALL_TRUE, SHRD | SELF | BOTH); + KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, + cipherdata->keylen, INLINE_KEY(cipherdata)); + KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, + INLINE_KEY(authdata)); + + SET_LABEL(p, keyjump); SEQLOAD(p, MATH0, offset, length, 0); JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); MOVEB(p, MATH0, offset, IFIFOAB2, 0, length, IMMED); @@ -2008,15 +2011,13 @@ pdcp_insert_cplane_aes_zuc_op(struct program *p, return -ENOTSUP; } - pkeyjump = JUMP(p, keyjump, LOCAL_JUMP, ALL_TRUE, SHRD | SELF | BOTH); - KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, - cipherdata->keylen, INLINE_KEY(cipherdata)); - KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, - INLINE_KEY(authdata)); - if ((rta_sec_era >= RTA_SEC_ERA_8 && sn_size != PDCP_SN_SIZE_18) || (rta_sec_era == RTA_SEC_ERA_10)) { int pclid; + KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, + cipherdata->keylen, INLINE_KEY(cipherdata)); + KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, + INLINE_KEY(authdata)); if (sn_size == PDCP_SN_SIZE_5) pclid = OP_PCLID_LTE_PDCP_CTRL_MIXED; @@ -2050,8 +2051,14 @@ pdcp_insert_cplane_aes_zuc_op(struct program *p, return -ENOTSUP; } + pkeyjump = JUMP(p, keyjump, LOCAL_JUMP, ALL_TRUE, SHRD | SELF | BOTH); + KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, + cipherdata->keylen, INLINE_KEY(cipherdata)); + KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, + INLINE_KEY(authdata)); SET_LABEL(p, keyjump); + SEQLOAD(p, MATH0, offset, length, 0); JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); MOVEB(p, MATH0, offset, IFIFOAB2, 0, length, IMMED); @@ -2132,15 +2139,13 @@ pdcp_insert_cplane_zuc_snow_op(struct program *p, return -ENOTSUP; } - pkeyjump = JUMP(p, keyjump, LOCAL_JUMP, ALL_TRUE, SHRD | SELF | BOTH); - KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, - cipherdata->keylen, INLINE_KEY(cipherdata)); - KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, - INLINE_KEY(authdata)); - if ((rta_sec_era >= RTA_SEC_ERA_8 && sn_size != PDCP_SN_SIZE_18) || (rta_sec_era == RTA_SEC_ERA_10)) { int pclid; + KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, + cipherdata->keylen, INLINE_KEY(cipherdata)); + KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, + INLINE_KEY(authdata)); if (sn_size == PDCP_SN_SIZE_5) pclid = OP_PCLID_LTE_PDCP_CTRL_MIXED; @@ -2174,6 +2179,12 @@ pdcp_insert_cplane_zuc_snow_op(struct program *p, return -ENOTSUP; } + pkeyjump = JUMP(p, keyjump, LOCAL_JUMP, ALL_TRUE, SHRD | SELF | BOTH); + KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key, + cipherdata->keylen, INLINE_KEY(cipherdata)); + KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, + INLINE_KEY(authdata)); + SET_LABEL(p, keyjump); SEQLOAD(p, MATH0, offset, length, 0); JUMP(p, 1, LOCAL_JUMP, ALL_TRUE, CALM); -- 2.20.1