net/bnxt: enhance RSS action support
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index ed09f1b..a98f93a 100644 (file)
@@ -808,6 +808,26 @@ skip_cosq_cfg:
                }
        }
 
+       for (j = 0; j < bp->tx_nr_rings; j++) {
+               struct bnxt_tx_queue *txq = bp->tx_queues[j];
+
+               if (!txq->tx_deferred_start) {
+                       bp->eth_dev->data->tx_queue_state[j] =
+                               RTE_ETH_QUEUE_STATE_STARTED;
+                       txq->tx_started = true;
+               }
+       }
+
+       for (j = 0; j < bp->rx_nr_rings; j++) {
+               struct bnxt_rx_queue *rxq = bp->rx_queues[j];
+
+               if (!rxq->rx_deferred_start) {
+                       bp->eth_dev->data->rx_queue_state[j] =
+                               RTE_ETH_QUEUE_STATE_STARTED;
+                       rxq->rx_started = true;
+               }
+       }
+
        rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL);
        if (rc) {
                PMD_DRV_LOG(ERR,
@@ -981,9 +1001,13 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
        dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;
        if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
                dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TIMESTAMP;
+       if (bp->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
+               dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_VLAN_STRIP;
        dev_info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
        dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT |
                                    dev_info->tx_queue_offload_capa;
+       if (bp->fw_cap & BNXT_FW_CAP_VLAN_TX_INSERT)
+               dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_VLAN_INSERT;
        dev_info->flow_type_rss_offloads = BNXT_ETH_RSS_SUPPORT;
 
        dev_info->speed_capa = bnxt_get_speed_capabilities(bp);
@@ -1843,11 +1867,6 @@ out:
        if (new.link_status != eth_dev->data->dev_link.link_status ||
            new.link_speed != eth_dev->data->dev_link.link_speed) {
                rte_eth_linkstatus_set(eth_dev, &new);
-
-               rte_eth_dev_callback_process(eth_dev,
-                                            RTE_ETH_EVENT_INTR_LSC,
-                                            NULL);
-
                bnxt_print_link_info(eth_dev);
        }
 
@@ -2354,7 +2373,6 @@ bnxt_udp_tunnel_port_add_op(struct rte_eth_dev *eth_dev,
                }
                tunnel_type =
                        HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN;
-               bp->vxlan_port_cnt++;
                break;
        case RTE_TUNNEL_TYPE_GENEVE:
                if (bp->geneve_port_cnt) {
@@ -2369,7 +2387,6 @@ bnxt_udp_tunnel_port_add_op(struct rte_eth_dev *eth_dev,
                }
                tunnel_type =
                        HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_GENEVE;
-               bp->geneve_port_cnt++;
                break;
        default:
                PMD_DRV_LOG(ERR, "Tunnel type is not supported\n");
@@ -2377,6 +2394,18 @@ bnxt_udp_tunnel_port_add_op(struct rte_eth_dev *eth_dev,
        }
        rc = bnxt_hwrm_tunnel_dst_port_alloc(bp, udp_tunnel->udp_port,
                                             tunnel_type);
+
+       if (rc != 0)
+               return rc;
+
+       if (tunnel_type ==
+           HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN)
+               bp->vxlan_port_cnt++;
+
+       if (tunnel_type ==
+           HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_GENEVE)
+               bp->geneve_port_cnt++;
+
        return rc;
 }
 
@@ -3067,6 +3096,9 @@ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)
        if (!rc)
                eth_dev->data->dev_conf.rxmode.max_rx_pkt_len = new_pkt_size;
 
+       if (bnxt_hwrm_config_host_mtu(bp))
+               PMD_DRV_LOG(WARNING, "Failed to configure host MTU\n");
+
        PMD_DRV_LOG(INFO, "New MTU is %d\n", new_mtu);
 
        return rc;
@@ -3126,7 +3158,7 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
        struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
        struct bnxt_cp_ring_info *cpr;
-       uint32_t desc = 0, raw_cons;
+       uint32_t desc = 0, raw_cons, cp_ring_size;
        struct bnxt_rx_queue *rxq;
        struct rx_pkt_cmpl *rxcmp;
        int rc;
@@ -3138,6 +3170,7 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        rxq = dev->data->rx_queues[rx_queue_id];
        cpr = rxq->cp_ring;
        raw_cons = cpr->cp_raw_cons;
+       cp_ring_size = cpr->cp_ring_struct->ring_size;
 
        while (1) {
                uint32_t agg_cnt, cons, cmpl_type;
@@ -3145,7 +3178,7 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
                cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
                rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons];
 
-               if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))
+               if (!bnxt_cpr_cmp_valid(rxcmp, raw_cons, cp_ring_size))
                        break;
 
                cmpl_type = CMP_TYPE(rxcmp);
@@ -3189,7 +3222,7 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
        struct bnxt_rx_queue *rxq = rx_queue;
        struct bnxt_cp_ring_info *cpr;
        struct bnxt_rx_ring_info *rxr;
-       uint32_t desc, raw_cons;
+       uint32_t desc, raw_cons, cp_ring_size;
        struct bnxt *bp = rxq->bp;
        struct rx_pkt_cmpl *rxcmp;
        int rc;
@@ -3203,6 +3236,7 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
 
        rxr = rxq->rx_ring;
        cpr = rxq->cp_ring;
