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

Commit b046ffe5 authored by Eyal Perry's avatar Eyal Perry Committed by David S. Miller
Browse files

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



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: default avatarEyal Perry <eyalpe@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39e210fd

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

+29 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/io-mapping.h>

#include <linux/delay.h>

#include <linux/netdevice.h>

#include <linux/kmod.h>



#include <linux/mlx4/device.h>

#include <linux/mlx4/doorbell.h>
@@ -650,6 +651,27 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
	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.

 * 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);

		err = mlx4_register_device(dev);

		if (err) {

			mlx4_err(dev, "Failed to register device\n");

			goto out;

		}

		mlx4_request_modules(dev);

	}



out:
@@ -2305,6 +2332,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data) 
	if (err)

		goto err_port;



	mlx4_request_modules(dev);



	mlx4_sense_init(dev);

	mlx4_start_sense(dev);