net/ice: fix Rx statistics

[dpdk.git] / drivers / net / ice / ice_ethdev.c

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index ff2f7b1..cae7a9d 100644 (file)
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -12,6 +12,7 @@
 
 #include "base/ice_sched.h"
 #include "base/ice_flow.h"
+#include "base/ice_dcb.h"
 #include "ice_ethdev.h"
 #include "ice_rxtx.h"
 
@@ -644,12 +645,14 @@ ice_add_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
        struct ice_fltr_list_entry *v_list_itr = NULL;
        struct ice_vlan_filter *f;
        struct LIST_HEAD_TYPE list_head;
-       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_hw *hw;
        int ret = 0;
 
        if (!vsi || vlan_id > ETHER_MAX_VLAN_ID)
                return -EINVAL;
 
+       hw = ICE_VSI_TO_HW(vsi);
+
        /* If it's added and configured, return. */
        f = ice_find_vlan_filter(vsi, vlan_id);
        if (f) {
@@ -709,7 +712,7 @@ ice_remove_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
        struct ice_fltr_list_entry *v_list_itr = NULL;
        struct ice_vlan_filter *f;
        struct LIST_HEAD_TYPE list_head;
-       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_hw *hw;
        int ret = 0;
 
        /**
@@ -719,6 +722,8 @@ ice_remove_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
        if (!vsi || vlan_id == 0 || vlan_id > ETHER_MAX_VLAN_ID)
                return -EINVAL;
 
+       hw = ICE_VSI_TO_HW(vsi);
+
        /* Can't find it, return an error */
        f = ice_find_vlan_filter(vsi, vlan_id);
        if (!f)
@@ -1428,6 +1433,10 @@ ice_dev_init(struct rte_eth_dev *dev)
        /* Disable double vlan by default */
        ice_vsi_config_double_vlan(vsi, FALSE);
 
+       ret = ice_aq_stop_lldp(hw, TRUE, NULL);
+       if (ret != ICE_SUCCESS)
+               PMD_INIT_LOG(DEBUG, "lldp has already stopped\n");
+
        /* register callback func to eal lib */
        rte_intr_callback_register(intr_handle,
                                   ice_interrupt_handler, dev);
@@ -1657,6 +1666,18 @@ static int ice_init_rss(struct ice_pf *pf)
        if (ret)
                return -EINVAL;
 
+       /* configure RSS for IPv4 with input set IPv4 src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV4,
+                             ICE_FLOW_SEG_HDR_IPV4);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s IPV4 rss flow fail %d", __func__, ret);
+
+       /* configure RSS for IPv6 with input set IPv6 src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV6,
+                             ICE_FLOW_SEG_HDR_IPV6);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s IPV6 rss flow fail %d", __func__, ret);
+
        /* configure RSS for tcp6 with input set IPv6 src/dst, TCP src/dst */
        ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV6,
                              ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV6);
@@ -2548,13 +2569,16 @@ ice_get_rss_lut(struct ice_vsi *vsi, uint8_t *lut, uint16_t lut_size)
 static int
 ice_set_rss_lut(struct ice_vsi *vsi, uint8_t *lut, uint16_t lut_size)
 {
-       struct ice_pf *pf = ICE_VSI_TO_PF(vsi);
-       struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+       struct ice_pf *pf;
+       struct ice_hw *hw;
        int ret;
 
        if (!vsi || !lut)
                return -EINVAL;
 
+       pf = ICE_VSI_TO_PF(vsi);
+       hw = ICE_VSI_TO_HW(vsi);
+
        if (pf->flags & ICE_FLAG_RSS_AQ_CAPABLE) {
                ret = ice_aq_set_rss_lut(hw, vsi->idx, TRUE,
                                         lut, lut_size);
@@ -2751,14 +2775,16 @@ ice_promisc_enable(struct rte_eth_dev *dev)
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_vsi *vsi = pf->main_vsi;
+       enum ice_status status;
        uint8_t pmask;
-       uint16_t status;
 
        pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX |
                ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
 
        status = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0);
-       if (status != ICE_SUCCESS)
+       if (status == ICE_ERR_ALREADY_EXISTS)
+               PMD_DRV_LOG(DEBUG, "Promisc mode has already been enabled");
+       else if (status != ICE_SUCCESS)
                PMD_DRV_LOG(ERR, "Failed to enable promisc, err=%d", status);
 }
 
@@ -2768,7 +2794,7 @@ ice_promisc_disable(struct rte_eth_dev *dev)
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_vsi *vsi = pf->main_vsi;
-       uint16_t status;
+       enum ice_status status;
        uint8_t pmask;
 
        pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX |
@@ -2785,8 +2811,8 @@ ice_allmulti_enable(struct rte_eth_dev *dev)
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_vsi *vsi = pf->main_vsi;
+       enum ice_status status;
        uint8_t pmask;
-       uint16_t status;
 
        pmask = ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
 
@@ -2801,7 +2827,7 @@ ice_allmulti_disable(struct rte_eth_dev *dev)
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_vsi *vsi = pf->main_vsi;
-       uint16_t status;
+       enum ice_status status;
        uint8_t pmask;
 
        if (dev->data->promiscuous == 1)
@@ -3300,15 +3326,14 @@ ice_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        /* call read registers - updates values, now write them to struct */
        ice_read_stats_registers(pf, hw);
 
-       stats->ipackets = ns->eth.rx_unicast +
-                         ns->eth.rx_multicast +
-                         ns->eth.rx_broadcast -
-                         ns->eth.rx_discards -
+       stats->ipackets = pf->main_vsi->eth_stats.rx_unicast +
+                         pf->main_vsi->eth_stats.rx_multicast +
+                         pf->main_vsi->eth_stats.rx_broadcast -
                          pf->main_vsi->eth_stats.rx_discards;
        stats->opackets = ns->eth.tx_unicast +
                          ns->eth.tx_multicast +
                          ns->eth.tx_broadcast;
-       stats->ibytes   = ns->eth.rx_bytes;
+       stats->ibytes   = pf->main_vsi->eth_stats.rx_bytes;
        stats->obytes   = ns->eth.tx_bytes;
        stats->oerrors  = ns->eth.tx_errors +
                          pf->main_vsi->eth_stats.tx_errors;