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

Commit 7ff93f8b authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by Roland Dreier
Browse files

mlx4_core: Multiple port type support 



Multi-protocol adapters support different port types.  Each consumer
of mlx4_core queries for supported port types; in particular mlx4_ib
can no longer assume that all physical ports belong to it.  Port type
is configured through a sysfs interface.  When the type of a port is
changed, all mlx4 interfaces are unregistered, and then registered
again with the new port types.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 2a2336f8

drivers/infiniband/hw/mlx4/mad.c

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ int mlx4_ib_mad_init(struct mlx4_ib_dev *dev) 
	int p, q;

	int ret;



	for (p = 0; p < dev->dev->caps.num_ports; ++p)

	for (p = 0; p < dev->num_ports; ++p)

		for (q = 0; q <= 1; ++q) {

			agent = ib_register_mad_agent(&dev->ib_dev, p + 1,

						      q ? IB_QPT_GSI : IB_QPT_SMI,
@@ -314,7 +314,7 @@ int mlx4_ib_mad_init(struct mlx4_ib_dev *dev) 
	return 0;



err:

	for (p = 0; p < dev->dev->caps.num_ports; ++p)

	for (p = 0; p < dev->num_ports; ++p)

		for (q = 0; q <= 1; ++q)

			if (dev->send_agent[p][q])

				ib_unregister_mad_agent(dev->send_agent[p][q]);
@@ -327,7 +327,7 @@ void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev) 
	struct ib_mad_agent *agent;

	int p, q;



	for (p = 0; p < dev->dev->caps.num_ports; ++p) {

	for (p = 0; p < dev->num_ports; ++p) {

		for (q = 0; q <= 1; ++q) {

			agent = dev->send_agent[p][q];

			dev->send_agent[p][q] = NULL;

drivers/infiniband/hw/mlx4/main.c

+9 −2
Original line number Diff line number Diff line
@@ -574,7 +574,10 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	ibdev->ib_dev.owner		= THIS_MODULE;

	ibdev->ib_dev.node_type		= RDMA_NODE_IB_CA;

	ibdev->ib_dev.local_dma_lkey	= dev->caps.reserved_lkey;

	ibdev->ib_dev.phys_port_cnt	= dev->caps.num_ports;

	ibdev->num_ports = 0;

	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)

		ibdev->num_ports++;

	ibdev->ib_dev.phys_port_cnt     = ibdev->num_ports;

	ibdev->ib_dev.num_comp_vectors	= 1;

	ibdev->ib_dev.dma_device	= &dev->pdev->dev;
@@ -691,7 +694,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) 
	struct mlx4_ib_dev *ibdev = ibdev_ptr;

	int p;



	for (p = 1; p <= dev->caps.num_ports; ++p)

	for (p = 1; p <= ibdev->num_ports; ++p)

		mlx4_CLOSE_PORT(dev, p);



	mlx4_ib_mad_cleanup(ibdev);
@@ -706,6 +709,10 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr, 
			  enum mlx4_dev_event event, int port)

{

	struct ib_event ibev;

	struct mlx4_ib_dev *ibdev = to_mdev((struct ib_device *) ibdev_ptr);



	if (port > ibdev->num_ports)

		return;



	switch (event) {

	case MLX4_DEV_EVENT_PORT_UP:

drivers/infiniband/hw/mlx4/mlx4_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ struct mlx4_ib_ah { 
struct mlx4_ib_dev {

	struct ib_device	ib_dev;

	struct mlx4_dev	       *dev;

	int			num_ports;

	void __iomem	       *uar_map;



	struct mlx4_uar		priv_uar;

drivers/net/mlx4/fw.c

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags) 
		[ 8] = "P_Key violation counter",

		[ 9] = "Q_Key violation counter",

		[10] = "VMM",

		[12] = "DPDP",

		[16] = "MW support",

		[17] = "APM support",

		[18] = "Atomic ops support",
@@ -354,6 +355,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
			dev_cap->max_pkeys[i]	   = 1 << (field & 0xf);

		}

	} else {

#define QUERY_PORT_SUPPORTED_TYPE_OFFSET	0x00

#define QUERY_PORT_MTU_OFFSET			0x01

#define QUERY_PORT_ETH_MTU_OFFSET		0x02

#define QUERY_PORT_WIDTH_OFFSET			0x06
@@ -368,6 +370,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
			if (err)

				goto out;



			MLX4_GET(field, outbox, QUERY_PORT_SUPPORTED_TYPE_OFFSET);

			dev_cap->supported_port_types[i] = field & 3;

			MLX4_GET(field, outbox, QUERY_PORT_MTU_OFFSET);

			dev_cap->ib_mtu[i]	   = field & 0xf;

			MLX4_GET(field, outbox, QUERY_PORT_WIDTH_OFFSET);

drivers/net/mlx4/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct mlx4_dev_cap { 
	u32 reserved_lkey;

	u64 max_icm_sz;

	int max_gso_sz;

	u8  supported_port_types[MLX4_MAX_PORTS + 1];

	u8  log_max_macs[MLX4_MAX_PORTS + 1];

	u8  log_max_vlans[MLX4_MAX_PORTS + 1];

};