Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79857cd3 authored by Moni Shoua's avatar Moni Shoua Committed by Doug Ledford
Browse files

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: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 238fdf48

drivers/net/ethernet/mellanox/mlx4/en_main.c

+21 −15
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/mellanox/mlx4/intf.c

+3 −0
Original line number Diff line number Diff line
@@ -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)

include/linux/mlx4/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -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;