common/dpaax: remove dead code
PATCH 1/2 common/dpaax: remove dead code
This patch remove structural and logical dead code from caamflib.
coverity issues: 375251 375258 375261 375267 375269 375285 373161
375249 375257
Fixes 6127fff842a7 ("common/dpaax: remove outdated caamflib code")
Fixes 81eb760d2207 ("common/dpaax/caamflib: remove some inline keys")
Signed-off-by Gagandeep Singh <[email protected]>
--- drivers/common/dpaax/caamflib/desc/pdcp.h | 196 +++++----------------- drivers/common/dpaax/caamflib/desc/sdap.h | 44 +---- 2 files changed, 45 insertions(+), 195 deletions(-)
drivers/common/dpaax/caamflib/desc/pdcp.h +42 -154
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. -* Copyright 2019-2021 NXP +* Copyright 2019-2022 NXP */ #ifndef __DESC_PDCP_H__
@@ -776,21 +776,11 @@ pdcp_insert_uplane_snow_snow_op(struct program *p,return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_5 : -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; - } +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ;if (dir ==OP_TYPE_ENCAP_PROTOCOL )MATHB (p,SEQINSZ ,SUB , length,VSEQINSZ ,4 ,IMMED2 );
@@ -901,21 +891,11 @@ pdcp_insert_uplane_zuc_zuc_op(struct program *p,return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_5 : -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; - } +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ;SEQLOAD (p,MATH0 , offset, length,0 );JUMP (p,1 ,LOCAL_JUMP ,ALL_TRUE ,CALM );
@@ -1190,27 +1170,11 @@ pdcp_insert_cplane_snow_aes_op(struct program *p,return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_5 : - offset =7 ; - length =1 ; - sn_mask = (swap == false) ?PDCP_C_PLANE_SN_MASK : -PDCP_C_PLANE_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; - - } +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ;SEQLOAD (p,MATH0 , offset, length,0 );JUMP (p,1 ,LOCAL_JUMP ,ALL_TRUE ,CALM );
@@ -1421,27 +1385,11 @@ pdcp_insert_cplane_aes_snow_op(struct program *p,return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_5 : - offset =7 ; - length =1 ; - sn_mask = (swap == false) ?PDCP_C_PLANE_SN_MASK : -PDCP_C_PLANE_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; - - } +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ;if (dir ==OP_TYPE_ENCAP_PROTOCOL )MATHB (p,SEQINSZ ,SUB , length,VSEQINSZ ,4 ,IMMED2 );
@@ -1548,27 +1496,11 @@ pdcp_insert_cplane_snow_zuc_op(struct program *p, (uint16_t)authdata->algtype);return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_5 : - offset =7 ; - length =1 ; - sn_mask = (swap == false) ?PDCP_C_PLANE_SN_MASK : -PDCP_C_PLANE_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; - - } +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ; pkeyjump =JUMP (p, keyjump,LOCAL_JUMP ,ALL_TRUE ,SHRD |SELF |BOTH ); KEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key,
@@ -1667,27 +1599,12 @@ pdcp_insert_cplane_aes_zuc_op(struct program *p,return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_5 : - offset =7 ; - length =1 ; - sn_mask = (swap == false) ?PDCP_C_PLANE_SN_MASK : -PDCP_C_PLANE_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ; - } 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));
@@ -1789,27 +1706,12 @@ pdcp_insert_cplane_zuc_snow_op(struct program *p,return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_5 : - offset =7 ; - length =1 ; - sn_mask = (swap == false) ?PDCP_C_PLANE_SN_MASK : -PDCP_C_PLANE_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ; - } 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));
@@ -1929,26 +1831,12 @@ pdcp_insert_cplane_zuc_aes_op(struct program *p, (uint16_t)authdata->algtype);return 0 ; } -/* Non-proto is supported only for 5bit cplane and 18bit uplane */ -switch (sn_size) { -case PDCP_SN_SIZE_5 : - offset =7 ; - length =1 ; - sn_mask = (swap == false) ?PDCP_C_PLANE_SN_MASK : -PDCP_C_PLANE_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_18 : - offset =5 ; - length =3 ; - sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : -PDCP_U_PLANE_18BIT_SN_MASK_BE ; -break ; -case PDCP_SN_SIZE_7 : -case PDCP_SN_SIZE_12 : -case PDCP_SN_SIZE_15 : -pr_err ("Invalid sn_size for %s\n" , __func__); -return -ENOTSUP ; - } + +/* sn_size is 18 */ + offset =5 ; + length =3 ; + sn_mask = (swap == false) ?PDCP_U_PLANE_18BIT_SN_MASK : +PDCP_U_PLANE_18BIT_SN_MASK_BE ;SEQLOAD (p,MATH0 , offset, length,0 );JUMP (p,1 ,LOCAL_JUMP ,ALL_TRUE ,CALM );
drivers/common/dpaax/caamflib/desc/sdap.h +3 -41
60 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/2 crypto/dpaa_sec: fix digest size
DPAA crypto driver can support 64 bytes size digest size for SHA512-HMAC.
This patch changes the value of macro max supported digest size to 64.
Fixes c3e85bdcc6e6 ("crypto/dpaa_sec: add crypto driver for NXP DPAA platform")
Signed-off-by Gagandeep Singh <[email protected]>
--- drivers/crypto/dpaa_sec/dpaa_sec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/dpaa_sec/dpaa_sec.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: BSD-3-Clause * -* Copyright 2016-2021 NXP +* Copyright 2016-2022 NXP * */
@@ -231,7 +231,7 @@ struct dpaa_sec_job {struct qm_sg_entry sg[MAX_JOB_SG_ENTRIES ]; }; -#define DPAA_MAX_NB_MAX_DIGEST 32 +#define DPAA_MAX_NB_MAX_DIGEST 64struct dpaa_sec_op_ctx {struct dpaa_sec_job job;union {
Signature · 1 line
2.25.1
Quoted 4 lines
This patch remove structural and logical dead code from caamflib.
coverity issues: 375251 375258 375261 375267 375269 375285 373161
Quoted 8 lines
375249 375257Fixes 6127fff842a7 ("common/dpaax: remove outdated caamflib code")Fixes 81eb760d2207 ("common/dpaax/caamflib: remove some inline keys")Signed-off-by Gagandeep Singh <[email protected]>---
Series Applied to dpdk-next-crypto
Thanks.