Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Davem says:

1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.

2) tg3 header length computation correction from Eric Dumazet.

3) More build and reference counting fixes for socket memory cgroup
   code from Glauber Costa.

4) module.h snuck back into a core header after all the hard work we
   did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.

5) Fix PHY naming regression and add some new PCI IDs in stmmac, from
   Alessandro Rubini.

6) Netlink message generation fix in new team driver, should only advertise
   the entries that changed during events, from Jiri Pirko.

7) SRIOV VF registration and unregistration fixes, and also add a
   missing PCI ID, from Roopa Prabhu.

8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.

9) ftgmac100/ftmac100 build fix, missing interrupt.h include.

10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.

11) Off by one fix in netem packet scheduler, from Vijay Subramanian.

12) TCP loss detection fix from Yuchung Cheng.

13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.

14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.

15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC
    congestion control modules, fix from Neal Cardwell.

16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.

17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.

18) Statistics bug fixes in mlx4 from Eugenia Emantayev.

19) rds locking bug fix during info dumps, from your's truly.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)
  rds: Make rds_sock_lock BH rather than IRQ safe.
  netprio_cgroup.h: dont include module.h from other includes
  net: flow_dissector.c missing include linux/export.h
  team: send only changed options/ports via netlink
  net/hyperv: fix possible memory leak in do_set_multicast()
  drivers/net: dsa/mv88e6xxx.c files need linux/module.h
  stmmac: added PCI identifiers
  llc: Fix race condition in llc_ui_recvmsg
  stmmac: fix phy naming inconsistency
  dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.
  tg3: fix ipv6 header length computation
  skge: add byte queue limit support
  mv643xx_eth: Add Rx Discard and Rx Overrun statistics
  bnx2x: fix compilation error with SOE in fw_dump
  bnx2x: handle CHIP_REVISION during init_one
  bnx2x: allow user to change ring size in ISCSI SD mode
  bnx2x: fix Big-Endianess in ethtool -t
  bnx2x: fixed ethtool statistics for MF modes
  bnx2x: credit-leakage fixup on vlan_mac_del_all
  macvlan: fix a possible use after free
  ...

19 files changed, 234 insertions, 106 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 978f593094c0..405e6ac3faf6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1247,6 +1247,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         u32 reply;
         u32 slave_status = 0;
         u8 is_going_down = 0;
+        int i;
 
         slave_state[slave].comm_toggle ^= 1;
         reply = (u32) slave_state[slave].comm_toggle << 31;
