net/ice: fix max frame size
[dpdk.git] / drivers / net / ixgbe / ixgbe_ethdev.c
index 4deedb0..975fa47 100644 (file)
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <inttypes.h>
 #include <netinet/in.h>
+#include <rte_string_fns.h>
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
@@ -260,6 +261,8 @@ static int ixgbevf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
 static void ixgbevf_set_ivar_map(struct ixgbe_hw *hw, int8_t direction,
                                 uint8_t queue, uint8_t msix_vector);
 static void ixgbevf_configure_msix(struct rte_eth_dev *dev);
+static void ixgbevf_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static void ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev);
 static void ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev);
 static void ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev);
 
@@ -596,6 +599,8 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = {
        .xstats_get_names     = ixgbevf_dev_xstats_get_names,
        .dev_close            = ixgbevf_dev_close,
        .dev_reset            = ixgbevf_dev_reset,
+       .promiscuous_enable   = ixgbevf_dev_promiscuous_enable,
+       .promiscuous_disable  = ixgbevf_dev_promiscuous_disable,
        .allmulticast_enable  = ixgbevf_dev_allmulticast_enable,
        .allmulticast_disable = ixgbevf_dev_allmulticast_disable,
        .dev_infos_get        = ixgbevf_dev_info_get,
@@ -1336,6 +1341,9 @@ eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev)
                rte_delay_ms(100);
        } while (retries++ < (10 + IXGBE_LINK_UP_TIME));
 
+       /* cancel the delay handler before remove dev */
+       rte_eal_alarm_cancel(ixgbe_dev_interrupt_delayed_handler, eth_dev);
+
        /* uninitialize PF if max_vfs not zero */
        ixgbe_pf_host_uninit(eth_dev);
 
@@ -1508,6 +1516,7 @@ ixgbevf_negotiate_api(struct ixgbe_hw *hw)
 
        /* start with highest supported, proceed down */
        static const enum ixgbe_pfvf_api_rev sup_ver[] = {
+               ixgbe_mbox_api_13,
                ixgbe_mbox_api_12,
                ixgbe_mbox_api_11,
                ixgbe_mbox_api_10,
@@ -2693,6 +2702,10 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
                allowed_speeds = ETH_LINK_SPEED_100M | ETH_LINK_SPEED_1G |
                        ETH_LINK_SPEED_2_5G |  ETH_LINK_SPEED_5G |
                        ETH_LINK_SPEED_10G;
+               if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
+                               hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
+                       allowed_speeds = ETH_LINK_SPEED_10M |
+                               ETH_LINK_SPEED_100M | ETH_LINK_SPEED_1G;
                break;
        default:
                allowed_speeds = ETH_LINK_SPEED_100M | ETH_LINK_SPEED_1G |
@@ -2734,6 +2747,8 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
                        speed |= IXGBE_LINK_SPEED_1GB_FULL;
                if (*link_speeds & ETH_LINK_SPEED_100M)
                        speed |= IXGBE_LINK_SPEED_100_FULL;
+               if (*link_speeds & ETH_LINK_SPEED_10M)
+                       speed |= IXGBE_LINK_SPEED_10_FULL;
        }
 
        err = ixgbe_setup_link(hw, speed, link_up);
@@ -3285,19 +3300,17 @@ static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
 
                /* Extended stats from ixgbe_hw_stats */
                for (i = 0; i < IXGBE_NB_HW_STATS; i++) {
-                       snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               rte_ixgbe_stats_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               rte_ixgbe_stats_strings[i].name,
+                               sizeof(xstats_names[count].name));
                        count++;
                }
 
                /* MACsec Stats */
                for (i = 0; i < IXGBE_NB_MACSEC_STATS; i++) {
-                       snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               rte_ixgbe_macsec_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               rte_ixgbe_macsec_strings[i].name,
+                               sizeof(xstats_names[count].name));
                        count++;
                }
 
