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

Commit ab6dc30d authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by David S. Miller
Browse files

mlx4: Sensing link type at device initialization 



When bringing the port up, performing a SENSE_PORT command
To try and check to which physical link type (IB or Ethernet) the physical
port is connected.
In case there is no valid link partner, the port will come up as its
supported default.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b86a58f

drivers/net/mlx4/main.c

+5 −0
Original line number Diff line number Diff line
@@ -944,6 +944,10 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) 
	}



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

		enum mlx4_port_type port_type = 0;

		mlx4_SENSE_PORT(dev, port, &port_type);

		if (port_type)

			dev->caps.port_type[port] = port_type;

		ib_port_default_caps = 0;

		err = mlx4_get_port_ib_caps(dev, port, &ib_port_default_caps);

		if (err)
@@ -958,6 +962,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) 
			goto err_mcg_table_free;

		}

	}

	mlx4_set_port_mask(dev);



	return 0;

drivers/net/mlx4/mlx4.h

+2 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type); 


void mlx4_handle_catas_err(struct mlx4_dev *dev);



int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,

		    enum mlx4_port_type *type);

void mlx4_do_sense_ports(struct mlx4_dev *dev,

			 enum mlx4_port_type *stype,

			 enum mlx4_port_type *defaults);

drivers/net/mlx4/sense.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#include "mlx4.h"



static int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,

int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,

		    enum mlx4_port_type *type)

{

	u64 out_param;