@@ -1258,6 +1259,10 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         if (cmd == MLX4_COMM_CMD_RESET) {
                 mlx4_warn(dev, "Received reset from slave:%d\n", slave);
                 slave_state[slave].active = false;
+                for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i) {
+                                slave_state[slave].event_eq[i].eqn = -1;
+                                slave_state[slave].event_eq[i].token = 0;
+                }
                 /*check if we are in the middle of FLR process,
                 if so return "retry" status to the slave*/
                 if (MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {
@@ -1452,7 +1457,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_slave_state *s_state;
-        int i, err, port;
+        int i, j, err, port;
 
         priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE,
                                             &priv->mfunc.vhcr_dma,
@@ -1485,6 +1490,8 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
                 for (i = 0; i < dev->num_slaves; ++i) {
                         s_state = &priv->mfunc.master.slave_state[i];
                         s_state->last_cmd = MLX4_COMM_CMD_RESET;
+                        for (j = 0; j < MLX4_EVENT_TYPES_NUM; ++j)
+                                s_state->event_eq[j].eqn = -1;
                         __raw_writel((__force u32) 0,
                                      &priv->mfunc.comm[i].slave_write);
                         __raw_writel((__force u32) 0,
diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index 475f9d6af955..7e64033d7de3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -96,7 +96,7 @@ void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type)
 static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int cq_num)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function, cq_num, 0,
+        return mlx4_cmd(dev, mailbox->dma, cq_num, 0,
                         MLX4_CMD_SW2HW_CQ, MLX4_CMD_TIME_CLASS_A,
                         MLX4_CMD_WRAPPED);
 }
@@ -111,7 +111,7 @@ static int mlx4_MODIFY_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
 static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int cq_num)
 {
-        return mlx4_cmd_box(dev, dev->caps.function, mailbox ? mailbox->dma : 0,
+        return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0,
                             cq_num, mailbox ? 0 : 1, MLX4_CMD_HW2SW_CQ,
                             MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 7dbc6a230779..70346fd7f9c4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -183,10 +183,11 @@ static int mlx4_en_set_wol(struct net_device *netdev,
 static int mlx4_en_get_sset_count(struct net_device *dev, int sset)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
+        int bit_count = hweight64(priv->stats_bitmap);
 
         switch (sset) {
         case ETH_SS_STATS:
-                return NUM_ALL_STATS +
+                return (priv->stats_bitmap ? bit_count : NUM_ALL_STATS) +
                         (priv->tx_ring_num + priv->rx_ring_num) * 2;
         case ETH_SS_TEST:
                 return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.flags
@@ -201,14 +202,34 @@ static void mlx4_en_get_ethtool_stats(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         int index = 0;
-        int i;
+        int i, j = 0;
 
         spin_lock_bh(&priv->stats_lock);
 
-        for (i = 0; i < NUM_MAIN_STATS; i++)
-                data[index++] = ((unsigned long *) &priv->stats)[i];
-        for (i = 0; i < NUM_PORT_STATS; i++)
-                data[index++] = ((unsigned long *) &priv->port_stats)[i];
+        if (!(priv->stats_bitmap)) {
+                for (i = 0; i < NUM_MAIN_STATS; i++)
+                        data[index++] =
+                                ((unsigned long *) &priv->stats)[i];
+                for (i = 0; i < NUM_PORT_STATS; i++)
+                        data[index++] =
+                                ((unsigned long *) &priv->port_stats)[i];
+                for (i = 0; i < NUM_PKT_STATS; i++)
+                        data[index++] =
+                                ((unsigned long *) &priv->pkstats)[i];
+        } else {
+                for (i = 0; i < NUM_MAIN_STATS; i++) {
+                        if ((priv->stats_bitmap >> j) & 1)
+                                data[index++] =
+                                ((unsigned long *) &priv->stats)[i];
+                        j++;
+                }
+                for (i = 0; i < NUM_PORT_STATS; i++) {
+                        if ((priv->stats_bitmap >> j) & 1)
+                                data[index++] =
+                                ((unsigned long *) &priv->port_stats)[i];
+                        j++;
+                }
+        }
         for (i = 0; i < priv->tx_ring_num; i++) {
                 data[index++] = priv->tx_ring[i].packets;
                 data[index++] = priv->tx_ring[i].bytes;
@@ -217,8 +238,6 @@ static void mlx4_en_get_ethtool_stats(struct net_device *dev,
                 data[index++] = priv->rx_ring[i].packets;
                 data[index++] = priv->rx_ring[i].bytes;
         }
-        for (i = 0; i < NUM_PKT_STATS; i++)
-                data[index++] = ((unsigned long *) &priv->pkstats)[i];
         spin_unlock_bh(&priv->stats_lock);
 
 }
@@ -247,11 +266,29 @@ static void mlx4_en_get_strings(struct net_device *dev,
 
         case ETH_SS_STATS:
                 /* Add main counters */
-                for (i = 0; i < NUM_MAIN_STATS; i++)
-                        strcpy(data + (index++) * ETH_GSTRING_LEN, main_strings[i]);
-                for (i = 0; i< NUM_PORT_STATS; i++)
-                        strcpy(data + (index++) * ETH_GSTRING_LEN,
-                        main_strings[i + NUM_MAIN_STATS]);
+                if (!priv->stats_bitmap) {
+                        for (i = 0; i < NUM_MAIN_STATS; i++)
+                                strcpy(data + (index++) * ETH_GSTRING_LEN,
+                                        main_strings[i]);
+                        for (i = 0; i < NUM_PORT_STATS; i++)
+                                strcpy(data + (index++) * ETH_GSTRING_LEN,
+                                        main_strings[i +
+                                        NUM_MAIN_STATS]);
+                        for (i = 0; i < NUM_PKT_STATS; i++)
+                                strcpy(data + (index++) * ETH_GSTRING_LEN,
+                                        main_strings[i +
+                                        NUM_MAIN_STATS +
+                                        NUM_PORT_STATS]);
+                } else
+                        for (i = 0; i < NUM_MAIN_STATS + NUM_PORT_STATS; i++) {
+                                if ((priv->stats_bitmap >> i) & 1) {
+                                        strcpy(data +
+                                               (index++) * ETH_GSTRING_LEN,
+                                               main_strings[i]);
+                                }
+                                if (!(priv->stats_bitmap >> i))
+                                        break;
+                        }
                 for (i = 0; i < priv->tx_ring_num; i++) {
                         sprintf(data + (index++) * ETH_GSTRING_LEN,
                                 "tx%d_packets", i);
@@ -264,9 +301,6 @@ static void mlx4_en_get_strings(struct net_device *dev,
                         sprintf(data + (index++) * ETH_GSTRING_LEN,
                                 "rx%d_bytes", i);
                 }
-                for (i = 0; i< NUM_PKT_STATS; i++)
-                        strcpy(data + (index++) * ETH_GSTRING_LEN,
-                        main_strings[i + NUM_MAIN_STATS + NUM_PORT_STATS]);
                 break;
         }
 }
@@ -479,6 +513,95 @@ static void mlx4_en_get_ringparam(struct net_device *dev,
         param->tx_pending = priv->tx_ring[0].size;
 }
 
+static u32 mlx4_en_get_rxfh_indir_size(struct net_device *dev)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+
+        return priv->rx_ring_num;
+}
+
+static int mlx4_en_get_rxfh_indir(struct net_device *dev, u32 *ring_index)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_rss_map *rss_map = &priv->rss_map;
+        int rss_rings;
+        size_t n = priv->rx_ring_num;
+        int err = 0;
+
+        rss_rings = priv->prof->rss_rings ?: priv->rx_ring_num;
+
+        while (n--) {
+                ring_index[n] = rss_map->qps[n % rss_rings].qpn -
+                        rss_map->base_qpn;
+        }
+
+        return err;
+}
+
+static int mlx4_en_set_rxfh_indir(struct net_device *dev,
+                const u32 *ring_index)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int port_up = 0;
+        int err = 0;
+        int i;
+        int rss_rings = 0;
+
+        /* Calculate RSS table size and make sure flows are spread evenly
+         * between rings
+         */
+        for (i = 0; i < priv->rx_ring_num; i++) {
+                if (i > 0 && !ring_index[i] && !rss_rings)
+                        rss_rings = i;
+
+                if (ring_index[i] != (i % (rss_rings ?: priv->rx_ring_num)))
+                        return -EINVAL;
+        }
+
+        if (!rss_rings)
+                rss_rings = priv->rx_ring_num;
+
+        /* RSS table size must be an order of 2 */
+        if (!is_power_of_2(rss_rings))
+                return -EINVAL;
+
+        mutex_lock(&mdev->state_lock);
+        if (priv->port_up) {
+                port_up = 1;
+                mlx4_en_stop_port(dev);
+        }
+
+        priv->prof->rss_rings = rss_rings;
+
+        if (port_up) {
+                err = mlx4_en_start_port(dev);
+                if (err)
+                        en_err(priv, "Failed starting port\n");
+        }
+
+        mutex_unlock(&mdev->state_lock);
+        return err;
+}
+
+static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
+                             u32 *rule_locs)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        int err = 0;
+
+        switch (cmd->cmd) {
+        case ETHTOOL_GRXRINGS:
+                cmd->data = priv->rx_ring_num;
+                break;
+        default:
+                err = -EOPNOTSUPP;
+                break;
+        }
+
+        return err;
+}
+
 const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_drvinfo = mlx4_en_get_drvinfo,
         .get_settings = mlx4_en_get_settings,