@@ -3345,19 +3358,17 @@ static int ixgbe_dev_xstats_get_names_by_id(
 
                        /* Extended stats from ixgbe_hw_stats */
                        for (i = 0; i < IXGBE_NB_HW_STATS; i++) {
-                               snprintf(xstats_names[count].name,
-                                       sizeof(xstats_names[count].name),
-                                       "%s",
-                                       rte_ixgbe_stats_strings[i].name);
+                               strlcpy(xstats_names[count].name,
+                                       rte_ixgbe_stats_strings[i].name,
+                                       sizeof(xstats_names[count].name));
                                count++;
                        }
 
                        /* MACsec Stats */
                        for (i = 0; i < IXGBE_NB_MACSEC_STATS; i++) {
-                               snprintf(xstats_names[count].name,
-                                       sizeof(xstats_names[count].name),
-                                       "%s",
-                                       rte_ixgbe_macsec_strings[i].name);
+                               strlcpy(xstats_names[count].name,
+                                       rte_ixgbe_macsec_strings[i].name,
+                                       sizeof(xstats_names[count].name));
                                count++;
                        }
 
@@ -3414,9 +3425,9 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
 
        if (xstats_names != NULL)
                for (i = 0; i < IXGBEVF_NB_XSTATS; i++)
-                       snprintf(xstats_names[i].name,
-                               sizeof(xstats_names[i].name),
-                               "%s", rte_ixgbevf_stats_strings[i].name);
+                       strlcpy(xstats_names[i].name,
+                               rte_ixgbevf_stats_strings[i].name,
+                               sizeof(xstats_names[i].name));
        return IXGBEVF_NB_XSTATS;
 }
 
@@ -3740,6 +3751,8 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                dev_info->max_vmdq_pools = ETH_16_POOLS;
        else
                dev_info->max_vmdq_pools = ETH_64_POOLS;
+       dev_info->max_mtu =  dev_info->max_rx_pktlen - IXGBE_ETH_OVERHEAD;
+       dev_info->min_mtu = ETHER_MIN_MTU;
        dev_info->vmdq_queue_num = dev_info->max_rx_queues;
        dev_info->rx_queue_offload_capa = ixgbe_get_rx_queue_offloads(dev);
        dev_info->rx_offload_capa = (ixgbe_get_rx_port_offloads(dev) |
@@ -3847,6 +3860,7 @@ ixgbevf_dev_info_get(struct rte_eth_dev *dev,
        dev_info->max_tx_queues = (uint16_t)hw->mac.max_tx_queues;
        dev_info->min_rx_bufsize = 1024; /* cf BSIZEPACKET in SRRCTL reg */
        dev_info->max_rx_pktlen = 9728; /* includes CRC, cf MAXFRS reg */
+       dev_info->max_mtu = dev_info->max_rx_pktlen - IXGBE_ETH_OVERHEAD;
        dev_info->max_mac_addrs = hw->mac.num_rar_entries;
        dev_info->max_hash_mac_addrs = IXGBE_VMDQ_NUM_UC_MAC;
        dev_info->max_vfs = pci_dev->max_vfs;
@@ -4053,8 +4067,12 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
        switch (link_speed) {
        default:
        case IXGBE_LINK_SPEED_UNKNOWN:
+               if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
+                       hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
+                       link.link_speed = ETH_SPEED_NUM_10M;
+               else
+                       link.link_speed = ETH_SPEED_NUM_100M;
                link.link_duplex = ETH_LINK_FULL_DUPLEX;
-               link.link_speed = ETH_SPEED_NUM_100M;
                break;
 
        case IXGBE_LINK_SPEED_100_FULL:
@@ -4931,7 +4949,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        uint32_t maxfrs;
        struct ixgbe_hw *hw;
        struct rte_eth_dev_info dev_info;
-       uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint32_t frame_size = mtu + IXGBE_ETH_OVERHEAD;
        struct rte_eth_dev_data *dev_data = dev->data;
 
        ixgbe_dev_info_get(dev, &dev_info);
@@ -6334,21 +6352,23 @@ static int
 ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct ixgbe_hw *hw;
-       uint32_t max_frame = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
-       struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;
+       uint32_t max_frame = mtu + IXGBE_ETH_OVERHEAD;
+       struct rte_eth_dev_data *dev_data = dev->data;
 
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if ((mtu < ETHER_MIN_MTU) || (max_frame > ETHER_MAX_JUMBO_FRAME_LEN))
                return -EINVAL;
 
-       /* refuse mtu that requires the support of scattered packets when this
-        * feature has not been enabled before.
+       /* If device is started, refuse mtu that requires the support of
+        * scattered packets when this feature has not been enabled before.
         */
-       if (!(rx_conf->offloads & DEV_RX_OFFLOAD_SCATTER) &&
+       if (dev_data->dev_started && !dev_data->scattered_rx &&
            (max_frame + 2 * IXGBE_VLAN_TAG_SIZE >
-            dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM))
+            dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
+               PMD_INIT_LOG(ERR, "Stop port first.");
                return -EINVAL;
+       }
 
        /*
         * When supported by the underlying PF driver, use the IXGBE_VF_SET_MTU
@@ -8306,6 +8326,22 @@ ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
        return ret;
 }
 
+static void
+ixgbevf_dev_promiscuous_enable(struct rte_eth_dev *dev)
+{
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_PROMISC);
+}
+
+static void
+ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
+{
+       struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_NONE);
+}
+
 static void
 ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
 {