1 files changed, 45 insertions, 12 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 7e4b1720c3d1..7d4fb7bf2593 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -130,7 +130,7 @@ static enum mlx4_net_trans_rule_id mlx4_ip_proto_to_trans_rule_id(u8 ip_proto)
         case IPPROTO_TCP:
                 return MLX4_NET_TRANS_RULE_ID_TCP;
         default:
-                return -EPROTONOSUPPORT;
+                return MLX4_NET_TRANS_RULE_NUM;
         }
 };
 
@@ -177,7 +177,7 @@ static void mlx4_en_filter_work(struct work_struct *work)
         int rc;
         __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
 
-        if (spec_tcp_udp.id < 0) {
+        if (spec_tcp_udp.id >= MLX4_NET_TRANS_RULE_NUM) {
                 en_warn(priv, "RFS: ignoring unsupported ip protocol (%d)\n",
                         filter->ip_proto);
                 goto ignore;
@@ -770,11 +770,12 @@ static int mlx4_en_do_set_mac(struct mlx4_en_priv *priv)
                                           priv->dev->dev_addr, priv->prev_mac);
                 if (err)
                         en_err(priv, "Failed changing HW MAC address\n");
-                memcpy(priv->prev_mac, priv->dev->dev_addr,
-                       sizeof(priv->prev_mac));
         } else
                 en_dbg(HW, priv, "Port is down while registering mac, exiting...\n");
 
+        memcpy(priv->prev_mac, priv->dev->dev_addr,
+               sizeof(priv->prev_mac));
+
         return err;
 }
 
@@ -788,9 +789,8 @@ static int mlx4_en_set_mac(struct net_device *dev, void *addr)
         if (!is_valid_ether_addr(saddr->sa_data))
                 return -EADDRNOTAVAIL;
 
-        memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);
-
         mutex_lock(&mdev->state_lock);
+        memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);
         err = mlx4_en_do_set_mac(priv);
         mutex_unlock(&mdev->state_lock);
 
@@ -1526,6 +1526,27 @@ static void mlx4_en_linkstate(struct work_struct *work)
         mutex_unlock(&mdev->state_lock);
 }
 
+static int mlx4_en_init_affinity_hint(struct mlx4_en_priv *priv, int ring_idx)
+{
+        struct mlx4_en_rx_ring *ring = priv->rx_ring[ring_idx];
+        int numa_node = priv->mdev->dev->numa_node;
+        int ret = 0;
+
+        if (!zalloc_cpumask_var(&ring->affinity_mask, GFP_KERNEL))
+                return -ENOMEM;
+
+        ret = cpumask_set_cpu_local_first(ring_idx, numa_node,
+                                          ring->affinity_mask);
+        if (ret)
+                free_cpumask_var(ring->affinity_mask);
+
+        return ret;
+}
+
+static void mlx4_en_free_affinity_hint(struct mlx4_en_priv *priv, int ring_idx)
+{
+        free_cpumask_var(priv->rx_ring[ring_idx]->affinity_mask);
+}
 
 int mlx4_en_start_port(struct net_device *dev)
 {
@@ -1567,17 +1588,25 @@ int mlx4_en_start_port(struct net_device *dev)
 
                 mlx4_en_cq_init_lock(cq);
 
+                err = mlx4_en_init_affinity_hint(priv, i);
+                if (err) {
+                        en_err(priv, "Failed preparing IRQ affinity hint\n");
+                        goto cq_err;
+                }
+
                 err = mlx4_en_activate_cq(priv, cq, i);
                 if (err) {
                         en_err(priv, "Failed activating Rx CQ\n");
+                        mlx4_en_free_affinity_hint(priv, i);
                         goto cq_err;
                 }
                 for (j = 0; j < cq->size; j++)
                         cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK;
                 err = mlx4_en_set_cq_moder(priv, cq);
                 if (err) {
-                        en_err(priv, "Failed setting cq moderation parameters");
+                        en_err(priv, "Failed setting cq moderation parameters\n");
                         mlx4_en_deactivate_cq(priv, cq);
+                        mlx4_en_free_affinity_hint(priv, i);
                         goto cq_err;
                 }
                 mlx4_en_arm_cq(priv, cq);
@@ -1615,7 +1644,7 @@ int mlx4_en_start_port(struct net_device *dev)
                 }
                 err = mlx4_en_set_cq_moder(priv, cq);
                 if (err) {
-                        en_err(priv, "Failed setting cq moderation parameters");
+                        en_err(priv, "Failed setting cq moderation parameters\n");
                         mlx4_en_deactivate_cq(priv, cq);
                         goto tx_err;
                 }
@@ -1715,8 +1744,10 @@ rss_err:
 mac_err:
         mlx4_en_put_qp(priv);
 cq_err:
-        while (rx_index--)
+        while (rx_index--) {
                 mlx4_en_deactivate_cq(priv, priv->rx_cq[rx_index]);
+                mlx4_en_free_affinity_hint(priv, i);
+        }
         for (i = 0; i < priv->rx_ring_num; i++)
                 mlx4_en_deactivate_rx_ring(priv, priv->rx_ring[i]);
 
@@ -1847,6 +1878,8 @@ void mlx4_en_stop_port(struct net_device *dev, int detach)
                         msleep(1);
                 mlx4_en_deactivate_rx_ring(priv, priv->rx_ring[i]);
                 mlx4_en_deactivate_cq(priv, cq);
+
+                mlx4_en_free_affinity_hint(priv, i);
         }
 }
 
@@ -2539,7 +2572,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         netif_set_real_num_tx_queues(dev, priv->tx_ring_num);
         netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
 
-        SET_ETHTOOL_OPS(dev, &mlx4_en_ethtool_ops);
+        dev->ethtool_ops = &mlx4_en_ethtool_ops;
 
         /*
          * Set driver features
@@ -2594,8 +2627,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                                     prof->tx_pause, prof->tx_ppp,
                                     prof->rx_pause, prof->rx_ppp);
         if (err) {
-                en_err(priv, "Failed setting port general configurations "
-                       "for port %d, with error %d\n", priv->port, err);
+                en_err(priv, "Failed setting port general configurations for port %d, with error %d\n",
+                       priv->port, err);
                 goto out;
         }