13 files changed, 49 insertions, 27 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index a49072b4fa52..e8c105164931 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -43,6 +43,7 @@
 #include <linux/semaphore.h>
 #include <rdma/ib_smi.h>
 #include <linux/delay.h>
+#include <linux/etherdevice.h>
 
 #include <asm/io.h>
 
@@ -2955,7 +2956,7 @@ static bool mlx4_valid_vf_state_change(struct mlx4_dev *dev, int port,
         return false;
 }
 
-int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac)
+int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u8 *mac)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_vport_state *s_info;
@@ -2964,13 +2965,22 @@ int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac)
         if (!mlx4_is_master(dev))
                 return -EPROTONOSUPPORT;
 
+        if (is_multicast_ether_addr(mac))
+                return -EINVAL;
+
         slave = mlx4_get_slave_indx(dev, vf);
         if (slave < 0)
                 return -EINVAL;
 
         port = mlx4_slaves_closest_port(dev, slave, port);
         s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
-        s_info->mac = mac;
+
+        if (s_info->spoofchk && is_zero_ether_addr(mac)) {
+                mlx4_info(dev, "MAC invalidation is not allowed when spoofchk is on\n");
+                return -EPERM;
+        }
+
+        s_info->mac = mlx4_mac_to_u64(mac);
         mlx4_info(dev, "default mac on vf %d port %d to %llX will take effect only after vf restart\n",
                   vf, port, s_info->mac);
         return 0;
@@ -3143,6 +3153,7 @@ int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting)
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_vport_state *s_info;
         int slave;
+        u8 mac[ETH_ALEN];
 
         if ((!mlx4_is_master(dev)) ||
             !(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FSM))
@@ -3154,6 +3165,13 @@ int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting)
 
         port = mlx4_slaves_closest_port(dev, slave, port);
         s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
+
+        mlx4_u64_to_mac(mac, s_info->mac);
+        if (setting && !is_valid_ether_addr(mac)) {
+                mlx4_info(dev, "Illegal MAC with spoofchk\n");
+                return -EPERM;
+        }
+
         s_info->spoofchk = setting;
 
         return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
index b04760a5034b..1dae8e40fb25 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
@@ -319,7 +319,7 @@ static int mlx4_en_ets_validate(struct mlx4_en_priv *priv, struct ieee_ets *ets)
                 default:
                         en_err(priv, "TC[%d]: Not supported TSA: %d\n",
                                         i, ets->tc_tsa[i]);
-                        return -ENOTSUPP;
+                        return -EOPNOTSUPP;
                 }
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index afe4444e5434..61420473fe5f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2485,12 +2485,8 @@ static int mlx4_en_set_vf_mac(struct net_device *dev, int queue, u8 *mac)
 {
         struct mlx4_en_priv *en_priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = en_priv->mdev;
-        u64 mac_u64 = mlx4_mac_to_u64(mac);
 
-        if (is_multicast_ether_addr(mac))
-                return -EINVAL;
-
-        return mlx4_set_vf_mac(mdev->dev, en_priv->port, queue, mac_u64);
+        return mlx4_set_vf_mac(mdev->dev, en_priv->port, queue, mac);
 }
 
 static int mlx4_en_set_vf_vlan(struct net_device *dev, int vf, u16 vlan, u8 qos,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index d85e6446f9d9..867292880c07 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -604,10 +604,10 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
                 dma_sync_single_for_cpu(priv->ddev, dma, frag_info->frag_size,
                                         DMA_FROM_DEVICE);
 
-                /* Save page reference in skb */
-                __skb_frag_set_page(&skb_frags_rx[nr], frags[nr].page);
-                skb_frag_size_set(&skb_frags_rx[nr], frag_info->frag_size);
-                skb_frags_rx[nr].page_offset = frags[nr].page_offset;
+                __skb_fill_page_desc(skb, nr, frags[nr].page,
+                                     frags[nr].page_offset,
+                                     frag_info->frag_size);
+
                 skb->truesize += frag_info->frag_stride;
                 frags[nr].page = NULL;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 39232b6a974f..07406cf2eacd 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -1249,9 +1249,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
                                         mlx4_warn(dev, "Failed adding irq rmap\n");
                         }
 #endif
