net/mlx4: Postpone the registration of net_device

The mlx4 network driver was registered in the context of the 'add'
function of the core driver (called when HW should be registered).
This makes the netdev event NETDEV_REGISTER to be sent in a context
where the answer to get_protocol_dev() callback returns NULL. This may
be confusing to listeners of netdev events.
This patch is a preparation to the patch that implements the
get_netdev() callback in the IB/mlx4 driver.

Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 913b716ed2e141189a978af29ab5d54c1b606387..a946e4bf71d2a18cce11bb497ec9b737653ae652 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -224,6 +224,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;
@@ -297,21 +317,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 +340,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)

diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index 0d80aed5904371c2a2358a99618e7a2328b50c09..0472941af82033852106e5ab3dfc2399ca82cdaa 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -63,8 +63,11 @@ static void mlx4_add_device(struct mlx4_interface *intf, struct mlx4_priv *priv)
                spin_lock_irq(&priv->ctx_lock);
                list_add_tail(&dev_ctx->list, &priv->ctx_list);
                spin_unlock_irq(&priv->ctx_lock);
+               if (intf->activate)
+                       intf->activate(&priv->dev, dev_ctx->context);
        } else
                kfree(dev_ctx);
+
 }
 
 static void mlx4_remove_device(struct mlx4_interface *intf, struct mlx4_priv *priv)

diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index 9553a73d2049e425bc72bf4fbb7c151ffc9bbe43..5a06d969338e66c01863053212f33042fb36eca5 100644 (file)
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -59,6 +59,7 @@ struct mlx4_interface {
        void                    (*event) (struct mlx4_dev *dev, void *context,
                                          enum mlx4_dev_event event, unsigned long param);
        void *                  (*get_dev)(struct mlx4_dev *dev, void *context, u8 port);
+       void                    (*activate)(struct mlx4_dev *dev, void *context);
        struct list_head        list;
        enum mlx4_protocol      protocol;
        int                     flags;