From 49b8d40b1f38ac4c197768c6e585c1c15c490f47 Mon Sep 17 00:00:00 2001 From: Somnath Kotur Date: Mon, 6 Jul 2020 13:55:02 +0530 Subject: [PATCH] net/bnxt: avoid hard coded values when reading counters Instead of using hardcoded values for the byte/pkt value shifts/masks to read from the HW counters, use the shift/mask values from the device template params Reviewed-by: Venkat Duvvuru Signed-off-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 27 ++++++++++++++++----------- drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h | 6 ++++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c index b7a5394617..34a6ec3575 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c +++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -227,9 +228,11 @@ void ulp_fc_mgr_thread_cancel(struct bnxt_ulp_context *ctxt) * num_counters [in] The number of counters * */ -__rte_unused static int32_t ulp_bulk_get_flow_stats(struct tf *tfp, - struct bnxt_ulp_fc_info *fc_info, - enum tf_dir dir, uint32_t num_counters) +__rte_unused static int32_t +ulp_bulk_get_flow_stats(struct tf *tfp, + struct bnxt_ulp_fc_info *fc_info, + enum tf_dir dir, + struct bnxt_ulp_device_params *dparms) /* MARK AS UNUSED FOR NOW TO AVOID COMPILATION ERRORS TILL API is RESOLVED */ { int rc = 0; @@ -242,7 +245,7 @@ __rte_unused static int32_t ulp_bulk_get_flow_stats(struct tf *tfp, parms.dir = dir; parms.type = stype; parms.starting_idx = fc_info->shadow_hw_tbl[dir].start_idx; - parms.num_entries = num_counters; + parms.num_entries = dparms->flow_count_db_entries / 2; /* direction */ /* * TODO: * Size of an entry needs to obtained from template @@ -266,13 +269,14 @@ __rte_unused static int32_t ulp_bulk_get_flow_stats(struct tf *tfp, return rc; } - for (i = 0; i < num_counters; i++) { + for (i = 0; i < parms.num_entries; i++) { /* TBD - Get PKT/BYTE COUNT SHIFT/MASK from Template */ sw_acc_tbl_entry = &fc_info->sw_acc_tbl[dir][i]; if (!sw_acc_tbl_entry->valid) continue; - sw_acc_tbl_entry->pkt_count += FLOW_CNTR_PKTS(stats[i]); - sw_acc_tbl_entry->byte_count += FLOW_CNTR_BYTES(stats[i]); + sw_acc_tbl_entry->pkt_count += FLOW_CNTR_PKTS(stats[i], dparms); + sw_acc_tbl_entry->byte_count += FLOW_CNTR_BYTES(stats[i], + dparms); } return rc; @@ -281,7 +285,8 @@ __rte_unused static int32_t ulp_bulk_get_flow_stats(struct tf *tfp, static int ulp_get_single_flow_stat(struct tf *tfp, struct bnxt_ulp_fc_info *fc_info, enum tf_dir dir, - uint32_t hw_cntr_id) + uint32_t hw_cntr_id, + struct bnxt_ulp_device_params *dparms) { int rc = 0; struct tf_get_tbl_entry_parms parms = { 0 }; @@ -310,8 +315,8 @@ static int ulp_get_single_flow_stat(struct tf *tfp, /* TBD - Get PKT/BYTE COUNT SHIFT/MASK from Template */ sw_cntr_indx = hw_cntr_id - fc_info->shadow_hw_tbl[dir].start_idx; sw_acc_tbl_entry = &fc_info->sw_acc_tbl[dir][sw_cntr_indx]; - sw_acc_tbl_entry->pkt_count += FLOW_CNTR_PKTS(stats); - sw_acc_tbl_entry->byte_count += FLOW_CNTR_BYTES(stats); + sw_acc_tbl_entry->pkt_count += FLOW_CNTR_PKTS(stats, dparms); + sw_acc_tbl_entry->byte_count += FLOW_CNTR_BYTES(stats, dparms); return rc; } @@ -385,7 +390,7 @@ ulp_fc_mgr_alarm_cb(void *arg) continue; hw_cntr_id = ulp_fc_info->sw_acc_tbl[i][j].hw_cntr_id; rc = ulp_get_single_flow_stat(tfp, ulp_fc_info, i, - hw_cntr_id); + hw_cntr_id, dparms); if (rc) break; } diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h index 2072670494..9c317b023e 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h +++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h @@ -16,8 +16,10 @@ #define FLOW_CNTR_BYTE_WIDTH 36 #define FLOW_CNTR_BYTE_MASK (((uint64_t)1 << FLOW_CNTR_BYTE_WIDTH) - 1) -#define FLOW_CNTR_PKTS(v) ((v) >> FLOW_CNTR_BYTE_WIDTH) -#define FLOW_CNTR_BYTES(v) ((v) & FLOW_CNTR_BYTE_MASK) +#define FLOW_CNTR_PKTS(v, d) (((v) & (d)->packet_count_mask) >> \ + (d)->packet_count_shift) +#define FLOW_CNTR_BYTES(v, d) (((v) & (d)->byte_count_mask) >> \ + (d)->byte_count_shift) struct sw_acc_counter { uint64_t pkt_count; -- 2.20.1