@@ -498,6 +621,10 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .set_pauseparam = mlx4_en_set_pauseparam,
         .get_ringparam = mlx4_en_get_ringparam,
         .set_ringparam = mlx4_en_set_ringparam,
+        .get_rxnfc = mlx4_en_get_rxnfc,
+        .get_rxfh_indir_size = mlx4_en_get_rxfh_indir_size,
+        .get_rxfh_indir = mlx4_en_get_rxfh_indir,
+        .set_rxfh_indir = mlx4_en_set_rxfh_indir,
 };
 
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index a06096fcc0b8..2097a7d3c5b8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -62,10 +62,6 @@ static const char mlx4_en_version[] =
  * Device scope module parameters
  */
 
-
-/* Enable RSS TCP traffic */
-MLX4_EN_PARM_INT(tcp_rss, 1,
-                 "Enable RSS for incomming TCP traffic or disabled (0)");
 /* Enable RSS UDP traffic */
 MLX4_EN_PARM_INT(udp_rss, 1,
                  "Enable RSS for incomming UDP traffic or disabled (0)");
@@ -104,7 +100,6 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
         struct mlx4_en_profile *params = &mdev->profile;
         int i;
 
-        params->tcp_rss = tcp_rss;
         params->udp_rss = udp_rss;
         if (params->udp_rss && !(mdev->dev->caps.flags
                                         & MLX4_DEV_CAP_FLAG_UDP_RSS)) {
@@ -120,6 +115,7 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
                 params->prof[i].rx_ring_size = MLX4_EN_DEF_RX_RING_SIZE;
                 params->prof[i].tx_ring_num = MLX4_EN_NUM_TX_RINGS +
                         (!!pfcrx) * MLX4_EN_NUM_PPP_RINGS;
+                params->prof[i].rss_rings = 0;
         }
 
         return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 72fa807b69ce..467ae5824875 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -702,6 +702,8 @@ int mlx4_en_start_port(struct net_device *dev)
         /* Schedule multicast task to populate multicast list */
         queue_work(mdev->workqueue, &priv->mcast_task);
 
