net/bnxt: add conditional processing of templates

[dpdk.git] / drivers / net / bnxt / bnxt_hwrm.c

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 3d04b93..6eab234 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -750,9 +750,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)
 
        HWRM_CHECK_RESULT();
 
-       if (!BNXT_CHIP_P5(bp) &&
-           !(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_DIRECT_ACCESS))
-               return 0;
+       if (BNXT_CHIP_P5(bp)) {
+               if (!(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_HWRM_ACCESS))
+                       return 0;
+       } else {
+               if (!(resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_DIRECT_ACCESS))
+                       return 0;
+       }
 
        if (resp->flags & HWRM_PORT_MAC_PTP_QCFG_OUTPUT_FLAGS_ONE_STEP_TX_TS)
                bp->flags |= BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS;
@@ -1345,6 +1349,12 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout)
                bp->fw_cap |= BNXT_FW_CAP_ADV_FLOW_COUNTERS;
        }
 
+       if (dev_caps_cfg &
+           HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_CFA_TRUFLOW_SUPPORTED) {
+               PMD_DRV_LOG(DEBUG, "Host-based truflow feature enabled.\n");
+               bp->fw_cap |= BNXT_FW_CAP_TRUFLOW_EN;
+       }
+
 error:
        HWRM_UNLOCK();
        return rc;
@@ -4305,8 +4315,20 @@ int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, uint16_t target_id,
        return rc;
 }
 
