patch 'net/bnxt: fix dead code' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Thu Feb 13 10:58:34 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/17/25. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/434be46b356e8475e86a1535b99a8ff60787c470
Thanks.
Kevin
---
>From 434be46b356e8475e86a1535b99a8ff60787c470 Mon Sep 17 00:00:00 2001
From: Peter Spreadborough <peter.spreadborough at broadcom.com>
Date: Mon, 2 Dec 2024 14:24:34 -0500
Subject: [PATCH] net/bnxt: fix dead code
[ upstream commit 35180d7b216f987a0e4fb98eb1e6bcf26fe76e69 ]
This change addresses the CID 449075: Control flow issues (DEADCODE)
reported by coverity associated with the ASSERT_RETURN macro. The
change renames the macro and replaces the log macro to use
PMD_DRV_LOG_LINE.
Coverity issue: 449075
Fixes: 80317ff6adfd ("net/bnxt/tf_core: support Thor2")
Signed-off-by: Peter Spreadborough <peter.spreadborough at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
.../hcapi/cfa_v3/bld/p70/cfa_bld_p70_mpc.c | 90 +++++------
.../p70/host/cfa_bld_p70_host_mpc_wrapper.c | 150 +++++++++---------
2 files changed, 120 insertions(+), 120 deletions(-)
diff --git a/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/cfa_bld_p70_mpc.c b/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/cfa_bld_p70_mpc.c
index 445d9aad87..3f8ef3a5f1 100644
--- a/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/cfa_bld_p70_mpc.c
+++ b/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/cfa_bld_p70_mpc.c
@@ -32,7 +32,7 @@
#ifdef NXT_ENV_DEBUG
-#define ASSERT_RETURN(ERRNO) CFA_LOG_ERR("Returning error: %d\n", (ERRNO))
+#define LOG_RC(ERRNO) PMD_DRV_LOG_LINE(ERR, "Returning error: %d", (ERRNO))
#else
-#define ASSERT_RETURN(ERRNO)
+#define LOG_RC(ERRNO)
#endif
@@ -69,5 +69,5 @@ static int fill_mpc_header(uint8_t *cmd, uint32_t size, uint32_t opaque_val)
if (size < sizeof(struct mpc_header)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -88,15 +88,15 @@ static int compose_mpc_read_clr_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (parms->data_size != 1) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (parms->tbl_type >= CFA_HW_TABLE_MAX) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -139,15 +139,15 @@ static int compose_mpc_read_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (parms->data_size < 1 || parms->data_size > 4) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (parms->tbl_type >= CFA_HW_TABLE_MAX) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -195,20 +195,20 @@ static int compose_mpc_write_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (parms->data_size < 1 || parms->data_size > 4) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (parms->tbl_type >= CFA_HW_TABLE_MAX) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (!parms->write.data_ptr) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -253,15 +253,15 @@ static int compose_mpc_evict_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (parms->data_size < 1 || parms->data_size > 4) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (parms->tbl_type >= CFA_HW_TABLE_MAX) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -294,5 +294,5 @@ static int compose_mpc_evict_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
case CFA_MPC_EV_EVICT_TABLE_SCOPE:
/* Not supported */
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
default:
@@ -327,5 +327,5 @@ int cfa_mpc_build_cache_axs_cmd(enum cfa_mpc_opcode opc, uint8_t *cmd_buff,
int rc;
if (!cmd_buff || !cmd_buff_len || *cmd_buff_len == 0 || !parms) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -345,5 +345,5 @@ int cfa_mpc_build_cache_axs_cmd(enum cfa_mpc_opcode opc, uint8_t *cmd_buff,
return compose_mpc_evict_msg(cmd_buff, cmd_buff_len, parms);
default:
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -361,15 +361,15 @@ static int compose_mpc_em_search_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (e->data_size < 1 || e->data_size > 4) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (!e->em_entry) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -406,15 +406,15 @@ static int compose_mpc_em_insert_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (e->data_size < 1 || e->data_size > 4) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (!e->em_entry) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -456,5 +456,5 @@ static int compose_mpc_em_delete_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -488,5 +488,5 @@ static int compose_mpc_em_chain_msg(uint8_t *cmd_buff, uint32_t *cmd_buff_len,
if (*cmd_buff_len < cmd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -531,5 +531,5 @@ int cfa_mpc_build_em_op_cmd(enum cfa_mpc_opcode opc, uint8_t *cmd_buff,
int rc;
if (!cmd_buff || !cmd_buff_len || *cmd_buff_len == 0 || !parms) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -549,5 +549,5 @@ int cfa_mpc_build_em_op_cmd(enum cfa_mpc_opcode opc, uint8_t *cmd_buff,
return compose_mpc_em_chain_msg(cmd_buff, cmd_buff_len, parms);
default:
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -573,15 +573,15 @@ static int parse_mpc_read_clr_result(uint8_t *resp_buff, uint32_t resp_buff_len,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (result->data_len < rd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (!result->rd_data) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -623,15 +623,15 @@ static int parse_mpc_read_result(uint8_t *resp_buff, uint32_t resp_buff_len,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (result->data_len < rd_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
if (!result->rd_data) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -672,5 +672,5 @@ static int parse_mpc_write_result(uint8_t *resp_buff, uint32_t resp_buff_len,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -697,5 +697,5 @@ static int parse_mpc_evict_result(uint8_t *resp_buff, uint32_t resp_buff_len,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -729,5 +729,5 @@ int cfa_mpc_parse_cache_axs_resp(enum cfa_mpc_opcode opc, uint8_t *resp_buff,
{
if (!resp_buff || resp_buff_len == 0 || !result) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -744,5 +744,5 @@ int cfa_mpc_parse_cache_axs_resp(enum cfa_mpc_opcode opc, uint8_t *resp_buff,
return parse_mpc_evict_result(resp_buff, resp_buff_len, result);
default:
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -763,5 +763,5 @@ static int parse_mpc_em_search_result(uint8_t *resp_buff,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -795,5 +795,5 @@ static int parse_mpc_em_insert_result(uint8_t *resp_buff,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -829,5 +829,5 @@ static int parse_mpc_em_delete_result(uint8_t *resp_buff,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -860,5 +860,5 @@ static int parse_mpc_em_chain_result(uint8_t *resp_buff, uint32_t resp_buff_len,
if (resp_buff_len < resp_size) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -895,5 +895,5 @@ int cfa_mpc_parse_em_op_resp(enum cfa_mpc_opcode opc, uint8_t *resp_buff,
{
if (!resp_buff || resp_buff_len == 0 || !result) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -913,5 +913,5 @@ int cfa_mpc_parse_em_op_resp(enum cfa_mpc_opcode opc, uint8_t *resp_buff,
result);
default:
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
diff --git a/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/host/cfa_bld_p70_host_mpc_wrapper.c b/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/host/cfa_bld_p70_host_mpc_wrapper.c
index d685cc8a63..4719be2b7e 100644
--- a/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/host/cfa_bld_p70_host_mpc_wrapper.c
+++ b/drivers/net/bnxt/hcapi/cfa_v3/bld/p70/host/cfa_bld_p70_host_mpc_wrapper.c
@@ -22,7 +22,7 @@
#ifdef NXT_ENV_DEBUG
-#define ASSERT_RETURN(ERRNO) CFA_LOG_ERR("Returning error: %d\n", (ERRNO))
+#define LOG_RC(ERRNO) PMD_DRV_LOG_LINE(ERR, "Returning error: %d", (ERRNO))
#else
-#define ASSERT_RETURN(ERRNO)
+#define LOG_RC(ERRNO)
#endif
@@ -48,5 +48,5 @@
retcode = MAP_FUNC(fields[INDEX].val, &mapped_val); \
if (retcode) \
- ASSERT_RETURN(retcode); \
+ LOG_RC(retcode); \
else \
parms.NAME = (TYPE)mapped_val; \
@@ -76,5 +76,5 @@
retcode = MAP_FUNC(result.NAME, &mapped_val); \
if (retcode) \
- ASSERT_RETURN(retcode); \
+ LOG_RC(retcode); \
else \
fields[INDEX].val = mapped_val; \
@@ -122,5 +122,5 @@ static int table_type_map(uint64_t val, uint64_t *mapped_val)
break;
default:
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -146,5 +146,5 @@ static int read_mode_map(uint64_t val, uint64_t *mapped_val)
break;
default:
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -163,5 +163,5 @@ static int write_mode_map(uint64_t val, uint64_t *mapped_val)
break;
default:
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -192,5 +192,5 @@ static int evict_mode_map(uint64_t val, uint64_t *mapped_val)
break;
default:
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -233,5 +233,5 @@ static int status_code_map(uint64_t val, uint64_t *mapped_val)
break;
default:
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -267,5 +267,5 @@ int cfa_bld_p70_mpc_build_cache_read(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -273,5 +273,5 @@ int cfa_bld_p70_mpc_build_cache_read(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_READ_CMD_MAX_FLD,
cfa_p70_mpc_read_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -292,5 +292,5 @@ int cfa_bld_p70_mpc_build_cache_read(uint8_t *cmd, uint32_t *cmd_buff_len,
table_type_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -300,5 +300,5 @@ int cfa_bld_p70_mpc_build_cache_read(uint8_t *cmd, uint32_t *cmd_buff_len,
fields, read_mode_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -317,5 +317,5 @@ int cfa_bld_p70_mpc_build_cache_write(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -323,5 +323,5 @@ int cfa_bld_p70_mpc_build_cache_write(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_WRITE_CMD_MAX_FLD,
cfa_p70_mpc_write_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -340,5 +340,5 @@ int cfa_bld_p70_mpc_build_cache_write(uint8_t *cmd, uint32_t *cmd_buff_len,
table_type_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -349,5 +349,5 @@ int cfa_bld_p70_mpc_build_cache_write(uint8_t *cmd, uint32_t *cmd_buff_len,
fields, write_mode_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -365,5 +365,5 @@ int cfa_bld_p70_mpc_build_cache_evict(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -371,5 +371,5 @@ int cfa_bld_p70_mpc_build_cache_evict(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_INVALIDATE_CMD_MAX_FLD,
cfa_p70_mpc_invalidate_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -388,5 +388,5 @@ int cfa_bld_p70_mpc_build_cache_evict(uint8_t *cmd, uint32_t *cmd_buff_len,
fields, table_type_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -396,5 +396,5 @@ int cfa_bld_p70_mpc_build_cache_evict(uint8_t *cmd, uint32_t *cmd_buff_len,
fields, evict_mode_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -412,5 +412,5 @@ int cfa_bld_p70_mpc_build_cache_rdclr(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -418,5 +418,5 @@ int cfa_bld_p70_mpc_build_cache_rdclr(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_READ_CLR_CMD_MAX_FLD,
cfa_p70_mpc_read_clr_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -437,5 +437,5 @@ int cfa_bld_p70_mpc_build_cache_rdclr(uint8_t *cmd, uint32_t *cmd_buff_len,
fields, table_type_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -447,5 +447,5 @@ int cfa_bld_p70_mpc_build_cache_rdclr(uint8_t *cmd, uint32_t *cmd_buff_len,
fields, read_mode_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -466,5 +466,5 @@ int cfa_bld_p70_mpc_build_em_search(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -473,5 +473,5 @@ int cfa_bld_p70_mpc_build_em_search(uint8_t *cmd, uint32_t *cmd_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -479,5 +479,5 @@ int cfa_bld_p70_mpc_build_em_search(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_SEARCH_CMD_MAX_FLD,
cfa_p70_mpc_em_search_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -510,5 +510,5 @@ int cfa_bld_p70_mpc_build_em_insert(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -517,5 +517,5 @@ int cfa_bld_p70_mpc_build_em_insert(uint8_t *cmd, uint32_t *cmd_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -523,5 +523,5 @@ int cfa_bld_p70_mpc_build_em_insert(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_INSERT_CMD_MAX_FLD,
cfa_p70_mpc_em_insert_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -559,5 +559,5 @@ int cfa_bld_p70_mpc_build_em_delete(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -566,5 +566,5 @@ int cfa_bld_p70_mpc_build_em_delete(uint8_t *cmd, uint32_t *cmd_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -572,5 +572,5 @@ int cfa_bld_p70_mpc_build_em_delete(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_DELETE_CMD_MAX_FLD,
cfa_p70_mpc_em_delete_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -603,5 +603,5 @@ int cfa_bld_p70_mpc_build_em_chain(uint8_t *cmd, uint32_t *cmd_buff_len,
/* Parameters check */
if (!cmd || !cmd_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -610,5 +610,5 @@ int cfa_bld_p70_mpc_build_em_chain(uint8_t *cmd, uint32_t *cmd_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -616,5 +616,5 @@ int cfa_bld_p70_mpc_build_em_chain(uint8_t *cmd, uint32_t *cmd_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_CHAIN_CMD_MAX_FLD,
cfa_p70_mpc_em_chain_cmd_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -654,5 +654,5 @@ int cfa_bld_p70_mpc_parse_cache_read(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields || !rd_data) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -661,5 +661,5 @@ int cfa_bld_p70_mpc_parse_cache_read(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -667,5 +667,5 @@ int cfa_bld_p70_mpc_parse_cache_read(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_READ_CMP_MAX_FLD,
cfa_p70_mpc_read_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -684,5 +684,5 @@ int cfa_bld_p70_mpc_parse_cache_read(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -708,5 +708,5 @@ int cfa_bld_p70_mpc_parse_cache_write(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -715,5 +715,5 @@ int cfa_bld_p70_mpc_parse_cache_write(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -721,5 +721,5 @@ int cfa_bld_p70_mpc_parse_cache_write(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_WRITE_CMP_MAX_FLD,
cfa_p70_mpc_write_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -729,5 +729,5 @@ int cfa_bld_p70_mpc_parse_cache_write(uint8_t *resp, uint32_t resp_buff_len,
&result);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -738,5 +738,5 @@ int cfa_bld_p70_mpc_parse_cache_write(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -762,5 +762,5 @@ int cfa_bld_p70_mpc_parse_cache_evict(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -769,5 +769,5 @@ int cfa_bld_p70_mpc_parse_cache_evict(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -775,5 +775,5 @@ int cfa_bld_p70_mpc_parse_cache_evict(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_INVALIDATE_CMP_MAX_FLD,
cfa_p70_mpc_invalidate_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -783,5 +783,5 @@ int cfa_bld_p70_mpc_parse_cache_evict(uint8_t *resp, uint32_t resp_buff_len,
resp_buff_len, &result);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -794,5 +794,5 @@ int cfa_bld_p70_mpc_parse_cache_evict(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -820,5 +820,5 @@ int cfa_bld_p70_mpc_parse_cache_rdclr(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields || !rd_data) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -827,5 +827,5 @@ int cfa_bld_p70_mpc_parse_cache_rdclr(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -833,5 +833,5 @@ int cfa_bld_p70_mpc_parse_cache_rdclr(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_READ_CMP_MAX_FLD,
cfa_p70_mpc_read_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -850,5 +850,5 @@ int cfa_bld_p70_mpc_parse_cache_rdclr(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -873,5 +873,5 @@ int cfa_bld_p70_mpc_parse_em_search(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -880,5 +880,5 @@ int cfa_bld_p70_mpc_parse_em_search(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -886,5 +886,5 @@ int cfa_bld_p70_mpc_parse_em_search(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_SEARCH_CMP_MAX_FLD,
cfa_p70_mpc_em_search_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -894,5 +894,5 @@ int cfa_bld_p70_mpc_parse_em_search(uint8_t *resp, uint32_t resp_buff_len,
&result);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -904,5 +904,5 @@ int cfa_bld_p70_mpc_parse_em_search(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -940,5 +940,5 @@ int cfa_bld_p70_mpc_parse_em_insert(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -947,5 +947,5 @@ int cfa_bld_p70_mpc_parse_em_insert(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -953,5 +953,5 @@ int cfa_bld_p70_mpc_parse_em_insert(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_INSERT_CMP_MAX_FLD,
cfa_p70_mpc_em_insert_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -961,5 +961,5 @@ int cfa_bld_p70_mpc_parse_em_insert(uint8_t *resp, uint32_t resp_buff_len,
&result);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -971,5 +971,5 @@ int cfa_bld_p70_mpc_parse_em_insert(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -1011,5 +1011,5 @@ int cfa_bld_p70_mpc_parse_em_delete(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -1018,5 +1018,5 @@ int cfa_bld_p70_mpc_parse_em_delete(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -1024,5 +1024,5 @@ int cfa_bld_p70_mpc_parse_em_delete(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_DELETE_CMP_MAX_FLD,
cfa_p70_mpc_em_delete_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -1032,5 +1032,5 @@ int cfa_bld_p70_mpc_parse_em_delete(uint8_t *resp, uint32_t resp_buff_len,
&result);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -1042,5 +1042,5 @@ int cfa_bld_p70_mpc_parse_em_delete(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -1077,5 +1077,5 @@ int cfa_bld_p70_mpc_parse_em_chain(uint8_t *resp, uint32_t resp_buff_len,
/* Parameters check */
if (!resp || !resp_buff_len || !fields) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -1084,5 +1084,5 @@ int cfa_bld_p70_mpc_parse_em_chain(uint8_t *resp, uint32_t resp_buff_len,
unsupported_fields,
ARRAY_SIZE(unsupported_fields))) {
- ASSERT_RETURN(-ENOTSUP);
+ LOG_RC(-ENOTSUP);
return -ENOTSUP;
}
@@ -1090,5 +1090,5 @@ int cfa_bld_p70_mpc_parse_em_chain(uint8_t *resp, uint32_t resp_buff_len,
if (!fields_valid(fields, CFA_BLD_MPC_EM_CHAIN_CMP_MAX_FLD,
cfa_p70_mpc_em_chain_cmp_gbl_to_dev)) {
- ASSERT_RETURN(-EINVAL);
+ LOG_RC(-EINVAL);
return -EINVAL;
}
@@ -1098,5 +1098,5 @@ int cfa_bld_p70_mpc_parse_em_chain(uint8_t *resp, uint32_t resp_buff_len,
&result);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
@@ -1108,5 +1108,5 @@ int cfa_bld_p70_mpc_parse_em_chain(uint8_t *resp, uint32_t resp_buff_len,
fields, status_code_map);
if (rc) {
- ASSERT_RETURN(rc);
+ LOG_RC(rc);
return rc;
}
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:41.663067370 +0000
+++ 0067-net-bnxt-fix-dead-code.patch 2025-02-12 17:29:34.408946276 +0000
@@ -1 +1 @@
-From 35180d7b216f987a0e4fb98eb1e6bcf26fe76e69 Mon Sep 17 00:00:00 2001
+From 434be46b356e8475e86a1535b99a8ff60787c470 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 35180d7b216f987a0e4fb98eb1e6bcf26fe76e69 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list