net/ice: enable switch filter

[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 d09d172..b50ec50 100644 (file)
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -153,13 +153,13 @@ static const struct ice_xstats_name_off ice_stats_strings[] = {
        {"rx_unicast_packets", offsetof(struct ice_eth_stats, rx_unicast)},
        {"rx_multicast_packets", offsetof(struct ice_eth_stats, rx_multicast)},
        {"rx_broadcast_packets", offsetof(struct ice_eth_stats, rx_broadcast)},
-       {"rx_dropped", offsetof(struct ice_eth_stats, rx_discards)},
+       {"rx_dropped_packets", offsetof(struct ice_eth_stats, rx_discards)},
        {"rx_unknown_protocol_packets", offsetof(struct ice_eth_stats,
                rx_unknown_protocol)},
        {"tx_unicast_packets", offsetof(struct ice_eth_stats, tx_unicast)},
        {"tx_multicast_packets", offsetof(struct ice_eth_stats, tx_multicast)},
        {"tx_broadcast_packets", offsetof(struct ice_eth_stats, tx_broadcast)},
-       {"tx_dropped", offsetof(struct ice_eth_stats, tx_discards)},
+       {"tx_dropped_packets", offsetof(struct ice_eth_stats, tx_discards)},
 };
 
 #define ICE_NB_ETH_XSTATS (sizeof(ice_stats_strings) / \
@@ -485,13 +485,14 @@ ice_init_mac_address(struct rte_eth_dev *dev)
 {
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-       if (!is_unicast_ether_addr
+       if (!rte_is_unicast_ether_addr
                ((struct rte_ether_addr *)hw->port_info[0].mac.lan_addr)) {
                PMD_INIT_LOG(ERR, "Invalid MAC address");
                return -EINVAL;
        }
 
-       ether_addr_copy((struct rte_ether_addr *)hw->port_info[0].mac.lan_addr,
+       rte_ether_addr_copy(
+               (struct rte_ether_addr *)hw->port_info[0].mac.lan_addr,
                (struct rte_ether_addr *)hw->port_info[0].mac.perm_addr);
 
        dev->data->mac_addrs =
@@ -502,8 +503,9 @@ ice_init_mac_address(struct rte_eth_dev *dev)
                return -ENOMEM;
        }
        /* store it to dev data */
-       ether_addr_copy((struct rte_ether_addr *)hw->port_info[0].mac.perm_addr,
-                       &dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(
+               (struct rte_ether_addr *)hw->port_info[0].mac.perm_addr,
+               &dev->data->mac_addrs[0]);
        return 0;
 }
 
@@ -514,7 +516,7 @@ ice_find_mac_filter(struct ice_vsi *vsi, struct rte_ether_addr *macaddr)
        struct ice_mac_filter *f;
 
        TAILQ_FOREACH(f, &vsi->mac_list, next) {
-               if (is_same_ether_addr(macaddr, &f->mac_info.mac_addr))
+               if (rte_is_same_ether_addr(macaddr, &f->mac_info.mac_addr))
                        return f;
        }
 
@@ -654,7 +656,7 @@ ice_add_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
        struct ice_hw *hw;
        int ret = 0;
 
-       if (!vsi || vlan_id > ETHER_MAX_VLAN_ID)
+       if (!vsi || vlan_id > RTE_ETHER_MAX_VLAN_ID)
                return -EINVAL;
 
        hw = ICE_VSI_TO_HW(vsi);
@@ -725,7 +727,7 @@ ice_remove_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)
         * Vlan 0 is the generic filter for untagged packets
         * and can't be removed.
         */
-       if (!vsi || vlan_id == 0 || vlan_id > ETHER_MAX_VLAN_ID)
+       if (!vsi || vlan_id == 0 || vlan_id > RTE_ETHER_MAX_VLAN_ID)
                return -EINVAL;
 
        hw = ICE_VSI_TO_HW(vsi);
@@ -1233,12 +1235,12 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
                   hw->port_info->mac.perm_addr,
                   ETH_ADDR_LEN);
 
-       rte_memcpy(&mac_addr, &pf->dev_addr, ETHER_ADDR_LEN);
+       rte_memcpy(&mac_addr, &pf->dev_addr, RTE_ETHER_ADDR_LEN);
        ret = ice_add_mac_filter(vsi, &mac_addr);
        if (ret != ICE_SUCCESS)
                PMD_INIT_LOG(ERR, "Failed to add dflt MAC filter");
 
-       rte_memcpy(&mac_addr, &broadcast, ETHER_ADDR_LEN);
+       rte_memcpy(&mac_addr, &broadcast, RTE_ETHER_ADDR_LEN);
        ret = ice_add_mac_filter(vsi, &mac_addr);
        if (ret != ICE_SUCCESS)
                PMD_INIT_LOG(ERR, "Failed to add MAC filter");
@@ -1362,6 +1364,21 @@ fail_exit:
        return err;
 }
 
+static void
+ice_base_queue_get(struct ice_pf *pf)
+{
+       uint32_t reg;
+       struct ice_hw *hw = ICE_PF_TO_HW(pf);
+
+       reg = ICE_READ_REG(hw, PFLAN_RX_QALLOC);
+       if (reg & PFLAN_RX_QALLOC_VALID_M) {
+               pf->base_queue = reg & PFLAN_RX_QALLOC_FIRSTQ_M;
+       } else {
+               PMD_INIT_LOG(WARNING, "Failed to get Rx base queue"
+                                       " index");
+       }
+}
+
 static int
 ice_dev_init(struct rte_eth_dev *dev)
 {
@@ -1445,7 +1462,7 @@ 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);
+       ret = ice_aq_stop_lldp(hw, TRUE, FALSE, NULL);
        if (ret != ICE_SUCCESS)
                PMD_INIT_LOG(DEBUG, "lldp has already stopped\n");
 