+        mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
+
         priv->port_up = true;
         netif_tx_start_all_queues(dev);
         return 0;
@@ -807,38 +809,50 @@ static void mlx4_en_restart(struct work_struct *work)
         mutex_unlock(&mdev->state_lock);
 }
 
-
-static int mlx4_en_open(struct net_device *dev)
+static void mlx4_en_clear_stats(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
         int i;
-        int err = 0;
-
-        mutex_lock(&mdev->state_lock);
-
-        if (!mdev->device_up) {
-                en_err(priv, "Cannot open - device down/disabled\n");
-                err = -EBUSY;
-                goto out;
-        }
 
-        /* Reset HW statistics and performance counters */
         if (mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 1))
                 en_dbg(HW, priv, "Failed dumping statistics\n");
 
         memset(&priv->stats, 0, sizeof(priv->stats));
         memset(&priv->pstats, 0, sizeof(priv->pstats));
+        memset(&priv->pkstats, 0, sizeof(priv->pkstats));
+        memset(&priv->port_stats, 0, sizeof(priv->port_stats));
 
         for (i = 0; i < priv->tx_ring_num; i++) {
                 priv->tx_ring[i].bytes = 0;
                 priv->tx_ring[i].packets = 0;
+                priv->tx_ring[i].tx_csum = 0;
         }
         for (i = 0; i < priv->rx_ring_num; i++) {
                 priv->rx_ring[i].bytes = 0;
                 priv->rx_ring[i].packets = 0;
+                priv->rx_ring[i].csum_ok = 0;
+                priv->rx_ring[i].csum_none = 0;
+        }
+}
+
+static int mlx4_en_open(struct net_device *dev)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int err = 0;
+
+        mutex_lock(&mdev->state_lock);
+
+        if (!mdev->device_up) {
+                en_err(priv, "Cannot open - device down/disabled\n");
+                err = -EBUSY;
+                goto out;
         }
 