+       cp_ring_size = cpr->cp_ring_struct->ring_size;
 
        /*
         * For the vector receive case, the completion at the requested
@@ -3219,7 +3253,7 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
                cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
                rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons];
 
-               if (CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))
+               if (bnxt_cpr_cmp_valid(rxcmp, raw_cons, cp_ring_size))
                        return RTE_ETH_RX_DESC_DONE;
 
                /* Check whether rx desc has an mbuf attached. */
@@ -3245,7 +3279,7 @@ bnxt_rx_descriptor_status_op(void *rx_queue, uint16_t offset)
                cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
                rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons];
 
-               if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))
+               if (!bnxt_cpr_cmp_valid(rxcmp, raw_cons, cp_ring_size))
                        break;
 
                cmpl_type = CMP_TYPE(rxcmp);
@@ -3299,7 +3333,6 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
        struct bnxt_tx_queue *txq = (struct bnxt_tx_queue *)tx_queue;
        struct bnxt_cp_ring_info *cpr = txq->cp_ring;
        uint32_t ring_mask, raw_cons, nb_tx_pkts = 0;
-       struct bnxt_ring *cp_ring_struct;
        struct cmpl_base *cp_desc_ring;
        int rc;
 
@@ -3316,7 +3349,6 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
 
        raw_cons = cpr->cp_raw_cons;
        cp_desc_ring = cpr->cp_desc_ring;
-       cp_ring_struct = cpr->cp_ring_struct;
        ring_mask = cpr->cp_ring_struct->ring_mask;
 
        /* Check to see if hw has posted a completion for the descriptor. */
@@ -3327,7 +3359,7 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
                cons = RING_CMPL(ring_mask, raw_cons);
                txcmp = (struct tx_cmpl *)&cp_desc_ring[cons];
 
-               if (!CMP_VALID(txcmp, raw_cons, cp_ring_struct))
+               if (!bnxt_cpr_cmp_valid(txcmp, raw_cons, ring_mask + 1))
                        break;
 
                if (CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)
@@ -4435,11 +4467,11 @@ static int bnxt_fw_reset_all(struct bnxt *bp)
        int rc = 0;
 
        if (info->flags & BNXT_FLAG_ERROR_RECOVERY_HOST) {
-               /* Reset through master function driver */
+               /* Reset through primary function driver */
                for (i = 0; i < info->reg_array_cnt; i++)
                        bnxt_write_fw_reset_reg(bp, i);
                /* Wait for time specified by FW after triggering reset */
-               rte_delay_ms(info->master_func_wait_period_after_reset);
+               rte_delay_ms(info->primary_func_wait_period_after_reset);
        } else if (info->flags & BNXT_FLAG_ERROR_RECOVERY_CO_CPU) {
                /* Reset with the help of Kong processor */
                rc = bnxt_hwrm_fw_reset(bp);
@@ -4456,8 +4488,8 @@ static void bnxt_fw_reset_cb(void *arg)
        struct bnxt_error_recovery_info *info = bp->recovery_info;
        int rc = 0;
 
-       /* Only Master function can do FW reset */
-       if (bnxt_is_master_func(bp) &&
+       /* Only Primary function can do FW reset */
+       if (bnxt_is_primary_func(bp) &&
            bnxt_is_recovery_enabled(bp)) {
                rc = bnxt_fw_reset_all(bp);
                if (rc) {
@@ -4485,8 +4517,8 @@ static void bnxt_fw_reset_cb(void *arg)
  * advertised by FW in HWRM_ERROR_RECOVERY_QCFG.
  * When the driver detects heartbeat stop or change in reset_counter,
  * it has to trigger a reset to recover from the error condition.
- * A “master PF” is the function who will have the privilege to
- * initiate the chimp reset. The master PF will be elected by the
+ * A “primary function” is the function who will have the privilege to
+ * initiate the chimp reset. The primary function will be elected by the
  * firmware and will be notified through async message.
  */
 static void bnxt_check_fw_health(void *arg)
@@ -4524,8 +4556,8 @@ reset:
 
        PMD_DRV_LOG(ERR, "Detected FW dead condition\n");
 
-       if (bnxt_is_master_func(bp))
-               wait_msec = info->master_func_wait_period;
+       if (bnxt_is_primary_func(bp))
+               wait_msec = info->primary_func_wait_period;
        else
                wait_msec = info->normal_func_wait_period;
 
@@ -4994,7 +5026,7 @@ static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev)
                PMD_DRV_LOG(INFO, "VF MAC address not assigned by Host PF\n");
                bnxt_eth_hw_addr_random(bp->mac_addr);
                PMD_DRV_LOG(INFO,
-                           "Assign random MAC:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                           "Assign random MAC:" RTE_ETHER_ADDR_PRT_FMT "\n",
                            bp->mac_addr[0], bp->mac_addr[1], bp->mac_addr[2],
                            bp->mac_addr[3], bp->mac_addr[4], bp->mac_addr[5]);
 
@@ -6148,7 +6180,7 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
                bp->pf->vf_req_buf = NULL;
        }
 
-       rc = bnxt_hwrm_func_driver_unregister(bp, 0);
+       rc = bnxt_hwrm_func_driver_unregister(bp);
        bp->flags &= ~BNXT_FLAG_REGISTERED;
        bnxt_free_ctx_mem(bp);
        if (!reconfig_dev) {