net/txgbe: add queue stats mapping

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

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 6c12369..8025e33 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -13,6 +13,7 @@
 #include <rte_cycles.h>
 #include <rte_alarm.h>
 #include <rte_kvargs.h>
+#include <rte_vect.h>
 
 #include "bnxt.h"
 #include "bnxt_filter.h"
@@ -30,6 +31,7 @@
 #include "bnxt_nvm_defs.h"
 #include "bnxt_tf_common.h"
 #include "ulp_flow_db.h"
+#include "rte_pmd_bnxt.h"
 
 #define DRV_MODULE_NAME                "bnxt"
 static const char bnxt_version[] =
@@ -162,6 +164,8 @@ static const char *const bnxt_dev_args[] = {
  */
 #define BNXT_DEVARG_REP_FC_F2R_INVALID(rep_fc_f2r)     ((rep_fc_f2r) > 1)
 
+int bnxt_cfa_code_dynfield_offset = -1;
+
 /*
  * max_num_kflows must be >= 32
  * and must be a power-of-2 supported value
@@ -1169,7 +1173,8 @@ bnxt_receive_function(struct rte_eth_dev *eth_dev)
                DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
                DEV_RX_OFFLOAD_RSS_HASH |
                DEV_RX_OFFLOAD_VLAN_FILTER)) &&
-           !BNXT_TRUFLOW_EN(bp) && BNXT_NUM_ASYNC_CPR(bp)) {
+           !BNXT_TRUFLOW_EN(bp) && BNXT_NUM_ASYNC_CPR(bp) &&
+           rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
                PMD_DRV_LOG(INFO, "Using vector mode receive for port %d\n",
                            eth_dev->data->port_id);
                bp->flags |= BNXT_FLAG_RX_VECTOR_PKT_MODE;
@@ -1202,7 +1207,8 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev)
         */
        if (!eth_dev->data->scattered_rx &&
            !(offloads & ~DEV_TX_OFFLOAD_MBUF_FAST_FREE) &&
-           !BNXT_TRUFLOW_EN(bp)) {
+           !BNXT_TRUFLOW_EN(bp) &&
+           rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
                PMD_DRV_LOG(INFO, "Using vector mode transmit for port %d\n",
                            eth_dev->data->port_id);
                return bnxt_xmit_pkts_vec;
@@ -1252,7 +1258,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
 
        if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
                PMD_DRV_LOG(ERR,
-                       "RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
+                       "RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
                        bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
        }
 
@@ -4338,8 +4344,6 @@ static const struct eth_dev_ops bnxt_dev_ops = {
        .tx_burst_mode_get = bnxt_tx_burst_mode_get,
        .dev_led_on = bnxt_dev_led_on_op,
        .dev_led_off = bnxt_dev_led_off_op,
-       .xstats_get_by_id = bnxt_dev_xstats_get_by_id_op,
-       .xstats_get_names_by_id = bnxt_dev_xstats_get_names_by_id_op,
        .rx_queue_start = bnxt_rx_queue_start,
        .rx_queue_stop = bnxt_rx_queue_stop,
        .tx_queue_start = bnxt_tx_queue_start,
@@ -6018,6 +6022,22 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
            pci_dev->id.device_id == BROADCOM_DEV_ID_58802_VF)
                bp->flags |= BNXT_FLAG_STINGRAY;
 
+       if (BNXT_TRUFLOW_EN(bp)) {
+               /* extra mbuf field is required to store CFA code from mark */
+               static const struct rte_mbuf_dynfield bnxt_cfa_code_dynfield_desc = {
+                       .name = RTE_PMD_BNXT_CFA_CODE_DYNFIELD_NAME,
+                       .size = sizeof(bnxt_cfa_code_dynfield_t),
+                       .align = __alignof__(bnxt_cfa_code_dynfield_t),
+               };
+               bnxt_cfa_code_dynfield_offset =
+                       rte_mbuf_dynfield_register(&bnxt_cfa_code_dynfield_desc);
+               if (bnxt_cfa_code_dynfield_offset < 0) {
+                       PMD_DRV_LOG(ERR,
+                           "Failed to register mbuf field for TruFlow mark\n");
+                       return -rte_errno;
+               }
+       }
+
        rc = bnxt_init_board(eth_dev);
        if (rc) {
                PMD_DRV_LOG(ERR,
@@ -6282,7 +6302,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
        struct bnxt *backing_bp;
        uint16_t num_rep;
        int i, ret = 0;
-       struct rte_kvargs *kvlist;
+       struct rte_kvargs *kvlist = NULL;
 
        num_rep = eth_da.nb_representor_ports;
        if (num_rep > BNXT_MAX_VF_REPS) {
@@ -6336,49 +6356,74 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
                         * Invoked as for ex: "-w 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
-                       rte_kvargs_process(kvlist, BNXT_DEVARG_REP_IS_PF,
-                                          bnxt_parse_devarg_rep_is_pf,
-                                          (void *)&representor);
+                       ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_IS_PF,
+                                                bnxt_parse_devarg_rep_is_pf,
+                                                (void *)&representor);
+                       if (ret) {
+                               ret = -EINVAL;
+                               goto err;
+                       }
                        /*
                         * Handler for "rep_based_pf" devarg.
                         * Invoked as for ex: "-w 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
-                       rte_kvargs_process(kvlist, BNXT_DEVARG_REP_BASED_PF,
-                                          bnxt_parse_devarg_rep_based_pf,
-                                          (void *)&representor);
+                       ret = rte_kvargs_process(kvlist,
+                                                BNXT_DEVARG_REP_BASED_PF,
+                                                bnxt_parse_devarg_rep_based_pf,
+                                                (void *)&representor);
+                       if (ret) {
+                               ret = -EINVAL;
+                               goto err;
+                       }
                        /*
                         * Handler for "rep_based_pf" devarg.
                         * Invoked as for ex: "-w 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
-                       rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_R2F,
-                                          bnxt_parse_devarg_rep_q_r2f,
-                                          (void *)&representor);
+                       ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_R2F,
+                                                bnxt_parse_devarg_rep_q_r2f,
+                                                (void *)&representor);
+                       if (ret) {
+                               ret = -EINVAL;
+                               goto err;
+                       }
                        /*
                         * Handler for "rep_based_pf" devarg.
                         * Invoked as for ex: "-w 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
-                       rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_F2R,
-                                          bnxt_parse_devarg_rep_q_f2r,
-                                          (void *)&representor);
+                       ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_F2R,
+                                                bnxt_parse_devarg_rep_q_f2r,
+                                                (void *)&representor);
+                       if (ret) {
+                               ret = -EINVAL;
+                               goto err;
+                       }
                        /*
                         * Handler for "rep_based_pf" devarg.
                         * Invoked as for ex: "-w 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
-                       rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_R2F,
-                                          bnxt_parse_devarg_rep_fc_r2f,
-                                          (void *)&representor);
+                       ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_R2F,
+                                                bnxt_parse_devarg_rep_fc_r2f,
+                                                (void *)&representor);
+                       if (ret) {
+                               ret = -EINVAL;
+                               goto err;
+                       }
                        /*
                         * Handler for "rep_based_pf" devarg.
                         * Invoked as for ex: "-w 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
-                       rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_F2R,
-                                          bnxt_parse_devarg_rep_fc_f2r,
-                                          (void *)&representor);
+                       ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_F2R,
+                                                bnxt_parse_devarg_rep_fc_f2r,
+                                                (void *)&representor);
+                       if (ret) {
+                               ret = -EINVAL;
+                               goto err;
+                       }
                }
 
                ret = rte_eth_dev_create(&pci_dev->device, name,
@@ -6408,6 +6453,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 
        }
 
+       rte_kvargs_free(kvlist);
        return 0;
 
 err:
@@ -6416,6 +6462,8 @@ err:
         */
        if (num_rep > 1)
                bnxt_pci_remove_dev_with_reps(backing_eth_dev);
+       rte_errno = -ret;
+       rte_kvargs_free(kvlist);
 
        return ret;
 }