+        /* Reset HW statistics and SW counters */
+        mlx4_en_clear_stats(dev);
+
         err = mlx4_en_start_port(dev);
         if (err)
                 en_err(priv, "Failed starting port:%d\n", priv->port);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index e8d6ad2dce0a..971d4b6b8dfe 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -853,6 +853,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         struct mlx4_en_rss_map *rss_map = &priv->rss_map;
         struct mlx4_qp_context context;
         struct mlx4_rss_context *rss_context;
+        int rss_rings;
         void *ptr;
         u8 rss_mask = (MLX4_RSS_IPV4 | MLX4_RSS_TCP_IPV4 | MLX4_RSS_IPV6 |
                         MLX4_RSS_TCP_IPV6);
@@ -893,10 +894,15 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
                                 priv->rx_ring[0].cqn, &context);
 
+        if (!priv->prof->rss_rings || priv->prof->rss_rings > priv->rx_ring_num)
+                rss_rings = priv->rx_ring_num;
+        else
+                rss_rings = priv->prof->rss_rings;
+
         ptr = ((void *) &context) + offsetof(struct mlx4_qp_context, pri_path)
                                         + MLX4_RSS_OFFSET_IN_QPC_PRI_PATH;
         rss_context = ptr;
-        rss_context->base_qpn = cpu_to_be32(ilog2(priv->rx_ring_num) << 24 |
+        rss_context->base_qpn = cpu_to_be32(ilog2(rss_rings) << 24 |
                                             (rss_map->base_qpn));
         rss_context->default_qpn = cpu_to_be32(rss_map->base_qpn);
         if (priv->mdev->profile.udp_rss) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 1e9b55eb7217..55d7bd4e210a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -513,25 +513,22 @@ int mlx4_MAP_EQ_wrapper(struct mlx4_dev *dev, int slave,
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_slave_event_eq_info *event_eq =
-                &priv->mfunc.master.slave_state[slave].event_eq;
+                priv->mfunc.master.slave_state[slave].event_eq;
         u32 in_modifier = vhcr->in_modifier;
         u32 eqn = in_modifier & 0x1FF;
         u64 in_param =  vhcr->in_param;
         int err = 0;
+        int i;
 
         if (slave == dev->caps.function)
                 err = mlx4_cmd(dev, in_param, (in_modifier & 0x80000000) | eqn,
                                0, MLX4_CMD_MAP_EQ, MLX4_CMD_TIME_CLASS_B,
                                MLX4_CMD_NATIVE);
-        if (!err) {
-                if (in_modifier >> 31) {
-                        /* unmap */
-                        event_eq->event_type &= ~in_param;
-                } else {
-                        event_eq->eqn = eqn;
-                        event_eq->event_type = in_param;
-                }
-        }
+        if (!err)
+                for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i)
+                        if (in_param & (1LL << i))
+                                event_eq[i].eqn = in_modifier >> 31 ? -1 : eqn;
+
         return err;
 }
 
@@ -546,7 +543,7 @@ static int mlx4_MAP_EQ(struct mlx4_dev *dev, u64 event_mask, int unmap,
 static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int eq_num)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function, eq_num, 0,
+        return mlx4_cmd(dev, mailbox->dma, eq_num, 0,
                         MLX4_CMD_SW2HW_EQ, MLX4_CMD_TIME_CLASS_A,
                         MLX4_CMD_WRAPPED);
 }
