These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / mellanox / mlx4 / en_main.c

diff --git a/kernel/drivers/net/ethernet/mellanox/mlx4/en_main.c b/kernel/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 913b716..e0ec280 100644 (file)
--- a/kernel/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/kernel/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -123,6 +123,28 @@ void mlx4_en_update_loopback_state(struct net_device *dev,
         */
        if (mlx4_is_mfunc(priv->mdev->dev) || priv->validate_loopback)
                priv->flags |= MLX4_EN_FLAG_ENABLE_HW_LOOPBACK;
+
+       mutex_lock(&priv->mdev->state_lock);
+       if (priv->mdev->dev->caps.flags2 &
+           MLX4_DEV_CAP_FLAG2_UPDATE_QP_SRC_CHECK_LB &&
+           priv->rss_map.indir_qp.qpn) {
+               int i;
+               int err = 0;
+               int loopback = !!(features & NETIF_F_LOOPBACK);
+
+               for (i = 0; i < priv->rx_ring_num; i++) {
+                       int ret;
+
+                       ret = mlx4_en_change_mcast_lb(priv,
+                                                     &priv->rss_map.qps[i],
+                                                     loopback);
+                       if (!err)
+                               err = ret;
+               }
+               if (err)
+                       mlx4_warn(priv->mdev, "failed to change mcast loopback\n");
+       }
+       mutex_unlock(&priv->mdev->state_lock);
 }
 
 static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
@@ -210,9 +232,6 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
                if (mdev->pndev[i])
                        mlx4_en_destroy_netdev(mdev->pndev[i]);
 
-       if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
-               mlx4_en_remove_timestamp(mdev);
-
        flush_workqueue(mdev->workqueue);
        destroy_workqueue(mdev->workqueue);
        (void) mlx4_mr_free(dev, &mdev->mr);
@@ -224,6 +243,26 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
        kfree(mdev);
 }
 
+static void mlx4_en_activate(struct mlx4_dev *dev, void *ctx)
+{
+       int i;
+       struct mlx4_en_dev *mdev = ctx;
+
+       /* Create a netdev for each port */
+       mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
+               mlx4_info(mdev, "Activating port:%d\n", i);
+               if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i]))
+                       mdev->pndev[i] = NULL;
+       }
+
+       /* register notifier */
+       mdev->nb.notifier_call = mlx4_en_netdev_event;
+       if (register_netdevice_notifier(&mdev->nb)) {
+               mdev->nb.notifier_call = NULL;
+               mlx4_err(mdev, "Failed to create notifier\n");
+       }
+}
+
 static void *mlx4_en_add(struct mlx4_dev *dev)
 {
        struct mlx4_en_dev *mdev;
@@ -278,10 +317,6 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
        mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
                mdev->port_cnt++;
 
-       /* Initialize time stamp mechanism */
-       if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)
-               mlx4_en_init_timestamp(mdev);
-
        /* Set default number of RX rings*/
        mlx4_en_set_num_rx_rings(mdev);
 
@@ -297,21 +332,6 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
        mutex_init(&mdev->state_lock);
        mdev->device_up = true;
 
-       /* Setup ports */
-
-       /* Create a netdev for each port */
-       mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
-               mlx4_info(mdev, "Activating port:%d\n", i);
-               if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i]))
-                       mdev->pndev[i] = NULL;
-       }
-       /* register notifier */
-       mdev->nb.notifier_call = mlx4_en_netdev_event;
-       if (register_netdevice_notifier(&mdev->nb)) {
-               mdev->nb.notifier_call = NULL;
-               mlx4_err(mdev, "Failed to create notifier\n");
-       }
-
        return mdev;
 
 err_mr:
@@ -335,6 +355,7 @@ static struct mlx4_interface mlx4_en_interface = {
        .event          = mlx4_en_event,
        .get_dev        = mlx4_en_get_netdev,
        .protocol       = MLX4_PROT_ETH,
+       .activate       = mlx4_en_activate,
 };
 
 static void mlx4_en_verify_params(void)