net/bnxt: remove useless copy when setting MAC address

[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 d000282..89b6397 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -378,6 +378,10 @@ static int bnxt_init_chip(struct bnxt *bp)
 err_out:
        bnxt_free_all_hwrm_resources(bp);
 
+       /* Some of the error status returned by FW may not be from errno.h */
+       if (rc > 0)
+               rc = -EIO;
+
        return rc;
 }
 
@@ -526,6 +530,26 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
        bp->tx_queues = (void *)eth_dev->data->tx_queues;
 
        /* Inherit new configurations */
+       if (eth_dev->data->nb_rx_queues > bp->max_rx_rings ||
+           eth_dev->data->nb_tx_queues > bp->max_tx_rings ||
+           eth_dev->data->nb_rx_queues + eth_dev->data->nb_tx_queues + 1 >
+           bp->max_cp_rings ||
+           eth_dev->data->nb_rx_queues + eth_dev->data->nb_tx_queues >
+           bp->max_stat_ctx ||
+           (uint32_t)(eth_dev->data->nb_rx_queues + 1) > bp->max_ring_grps) {
+               RTE_LOG(ERR, PMD,
+                       "Insufficient resources to support requested config\n");
+               RTE_LOG(ERR, PMD,
+                       "Num Queues Requested: Tx %d, Rx %d\n",
+                       eth_dev->data->nb_tx_queues,
+                       eth_dev->data->nb_rx_queues);
+               RTE_LOG(ERR, PMD,
+                       "Res available: TxQ %d, RxQ %d, CQ %d Stat %d, Grp %d\n",
+                       bp->max_tx_rings, bp->max_rx_rings, bp->max_cp_rings,
+                       bp->max_stat_ctx, bp->max_ring_grps);
+               return -ENOSPC;
+       }
+
        bp->rx_nr_rings = eth_dev->data->nb_rx_queues;
        bp->tx_nr_rings = eth_dev->data->nb_tx_queues;
        bp->rx_cp_nr_rings = bp->rx_nr_rings;
@@ -586,6 +610,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
        if (rc)
                goto error;
 
+       bp->flags |= BNXT_FLAG_INIT_DONE;
        return 0;
 
 error:
@@ -631,6 +656,7 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        }
        bnxt_set_hwrm_link_config(bp, false);
        bnxt_hwrm_port_clr_stats(bp);
+       bp->flags &= ~BNXT_FLAG_INIT_DONE;
        bnxt_shutdown_nic(bp);
        bp->dev_stopped = 1;
 }
@@ -1035,7 +1061,7 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev,
 {
        struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
 
-       if (BNXT_NPAR_PF(bp) || BNXT_VF(bp)) {
+       if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp)) {
                RTE_LOG(ERR, PMD, "Flow Control Settings cannot be modified\n");
                return -ENOTSUP;
        }
@@ -1400,7 +1426,6 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)
                return;
 
        memcpy(bp->mac_addr, addr, sizeof(bp->mac_addr));
-       memcpy(&dev->data->mac_addrs[0], bp->mac_addr, ETHER_ADDR_LEN);
 
        STAILQ_FOREACH(filter, &vnic->filter, next) {
                /* Default Filter is at Index 0 */
@@ -1566,7 +1591,7 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on)
        uint16_t vlan = bp->vlan;
        int rc;
 