@@ -554,7 +551,7 @@ static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
 static int mlx4_HW2SW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int eq_num)
 {
-        return mlx4_cmd_box(dev, dev->caps.function, mailbox->dma, eq_num,
+        return mlx4_cmd_box(dev, 0, mailbox->dma, eq_num,
                             0, MLX4_CMD_HW2SW_EQ, MLX4_CMD_TIME_CLASS_A,
                             MLX4_CMD_WRAPPED);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index a424a19280cc..8a21e10952ea 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -158,7 +158,6 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 
 #define QUERY_FUNC_CAP_FLAGS_OFFSET             0x0
 #define QUERY_FUNC_CAP_NUM_PORTS_OFFSET         0x1
-#define QUERY_FUNC_CAP_FUNCTION_OFFSET          0x3
 #define QUERY_FUNC_CAP_PF_BHVR_OFFSET           0x4
 #define QUERY_FUNC_CAP_QP_QUOTA_OFFSET          0x10
 #define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET          0x14
@@ -182,9 +181,6 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
                 field = 1 << 7; /* enable only ethernet interface */
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);
 
-                field = slave;
-                MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FUNCTION_OFFSET);
-
                 field = dev->caps.num_ports;
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
 
@@ -249,9 +245,6 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap)
                 goto out;
         }
 
