net/mlx5: remove Tx gather support

[dpdk.git] / drivers / net / mlx5 / mlx5_ethdev.c

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 36b369e..280a90a 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -44,7 +44,6 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <linux/if.h>
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 #include <fcntl.h>
@@ -362,6 +361,38 @@ priv_ifreq(const struct priv *priv, int req, struct ifreq *ifr)
        return ret;
 }
 
+/**
+ * Return the number of active VFs for the current device.
+ *
+ * @param[in] priv
+ *   Pointer to private structure.
+ * @param[out] num_vfs
+ *   Number of active VFs.
+ *
+ * @return
+ *   0 on success, -1 on failure and errno is set.
+ */
+int
+priv_get_num_vfs(struct priv *priv, uint16_t *num_vfs)
+{
+       /* The sysfs entry name depends on the operating system. */
+       const char **name = (const char *[]){
+               "device/sriov_numvfs",
+               "device/mlx5_num_vfs",
+               NULL,
+       };
+       int ret;
+
+       do {
+               unsigned long ulong_num_vfs;
+
+               ret = priv_get_sysfs_ulong(priv, *name, &ulong_num_vfs);
+               if (!ret)
+                       *num_vfs = ulong_num_vfs;
+       } while (*(++name) && ret);
+       return ret;
+}
+
 /**
  * Get device MTU.
  *
@@ -398,7 +429,15 @@ priv_get_mtu(struct priv *priv, uint16_t *mtu)
 static int
 priv_set_mtu(struct priv *priv, uint16_t mtu)
 {
-       return priv_set_sysfs_ulong(priv, "mtu", mtu);
+       uint16_t new_mtu;
+
+       if (priv_set_sysfs_ulong(priv, "mtu", mtu) ||
+           priv_get_mtu(priv, &new_mtu))
+               return -1;
+       if (new_mtu == mtu)
+               return 0;
+       errno = EINVAL;
+       return -1;
 }
 
 /**
@@ -617,7 +656,7 @@ mlx5_link_update_unlocked(struct rte_eth_dev *dev, int wait_to_complete)
        memset(&dev_link, 0, sizeof(dev_link));
        dev_link.link_status = ((ifr.ifr_flags & IFF_UP) &&
                                (ifr.ifr_flags & IFF_RUNNING));
-       ifr.ifr_data = &edata;
+       ifr.ifr_data = (void *)&edata;
        if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
                WARN("ioctl(SIOCETHTOOL, ETHTOOL_GSET) failed: %s",
                     strerror(errno));
@@ -710,6 +749,7 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        /* Reconfigure each RX queue. */
        for (i = 0; (i != priv->rxqs_n); ++i) {
                struct rxq *rxq = (*priv->rxqs)[i];
+               unsigned int mb_len;
                unsigned int max_frame_len;
                int sp;
 
@@ -719,7 +759,9 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                 * toggle scattered support (sp) if necessary. */
                max_frame_len = (priv->mtu + ETHER_HDR_LEN +
                                 (ETHER_MAX_VLAN_FRAME_LEN - ETHER_MAX_LEN));
-               sp = (max_frame_len > (rxq->mb_len - RTE_PKTMBUF_HEADROOM));
+               mb_len = rte_pktmbuf_data_room_size(rxq->mp);
+               assert(mb_len >= RTE_PKTMBUF_HEADROOM);
+               sp = (max_frame_len > (mb_len - RTE_PKTMBUF_HEADROOM));
                /* Provide new values to rxq_setup(). */
                dev->data->dev_conf.rxmode.jumbo_frame = sp;
                dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame_len;
@@ -767,7 +809,7 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        if (mlx5_is_secondary())
                return -E_RTE_SECONDARY;
 
-       ifr.ifr_data = &ethpause;
+       ifr.ifr_data = (void *)&ethpause;
        priv_lock(priv);
        if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) {
                ret = errno;
@@ -818,7 +860,7 @@ mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        if (mlx5_is_secondary())
                return -E_RTE_SECONDARY;
 
-       ifr.ifr_data = &ethpause;
+       ifr.ifr_data = (void *)&ethpause;
        ethpause.autoneg = fc_conf->autoneg;
        if (((fc_conf->mode & RTE_FC_FULL) == RTE_FC_FULL) ||
            (fc_conf->mode & RTE_FC_RX_PAUSE))
@@ -1218,7 +1260,7 @@ mlx5_secondary_data_setup(struct priv *priv)
                if (txq != NULL) {
                        if (txq_setup(priv->dev,
                                      txq,
-                                     primary_txq->elts_n * MLX5_PMD_SGE_WR_N,
+                                     primary_txq->elts_n,
                                      primary_txq->socket,
                                      NULL) == 0) {
                                txq->stats.idx = primary_txq->stats.idx;