-       if (BNXT_NPAR_PF(bp) || BNXT_VF(bp)) {
+       if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp)) {
                RTE_LOG(ERR, PMD,
                        "PVID cannot be modified for this function\n");
                return -ENOTSUP;
@@ -1726,9 +1751,9 @@ bnxt_match_and_validate_ether_filter(struct bnxt *bp,
        int match = 0;
        *ret = 0;
 
-       if (efilter->ether_type != ETHER_TYPE_IPv4 &&
-               efilter->ether_type != ETHER_TYPE_IPv6) {
-               RTE_LOG(ERR, PMD, "unsupported ether_type(0x%04x) in"
+       if (efilter->ether_type == ETHER_TYPE_IPv4 ||
+               efilter->ether_type == ETHER_TYPE_IPv6) {
+               RTE_LOG(ERR, PMD, "invalid ether_type(0x%04x) in"
                        " ethertype filter.", efilter->ether_type);
                *ret = -EINVAL;
                goto exit;
@@ -1956,7 +1981,8 @@ parse_ntuple_filter(struct bnxt *bp,
 
 static struct bnxt_filter_info*
 bnxt_match_ntuple_filter(struct bnxt *bp,
-                        struct bnxt_filter_info *bfilter)
+                        struct bnxt_filter_info *bfilter,
+                        struct bnxt_vnic_info **mvnic)
 {
        struct bnxt_filter_info *mfilter = NULL;
        int i;
@@ -1975,8 +2001,11 @@ bnxt_match_ntuple_filter(struct bnxt *bp,
                            bfilter->dst_port == mfilter->dst_port &&
                            bfilter->dst_port_mask == mfilter->dst_port_mask &&
                            bfilter->flags == mfilter->flags &&
-                           bfilter->enables == mfilter->enables)
+                           bfilter->enables == mfilter->enables) {
+                               if (mvnic)
+                                       *mvnic = vnic;
                                return mfilter;
+                       }
                }
        }
        return NULL;
@@ -1988,7 +2017,7 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
                       enum rte_filter_op filter_op)
 {
        struct bnxt_filter_info *bfilter, *mfilter, *filter1;
-       struct bnxt_vnic_info *vnic, *vnic0;
+       struct bnxt_vnic_info *vnic, *vnic0, *mvnic;
        int ret;
 
        if (nfilter->flags != RTE_5TUPLE_FLAGS) {
@@ -2026,12 +2055,22 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
        bfilter->ethertype = 0x800;
        bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
 
-       mfilter = bnxt_match_ntuple_filter(bp, bfilter);
+       mfilter = bnxt_match_ntuple_filter(bp, bfilter, &mvnic);
 
-       if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD) {
-               RTE_LOG(ERR, PMD, "filter exists.");
+       if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
+           bfilter->dst_id == mfilter->dst_id) {
+               RTE_LOG(ERR, PMD, "filter exists.\n");
                ret = -EEXIST;
                goto free_filter;
+       } else if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
+                  bfilter->dst_id != mfilter->dst_id) {
+               mfilter->dst_id = vnic->fw_vnic_id;
+               ret = bnxt_hwrm_set_ntuple_filter(bp, mfilter->dst_id, mfilter);
+               STAILQ_REMOVE(&mvnic->filter, mfilter, bnxt_filter_info, next);
+               STAILQ_INSERT_TAIL(&vnic->filter, mfilter, next);
+               RTE_LOG(ERR, PMD, "filter with matching pattern exists.\n");
+               RTE_LOG(ERR, PMD, " Updated it to the new destination queue\n");
+               goto free_filter;
        }
        if (mfilter == NULL && filter_op == RTE_ETH_FILTER_DELETE) {
                RTE_LOG(ERR, PMD, "filter doesn't exist.");
@@ -2053,11 +2092,11 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
                }
                ret = bnxt_hwrm_clear_ntuple_filter(bp, mfilter);
 
-               STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info,
-                             next);
+               STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info, next);
                bnxt_free_filter(bp, mfilter);
-               bfilter->fw_l2_filter_id = -1;
+               mfilter->fw_l2_filter_id = -1;
                bnxt_free_filter(bp, bfilter);
+               bfilter->fw_l2_filter_id = -1;
        }
 
        return 0;
@@ -3268,7 +3307,7 @@ skip_init:
        rc = bnxt_hwrm_func_reset(bp);
        if (rc) {
                RTE_LOG(ERR, PMD, "hwrm chip reset failure rc: %x\n", rc);
-               rc = -1;
+               rc = -EIO;
                goto error_free;
        }