-        MLX4_GET(field, outbox, QUERY_FUNC_CAP_FUNCTION_OFFSET);
-        func_cap->function = field;
-
         MLX4_GET(field, outbox, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
         func_cap->num_ports = field;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
index 119e0cc9fab3..e1a5fa56bcbc 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.h
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.h
@@ -119,7 +119,6 @@ struct mlx4_dev_cap {
 };
 
 struct mlx4_func_cap {
-        u8      function;
         u8      num_ports;
         u8      flags;
         u32     pf_context_behaviour;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 6bb62c580e2d..678558b502fc 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -108,7 +108,7 @@ static struct mlx4_profile default_profile = {
         .num_cq         = 1 << 16,
         .num_mcg        = 1 << 13,
         .num_mpt        = 1 << 19,
-        .num_mtt        = 1 << 20,
+        .num_mtt        = 1 << 20, /* It is really num mtt segements */
 };
 
 static int log_num_mac = 7;
@@ -471,7 +471,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 return -ENOSYS;
         }
 
-        dev->caps.function              = func_cap.function;
         dev->caps.num_ports             = func_cap.num_ports;
         dev->caps.num_qps               = func_cap.qp_quota;
         dev->caps.num_srqs              = func_cap.srq_quota;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index a80121a2b519..c92269f8c057 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -388,9 +388,8 @@ struct mlx4_slave_eqe {
 };
 
 struct mlx4_slave_event_eq_info {
-        u32 eqn;
+        int eqn;
         u16 token;
-        u64 event_type;
 };
 
 struct mlx4_profile {
@@ -449,6 +448,8 @@ struct mlx4_steer_index {
         struct list_head duplicates;
 };
 
+#define MLX4_EVENT_TYPES_NUM 64
+
 struct mlx4_slave_state {
         u8 comm_toggle;
         u8 last_cmd;
@@ -461,7 +462,8 @@ struct mlx4_slave_state {
         struct mlx4_slave_eqe eq[MLX4_MFUNC_MAX_EQES];
         struct list_head mcast_filters[MLX4_MAX_PORTS + 1];
         struct mlx4_vlan_fltr *vlan_filter[MLX4_MAX_PORTS + 1];
-        struct mlx4_slave_event_eq_info event_eq;
+        /* event type to eq number lookup */
+        struct mlx4_slave_event_eq_info event_eq[MLX4_EVENT_TYPES_NUM];
         u16 eq_pi;
         u16 eq_ci;
         spinlock_t lock;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index f2a8e65f5f88..35f08840813c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -325,11 +325,11 @@ struct mlx4_en_port_profile {
         u8 rx_ppp;
         u8 tx_pause;
         u8 tx_ppp;
+        int rss_rings;
 };
 
 struct mlx4_en_profile {
         int rss_xor;
-        int tcp_rss;
         int udp_rss;
         u8 rss_mask;
         u32 active_ports;
@@ -476,6 +476,7 @@ struct mlx4_en_priv {
         struct mlx4_en_perf_stats pstats;
         struct mlx4_en_pkt_stats pkstats;
         struct mlx4_en_port_stats port_stats;
+        u64 stats_bitmap;
         char *mc_addrs;
         int mc_addrs_cnt;
         struct mlx4_en_stat_out_mbox hw_stats;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 01df5567e16e..8deeef98280c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -291,7 +291,7 @@ static u32 key_to_hw_index(u32 key)
 static int mlx4_SW2HW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                           int mpt_index)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function , mpt_index,
+        return mlx4_cmd(dev, mailbox->dma, mpt_index,
                         0, MLX4_CMD_SW2HW_MPT, MLX4_CMD_TIME_CLASS_B,
                         MLX4_CMD_WRAPPED);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index 5c9a54df17ab..db4746d0dca7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -52,8 +52,7 @@ int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn)
         *pdn = mlx4_bitmap_alloc(&priv->pd_bitmap);
         if (*pdn == -1)
                 return -ENOMEM;
-        if (mlx4_is_mfunc(dev))
-                *pdn |= (dev->caps.function + 1) << NOT_MASKED_PD_BITS;
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_pd_alloc);
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 88b52e547524..f44ae555bf43 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -44,6 +44,11 @@
 #define MLX4_VLAN_VALID         (1u << 31)
 #define MLX4_VLAN_MASK          0xfff
 
+#define MLX4_STATS_TRAFFIC_COUNTERS_MASK        0xfULL
+#define MLX4_STATS_TRAFFIC_DROPS_MASK           0xc0ULL
+#define MLX4_STATS_ERROR_COUNTERS_MASK          0x1ffc30ULL
+#define MLX4_STATS_PORT_COUNTERS_MASK           0x1fe00000ULL
+
 void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table)
 {
         int i;
@@ -898,6 +903,24 @@ int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave,
                                 struct mlx4_cmd_mailbox *outbox,
                                 struct mlx4_cmd_info *cmd)
 {
+        if (slave != dev->caps.function)
+                return 0;
         return mlx4_common_dump_eth_stats(dev, slave,
                                           vhcr->in_modifier, outbox);
 }
+
+void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap)
+{
+        if (!mlx4_is_mfunc(dev)) {
+                *stats_bitmap = 0;
+                return;
+        }
+
+        *stats_bitmap = (MLX4_STATS_TRAFFIC_COUNTERS_MASK |
+                         MLX4_STATS_TRAFFIC_DROPS_MASK |
+                         MLX4_STATS_PORT_COUNTERS_MASK);
+
+        if (mlx4_is_master(dev))
+                *stats_bitmap |= MLX4_STATS_ERROR_COUNTERS_MASK;
+}
+EXPORT_SYMBOL(mlx4_set_stats_bitmap);
diff --git a/drivers/net/ethernet/mellanox/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
index 66f91ca7a7c6..1129677daa62 100644
--- a/drivers/net/ethernet/mellanox/mlx4/profile.c
+++ b/drivers/net/ethernet/mellanox/mlx4/profile.c
@@ -110,7 +110,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
         profile[MLX4_RES_EQ].num      = min_t(unsigned, dev_cap->max_eqs, MAX_MSIX);
         profile[MLX4_RES_DMPT].num    = request->num_mpt;
         profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
-        profile[MLX4_RES_MTT].num     = request->num_mtt;
+        profile[MLX4_RES_MTT].num     = request->num_mtt * (1 << log_mtts_per_seg);
         profile[MLX4_RES_MCG].num     = request->num_mcg;
 
         for (i = 0; i < MLX4_RES_NUM; ++i) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index 6b03ac8b9002..738f950a1ce5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -162,7 +162,7 @@ static int __mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
         ((struct mlx4_qp_context *) (mailbox->buf + 8))->local_qpn =
                 cpu_to_be32(qp->qpn);
 
-        ret = mlx4_cmd(dev, mailbox->dma | dev->caps.function,
+        ret = mlx4_cmd(dev, mailbox->dma,
                        qp->qpn | (!!sqd_event << 31),
                        new_state == MLX4_QP_STATE_RST ? 2 : 0,
                        op[cur_state][new_state], MLX4_CMD_TIME_CLASS_C, native);
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index ed20751a057d..dcd819bfb2f0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -1561,11 +1561,6 @@ static int mr_get_mtt_size(struct mlx4_mpt_entry *mpt)
         return be32_to_cpu(mpt->mtt_sz);
 }
 
-static int mr_get_pdn(struct mlx4_mpt_entry *mpt)
-{
-        return be32_to_cpu(mpt->pd_flags) & 0xffffff;
-}
-
 static int qp_get_mtt_addr(struct mlx4_qp_context *qpc)
 {
         return be32_to_cpu(qpc->mtt_base_addr_l) & 0xfffffff8;
@@ -1602,16 +1597,6 @@ static int qp_get_mtt_size(struct mlx4_qp_context *qpc)
         return total_pages;
 }
 
-static int qp_get_pdn(struct mlx4_qp_context *qpc)
-{
-        return be32_to_cpu(qpc->pd) & 0xffffff;
-}
-
-static int pdn2slave(int pdn)
-{
-        return (pdn >> NOT_MASKED_PD_BITS) - 1;
-}
-
 static int check_mtt_range(struct mlx4_dev *dev, int slave, int start,
                            int size, struct res_mtt *mtt)
 {
@@ -1656,11 +1641,6 @@ int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,
                 mpt->mtt = mtt;
         }
 
-        if (pdn2slave(mr_get_pdn(inbox->buf)) != slave) {
-                err = -EPERM;
-                goto ex_put;
-        }
-
         err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
         if (err)
                 goto ex_put;
@@ -1792,11 +1772,6 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
         if (err)
                 goto ex_put_mtt;
 
-        if (pdn2slave(qp_get_pdn(qpc)) != slave) {
-                err = -EPERM;
-                goto ex_put_mtt;
-        }
-
         err = get_res(dev, slave, rcqn, RES_CQ, &rcq);
         if (err)
                 goto ex_put_mtt;
@@ -2048,10 +2023,10 @@ int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)
         if (!priv->mfunc.master.slave_state)
                 return -EINVAL;
 
