[dpdk-dev] [PATCH 16/36] net/bnxt: remove cache_tbl_id enums
From: Somnath Kotur <hidden>
Date: 2020-06-12 12:57:44
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Kishore Padmanabha <redacted> The bnxt_ulp_cache_tbl_id enums are not required any longer since the index is now calculated using resource sub type and direction. Signed-off-by: Kishore Padmanabha <redacted> Reviewed-by: Michael Baucom <redacted> Reviewed-by: Ccxsw Build <redacted> Signed-off-by: Somnath Kotur <redacted> --- drivers/net/bnxt/tf_ulp/ulp_template_db.c | 16 ++++++++-------- drivers/net/bnxt/tf_ulp/ulp_template_db.h | 8 -------- 2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.c b/drivers/net/bnxt/tf_ulp/ulp_template_db.c
index cb5e325..395d33b 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.c@@ -294,17 +294,17 @@ struct bnxt_ulp_rte_act_info ulp_act_info[] = { }; struct bnxt_ulp_cache_tbl_params ulp_cache_tbl_params[] = { - [BNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_INGRESS] = { - .num_entries = 16384 + [BNXT_ULP_RESOURCE_SUB_TYPE_TT_L2_CNTXT_TCAM_CACHE << 1 | TF_DIR_RX] = { + .num_entries = 16384 }, - [BNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_EGRESS] = { - .num_entries = 16384 + [BNXT_ULP_RESOURCE_SUB_TYPE_TT_L2_CNTXT_TCAM_CACHE << 1 | TF_DIR_TX] = { + .num_entries = 16384 }, - [BNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_INGRESS] = { - .num_entries = 16384 + [BNXT_ULP_RESOURCE_SUB_TYPE_TT_PROFILE_TCAM_CACHE << 1 | TF_DIR_RX] = { + .num_entries = 16384 }, - [BNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_EGRESS] = { - .num_entries = 16384 + [BNXT_ULP_RESOURCE_SUB_TYPE_TT_PROFILE_TCAM_CACHE << 1 | TF_DIR_TX] = { + .num_entries = 16384 } };
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.h b/drivers/net/bnxt/tf_ulp/ulp_template_db.h
index 6935072..a850e22 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_db.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.h@@ -88,14 +88,6 @@ enum bnxt_ulp_byte_order { BNXT_ULP_BYTE_ORDER_LAST = 2 }; -enum bnxt_ulp_cache_tbl_id { - BNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_INGRESS = 0, - BNXT_ULP_CACHE_TBL_ID_L2_CNTXT_TCAM_EGRESS = 1, - BNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_INGRESS = 2, - BNXT_ULP_CACHE_TBL_ID_PROFILE_TCAM_EGRESS = 3, - BNXT_ULP_CACHE_TBL_ID_LAST = 4 -}; - enum bnxt_ulp_cf_idx { BNXT_ULP_CF_IDX_MPLS_TAG_NUM = 0, BNXT_ULP_CF_IDX_O_VTAG_NUM = 1,
--
2.7.4