@@ -1458,12 +1475,16 @@ ice_dev_init(struct rte_eth_dev *dev)
        /* enable uio intr after callback register */
        rte_intr_enable(intr_handle);
 
+       /* get base queue pairs index  in the device */
+       ice_base_queue_get(pf);
+
        return 0;
 
 err_pf_setup:
        ice_res_pool_destroy(&pf->msix_pool);
 err_msix_pool_init:
        rte_free(dev->data->mac_addrs);
+       dev->data->mac_addrs = NULL;
 err_init_mac:
        ice_sched_cleanup_all(hw);
        rte_free(hw->port_info);
@@ -2023,7 +2044,7 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->max_mac_addrs = vsi->max_macaddrs;
        dev_info->max_vfs = pci_dev->max_vfs;
        dev_info->max_mtu = dev_info->max_rx_pktlen - ICE_ETH_OVERHEAD;
-       dev_info->min_mtu = ETHER_MIN_MTU;
+       dev_info->min_mtu = RTE_ETHER_MIN_MTU;
 
        dev_info->rx_offload_capa =
                DEV_RX_OFFLOAD_VLAN_STRIP |
@@ -2052,7 +2073,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                        DEV_TX_OFFLOAD_UDP_CKSUM |
                        DEV_TX_OFFLOAD_TCP_CKSUM |
                        DEV_TX_OFFLOAD_SCTP_CKSUM |
-                       DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+                       DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+                       DEV_TX_OFFLOAD_OUTER_UDP_CKSUM;
                dev_info->flow_type_rss_offloads |= ICE_RSS_OFFLOAD_ALL;
        }
 
@@ -2293,7 +2315,7 @@ ice_force_phys_link_state(struct ice_hw *hw, bool link_up)
        else
                cfg.caps &= ~ICE_AQ_PHY_ENA_LINK;
 
-       status = ice_aq_set_phy_cfg(hw, pi->lport, &cfg, NULL);
+       status = ice_aq_set_phy_cfg(hw, pi, &cfg, NULL);
 
 out:
        ice_free(hw, pcaps);
@@ -2324,7 +2346,7 @@ ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        uint32_t frame_size = mtu + ICE_ETH_OVERHEAD;
 
        /* check if mtu is within the allowed range */
-       if (mtu < ETHER_MIN_MTU || frame_size > ICE_FRAME_SIZE_MAX)
+       if (mtu < RTE_ETHER_MIN_MTU || frame_size > ICE_FRAME_SIZE_MAX)
                return -EINVAL;
 
        /* mtu setting is forbidden if port is start */
@@ -2335,7 +2357,7 @@ ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
                return -EBUSY;
        }
 
-       if (frame_size > ETHER_MAX_LEN)
+       if (frame_size > RTE_ETHER_MAX_LEN)
                dev_data->dev_conf.rxmode.offloads |=
                        DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
@@ -2357,13 +2379,13 @@ static int ice_macaddr_set(struct rte_eth_dev *dev,
        uint8_t flags = 0;
        int ret;
 
-       if (!is_valid_assigned_ether_addr(mac_addr)) {
+       if (!rte_is_valid_assigned_ether_addr(mac_addr)) {
                PMD_DRV_LOG(ERR, "Tried to set invalid MAC address.");
                return -EINVAL;
        }
 
        TAILQ_FOREACH(f, &vsi->mac_list, next) {
-               if (is_same_ether_addr(&pf->dev_addr, &f->mac_info.mac_addr))
+               if (rte_is_same_ether_addr(&pf->dev_addr, &f->mac_info.mac_addr))
                        break;
        }
 
@@ -3199,7 +3221,7 @@ ice_update_vsi_stats(struct ice_vsi *vsi)
                           &nes->rx_broadcast);
        /* exclude CRC bytes */
        nes->rx_bytes -= (nes->rx_unicast + nes->rx_multicast +
-                         nes->rx_broadcast) * ETHER_CRC_LEN;
+                         nes->rx_broadcast) * RTE_ETHER_CRC_LEN;
 
        ice_stat_update_32(hw, GLV_RDPC(idx), vsi->offset_loaded,
                           &oes->rx_discards, &nes->rx_discards);
@@ -3272,10 +3294,11 @@ ice_read_stats_registers(struct ice_pf *pf, struct ice_hw *hw)
                           &ns->eth.rx_discards);
 
        /* Workaround: CRC size should not be included in byte statistics,
-        * so subtract ETHER_CRC_LEN from the byte counter for each rx packet.
+        * so subtract RTE_ETHER_CRC_LEN from the byte counter for each rx
+        * packet.
         */
        ns->eth.rx_bytes -= (ns->eth.rx_unicast + ns->eth.rx_multicast +
-                            ns->eth.rx_broadcast) * ETHER_CRC_LEN;
+                            ns->eth.rx_broadcast) * RTE_ETHER_CRC_LEN;
 
        /* GLPRT_REPC not supported */
        /* GLPRT_RMPC not supported */
@@ -3300,7 +3323,7 @@ ice_read_stats_registers(struct ice_pf *pf, struct ice_hw *hw)
                           pf->offset_loaded, &os->eth.tx_broadcast,
                           &ns->eth.tx_broadcast);
        ns->eth.tx_bytes -= (ns->eth.tx_unicast + ns->eth.tx_multicast +
-                            ns->eth.tx_broadcast) * ETHER_CRC_LEN;
+                            ns->eth.tx_broadcast) * RTE_ETHER_CRC_LEN;
 
        /* GLPRT_TEPC not supported */