forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/mlx4_core: Load higher level modules according to ports type

Browse source 
Mellanox ConnectX architecture is:  mlx4_core is the lower level
PCI driver which register on the PCI id, and protocol specific drivers
are depended on it: mlx4_en - for Ethernet and mlx4_ib for Infiniband.
NIC could have multiple ports which can change their type dynamically.
We use the request_module() call to load the relevant protocol driver
when needed: on loading time or at port type change event.

Signed-off-by: Eyal Perry <eyalpe@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eyal Perry 2013-10-15 16:55:24 +02:00 • committed by David S. Miller
commit b046ffe54d
1 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
drivers/net/ethernet/mellanox/mlx4/main.c
View file

@ -42,6 +42,7 @@
#include <linux/io-mapping.h> #include <linux/io-mapping.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/kmod.h>
#include <linux/mlx4/device.h> #include <linux/mlx4/device.h>
#include <linux/mlx4/doorbell.h> #include <linux/mlx4/doorbell.h>
@ -650,6 +651,27 @@ err_mem:
return err; return err;
} }
static void mlx4_request_modules(struct mlx4_dev *dev)
{
int port;
int has_ib_port = false;
int has_eth_port = false;
#define EN_DRV_NAME "mlx4_en"
#define IB_DRV_NAME "mlx4_ib"
for (port = 1; port <= dev->caps.num_ports; port++) {
if (dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)
has_ib_port = true;
else if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
has_eth_port = true;
}
if (has_ib_port)
request_module_nowait(IB_DRV_NAME);
if (has_eth_port)
request_module_nowait(EN_DRV_NAME);
}
/* /*
* Change the port configuration of the device. * Change the port configuration of the device.
* Every user of this function must hold the port mutex. * Every user of this function must hold the port mutex.
@ -681,6 +703,11 @@ int mlx4_change_port_types(struct mlx4_dev *dev,
} }
mlx4_set_port_mask(dev); mlx4_set_port_mask(dev);
err = mlx4_register_device(dev); err = mlx4_register_device(dev);
if (err) {
mlx4_err(dev, "Failed to register device\n");
goto out;
}
mlx4_request_modules(dev);
} }
out: out:
@ -2305,6 +2332,8 @@ slave_start:
if (err) if (err)
goto err_port; goto err_port;
mlx4_request_modules(dev);
mlx4_sense_init(dev); mlx4_sense_init(dev);
mlx4_start_sense(dev); mlx4_start_sense(dev);