-        event_eq = &priv->mfunc.master.slave_state[slave].event_eq;
+        event_eq = &priv->mfunc.master.slave_state[slave].event_eq[eqe->type];
 
         /* Create the event only if the slave is registered */
-        if ((event_eq->event_type & (1 << eqe->type)) == 0)
+        if (event_eq->eqn < 0)
                 return 0;
 
         mutex_lock(&priv->mfunc.master.gen_eqe_mutex[slave]);
@@ -2289,11 +2264,6 @@ ex_put:
         return err;
 }
 
-static int srq_get_pdn(struct mlx4_srq_context *srqc)
-{
-        return be32_to_cpu(srqc->pd) & 0xffffff;
-}
-
 static int srq_get_mtt_size(struct mlx4_srq_context *srqc)
 {
         int log_srq_size = (be32_to_cpu(srqc->state_logsize_srqn) >> 24) & 0xf;
@@ -2333,11 +2303,6 @@ int mlx4_SW2HW_SRQ_wrapper(struct mlx4_dev *dev, int slave,
         if (err)
                 goto ex_put_mtt;
 
-        if (pdn2slave(srq_get_pdn(srqc)) != slave) {
-                err = -EPERM;
-                goto ex_put_mtt;
-        }
-
         err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
         if (err)
                 goto ex_put_mtt;
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index 2823fffc6383..feda6c00829f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -67,7 +67,7 @@ void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type)
 static int mlx4_SW2HW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                           int srq_num)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function, srq_num, 0,
+        return mlx4_cmd(dev, mailbox->dma, srq_num, 0,
                         MLX4_CMD_SW2HW_SRQ, MLX4_CMD_TIME_CLASS_A,
                         MLX4_CMD_WRAPPED);
 }