-                        err = mlx4_create_eq(dev, dev->caps.num_cqs -
-                                                  dev->caps.reserved_cqs +
-                                                  MLX4_NUM_SPARE_EQE,
+                        err = mlx4_create_eq(dev, dev->quotas.cq +
+                                             MLX4_NUM_SPARE_EQE,
                                              (dev->flags & MLX4_FLAG_MSI_X) ?
                                              i + 1 - !!(i > MLX4_EQ_ASYNC) : 0,
                                              eq);
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 3fe885ce1902..37e84a59e751 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -2436,7 +2436,7 @@ int mlx4_config_dev_retrieval(struct mlx4_dev *dev,
 #define CONFIG_DEV_RX_CSUM_MODE_PORT2_BIT_OFFSET        4
 
         if (!(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_CONFIG_DEV))
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
 
         err = mlx4_CONFIG_DEV_get(dev, &config_dev);
         if (err)
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index 8258d08acd8c..e00f627331cb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -136,7 +136,7 @@ int mlx4_do_bond(struct mlx4_dev *dev, bool enable)
         LIST_HEAD(bond_list);
 
         if (!(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_PORT_REMAP))
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
 
         ret = mlx4_disable_rx_port_check(dev, enable);
         if (ret) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 15ef787e71ba..21377c315083 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -841,8 +841,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 return -EINVAL;
         }
 
-        mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;
-
         dev->caps.hca_core_clock = hca_param.hca_core_clock;
 
         memset(&dev_cap, 0, sizeof(dev_cap));
@@ -1447,7 +1445,7 @@ int mlx4_port_map_set(struct mlx4_dev *dev, struct mlx4_port_map *v2p)
         int err;
 
         if (!(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_PORT_REMAP))
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
 
         mutex_lock(&priv->bond_mutex);
 
@@ -1884,7 +1882,7 @@ int mlx4_get_internal_clock_params(struct mlx4_dev *dev,
         struct mlx4_priv *priv = mlx4_priv(dev);
 
         if (mlx4_is_slave(dev))
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
 
         if (!params)
                 return -EINVAL;
@@ -2384,7 +2382,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
 
         /* Query CONFIG_DEV parameters */
         err = mlx4_config_dev_retrieval(dev, &params);
-        if (err && err != -ENOTSUPP) {
+        if (err && err != -EOPNOTSUPP) {
                 mlx4_err(dev, "Failed to query CONFIG_DEV parameters\n");
         } else if (!err) {
                 dev->caps.rx_checksum_flags_port[1] = params.rx_csum_flags_port_1;
@@ -3503,6 +3501,8 @@ slave_start:
                         goto err_disable_msix;
         }
 
+        mlx4_init_quotas(dev);
+
         err = mlx4_setup_hca(dev);
         if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X) &&
             !mlx4_is_mfunc(dev)) {
@@ -3515,7 +3515,6 @@ slave_start:
         if (err)
                 goto err_steer;
 
-        mlx4_init_quotas(dev);
         /* When PF resources are ready arm its comm channel to enable
          * getting commands
          */
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 395b5463cfd9..db65f72879e9 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -823,7 +823,7 @@ int mlx4_mw_alloc(struct mlx4_dev *dev, u32 pd, enum mlx4_mw_type type,
              !(dev->caps.flags & MLX4_DEV_CAP_FLAG_MEM_WINDOW)) ||
              (type == MLX4_MW_TYPE_2 &&
              !(dev->caps.bmme_flags & MLX4_BMME_FLAG_TYPE_2_WIN)))
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
 
         index = mlx4_mpt_reserve(dev);
         if (index == -1)
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index d1cd9c32a9ae..2d6abd4662b1 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -447,7 +447,7 @@ int mlx4_update_qp(struct mlx4_dev *dev, u32 qpn,
                       & MLX4_DEV_CAP_FLAG2_UPDATE_QP_SRC_CHECK_LB)) {
                         mlx4_warn(dev,
                                   "Trying to set src check LB, but it isn't supported\n");
-                        err = -ENOTSUPP;
+                        err = -EOPNOTSUPP;
                         goto out;
                 }
                 pri_addr_path_mask |=
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 6fe9f76ae656..d8d5d161b8c7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -4297,7 +4297,7 @@ int mlx4_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave,
                   MLX4_DEV_CAP_FLAG2_UPDATE_QP_SRC_CHECK_LB)) {
                 mlx4_warn(dev, "Src check LB for slave %d isn't supported\n",
                           slave);
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
         }
 
         /* Just change the smac for the QP */
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 1f3568694a57..7b74afcbbab2 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -308,7 +308,7 @@ int mlx4_get_counter_stats(struct mlx4_dev *dev, int counter_index,
 int mlx4_get_vf_stats(struct mlx4_dev *dev, int port, int vf_idx,
                       struct ifla_vf_stats *vf_stats);
 u32 mlx4_comm_get_version(void);
-int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac);
+int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u8 *mac);
 int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan,
                      u8 qos, __be16 proto);
 int mlx4_set_vf_rate(struct mlx4_dev *dev, int port, int vf, int min_tx_rate,
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index bd0e7075ea6d..e965e5090d96 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -104,4 +104,14 @@ static inline u64 mlx4_mac_to_u64(u8 *addr)
         return mac;
 }
 
+static inline void mlx4_u64_to_mac(u8 *addr, u64 mac)
+{
+        int i;
+
+        for (i = ETH_ALEN; i > 0; i--) {
+                addr[i - 1] = mac && 0xFF;
+                mac >>= 8;
+        }
+}
+
 #endif /* MLX4_DRIVER_H */