-int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
-                        struct rte_eth_stats *stats, uint8_t rx)
+static void bnxt_update_prev_stat(uint64_t *cntr, uint64_t *prev_cntr)
+{
+       /* One of the HW stat values that make up this counter was zero as
+        * returned by HW in this iteration, so use the previous
+        * iteration's counter value
+        */
+       if (*prev_cntr && *cntr == 0)
+               *cntr = *prev_cntr;
+       else
+               *prev_cntr = *cntr;
+}
+
+int bnxt_hwrm_ring_stats(struct bnxt *bp, uint32_t cid, int idx,
+                        struct bnxt_ring_stats *ring_stats, bool rx)
 {
        int rc = 0;
        struct hwrm_stat_ctx_query_input req = {.req_type = 0};
@@ -4321,21 +4343,85 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
        HWRM_CHECK_RESULT();
 
        if (rx) {
-               stats->q_ipackets[idx] = rte_le_to_cpu_64(resp->rx_ucast_pkts);
-               stats->q_ipackets[idx] += rte_le_to_cpu_64(resp->rx_mcast_pkts);
-               stats->q_ipackets[idx] += rte_le_to_cpu_64(resp->rx_bcast_pkts);
-               stats->q_ibytes[idx] = rte_le_to_cpu_64(resp->rx_ucast_bytes);
-               stats->q_ibytes[idx] += rte_le_to_cpu_64(resp->rx_mcast_bytes);
-               stats->q_ibytes[idx] += rte_le_to_cpu_64(resp->rx_bcast_bytes);
-               stats->q_errors[idx] = rte_le_to_cpu_64(resp->rx_discard_pkts);
-               stats->q_errors[idx] += rte_le_to_cpu_64(resp->rx_error_pkts);
+               struct bnxt_ring_stats *prev_stats = &bp->prev_rx_ring_stats[idx];
+
+               ring_stats->rx_ucast_pkts = rte_le_to_cpu_64(resp->rx_ucast_pkts);
+               bnxt_update_prev_stat(&ring_stats->rx_ucast_pkts,
+                                     &prev_stats->rx_ucast_pkts);
+
+               ring_stats->rx_mcast_pkts = rte_le_to_cpu_64(resp->rx_mcast_pkts);
+               bnxt_update_prev_stat(&ring_stats->rx_mcast_pkts,
+                                     &prev_stats->rx_mcast_pkts);
+
+               ring_stats->rx_bcast_pkts = rte_le_to_cpu_64(resp->rx_bcast_pkts);
+               bnxt_update_prev_stat(&ring_stats->rx_bcast_pkts,
+                                     &prev_stats->rx_bcast_pkts);
+
+               ring_stats->rx_ucast_bytes = rte_le_to_cpu_64(resp->rx_ucast_bytes);
+               bnxt_update_prev_stat(&ring_stats->rx_ucast_bytes,
+                                     &prev_stats->rx_ucast_bytes);
+
+               ring_stats->rx_mcast_bytes = rte_le_to_cpu_64(resp->rx_mcast_bytes);
+               bnxt_update_prev_stat(&ring_stats->rx_mcast_bytes,
+                                     &prev_stats->rx_mcast_bytes);
+
+               ring_stats->rx_bcast_bytes = rte_le_to_cpu_64(resp->rx_bcast_bytes);
+               bnxt_update_prev_stat(&ring_stats->rx_bcast_bytes,
+                                     &prev_stats->rx_bcast_bytes);
+
+               ring_stats->rx_discard_pkts = rte_le_to_cpu_64(resp->rx_discard_pkts);
+               bnxt_update_prev_stat(&ring_stats->rx_discard_pkts,
+                                     &prev_stats->rx_discard_pkts);
+
+               ring_stats->rx_error_pkts = rte_le_to_cpu_64(resp->rx_error_pkts);
+               bnxt_update_prev_stat(&ring_stats->rx_error_pkts,
+                                     &prev_stats->rx_error_pkts);
+
+               ring_stats->rx_agg_pkts = rte_le_to_cpu_64(resp->rx_agg_pkts);
+               bnxt_update_prev_stat(&ring_stats->rx_agg_pkts,
+                                     &prev_stats->rx_agg_pkts);
+
+               ring_stats->rx_agg_bytes = rte_le_to_cpu_64(resp->rx_agg_bytes);
+               bnxt_update_prev_stat(&ring_stats->rx_agg_bytes,
+                                     &prev_stats->rx_agg_bytes);
+
+               ring_stats->rx_agg_events = rte_le_to_cpu_64(resp->rx_agg_events);
+               bnxt_update_prev_stat(&ring_stats->rx_agg_events,
+                                     &prev_stats->rx_agg_events);
+
+               ring_stats->rx_agg_aborts = rte_le_to_cpu_64(resp->rx_agg_aborts);
+               bnxt_update_prev_stat(&ring_stats->rx_agg_aborts,
+                                     &prev_stats->rx_agg_aborts);
        } else {
-               stats->q_opackets[idx] = rte_le_to_cpu_64(resp->tx_ucast_pkts);
-               stats->q_opackets[idx] += rte_le_to_cpu_64(resp->tx_mcast_pkts);
-               stats->q_opackets[idx] += rte_le_to_cpu_64(resp->tx_bcast_pkts);
-               stats->q_obytes[idx] = rte_le_to_cpu_64(resp->tx_ucast_bytes);
-               stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_mcast_bytes);
-               stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_bcast_bytes);
+               struct bnxt_ring_stats *prev_stats = &bp->prev_tx_ring_stats[idx];
+
+               ring_stats->tx_ucast_pkts = rte_le_to_cpu_64(resp->tx_ucast_pkts);
+               bnxt_update_prev_stat(&ring_stats->tx_ucast_pkts,
+                                     &prev_stats->tx_ucast_pkts);
+
+               ring_stats->tx_mcast_pkts = rte_le_to_cpu_64(resp->tx_mcast_pkts);
+               bnxt_update_prev_stat(&ring_stats->tx_mcast_pkts,
+                                     &prev_stats->tx_mcast_pkts);
+
+               ring_stats->tx_bcast_pkts = rte_le_to_cpu_64(resp->tx_bcast_pkts);
+               bnxt_update_prev_stat(&ring_stats->tx_bcast_pkts,
+                                     &prev_stats->tx_bcast_pkts);
+
+               ring_stats->tx_ucast_bytes = rte_le_to_cpu_64(resp->tx_ucast_bytes);
+               bnxt_update_prev_stat(&ring_stats->tx_ucast_bytes,
+                                     &prev_stats->tx_ucast_bytes);
+
+               ring_stats->tx_mcast_bytes = rte_le_to_cpu_64(resp->tx_mcast_bytes);
+               bnxt_update_prev_stat(&ring_stats->tx_mcast_bytes,
+                                     &prev_stats->tx_mcast_bytes);
+
+               ring_stats->tx_bcast_bytes = rte_le_to_cpu_64(resp->tx_bcast_bytes);
+               bnxt_update_prev_stat(&ring_stats->tx_bcast_bytes,
+                                     &prev_stats->tx_bcast_bytes);
+
+               ring_stats->tx_discard_pkts = rte_le_to_cpu_64(resp->tx_discard_pkts);
+               bnxt_update_prev_stat(&ring_stats->tx_discard_pkts,
+                                     &prev_stats->tx_discard_pkts);
        }
 
        HWRM_UNLOCK();
@@ -4580,7 +4666,6 @@ int bnxt_hwrm_erase_nvram_directory(struct bnxt *bp, uint8_t index)
        return rc;
 }
 
-
 int bnxt_hwrm_flash_nvram(struct bnxt *bp, uint16_t dir_type,
                          uint16_t dir_ordinal, uint16_t dir_ext,
                          uint16_t dir_attr, const uint8_t *data,