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

Commit d5beb7f2 authored by Noa Osherovich's avatar Noa Osherovich Committed by Leon Romanovsky
Browse files

net/mlx5: Separate query_port_proto_oper for IB and EN 



Replaced mlx5_query_port_proto_oper with separate functions per link
type. The functions should take different arguments so no point in
trying to unite them.

Signed-off-by: default avatarNoa Osherovich <noaos@mellanox.com>
Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 8cca30a7

drivers/infiniband/hw/mlx5/main.c

+1 −2
Original line number Diff line number Diff line
@@ -748,8 +748,7 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, 
				     &props->active_width);

	if (err)

		goto out;

	err = mlx5_query_port_proto_oper(mdev, &props->active_speed, MLX5_PTYS_IB,

					 port);

	err = mlx5_query_port_ib_proto_oper(mdev, &props->active_speed, port);

	if (err)

		goto out;

drivers/net/ethernet/mellanox/mlx5/core/port.c

+23 −9
Original line number Diff line number Diff line
@@ -175,25 +175,39 @@ int mlx5_query_port_link_width_oper(struct mlx5_core_dev *dev, 
}

EXPORT_SYMBOL_GPL(mlx5_query_port_link_width_oper);



int mlx5_query_port_proto_oper(struct mlx5_core_dev *dev,

			       u8 *proto_oper, int proto_mask,

			       u8 local_port)

int mlx5_query_port_eth_proto_oper(struct mlx5_core_dev *dev,

				   u32 *proto_oper, u8 local_port)

{

	u32 out[MLX5_ST_SZ_DW(ptys_reg)];

	int err;



	err = mlx5_query_port_ptys(dev, out, sizeof(out), proto_mask, local_port);

	err = mlx5_query_port_ptys(dev, out, sizeof(out), MLX5_PTYS_EN,

				   local_port);

	if (err)

		return err;



	if (proto_mask == MLX5_PTYS_EN)

	*proto_oper = MLX5_GET(ptys_reg, out, eth_proto_oper);

	else



	return 0;

}

EXPORT_SYMBOL(mlx5_query_port_eth_proto_oper);



int mlx5_query_port_ib_proto_oper(struct mlx5_core_dev *dev,

				  u8 *proto_oper, u8 local_port)

{

	u32 out[MLX5_ST_SZ_DW(ptys_reg)];

	int err;



	err = mlx5_query_port_ptys(dev, out, sizeof(out), MLX5_PTYS_IB,

				   local_port);

	if (err)

		return err;



	*proto_oper = MLX5_GET(ptys_reg, out, ib_proto_oper);



	return 0;

}

EXPORT_SYMBOL_GPL(mlx5_query_port_proto_oper);

EXPORT_SYMBOL(mlx5_query_port_ib_proto_oper);



int mlx5_set_port_ptys(struct mlx5_core_dev *dev, bool an_disable,

		       u32 proto_admin, int proto_mask)

include/linux/mlx5/port.h

+4 −3
Original line number Diff line number Diff line
@@ -103,9 +103,10 @@ int mlx5_query_port_proto_admin(struct mlx5_core_dev *dev, 
				u32 *proto_admin, int proto_mask);

int mlx5_query_port_link_width_oper(struct mlx5_core_dev *dev,

				    u8 *link_width_oper, u8 local_port);

int mlx5_query_port_proto_oper(struct mlx5_core_dev *dev,

			       u8 *proto_oper, int proto_mask,

			       u8 local_port);

int mlx5_query_port_ib_proto_oper(struct mlx5_core_dev *dev,

				  u8 *proto_oper, u8 local_port);

int mlx5_query_port_eth_proto_oper(struct mlx5_core_dev *dev,

				   u32 *proto_oper, u8 local_port);

int mlx5_set_port_ptys(struct mlx5_core_dev *dev, bool an_disable,

		       u32 proto_admin, int proto_mask);

void mlx5_toggle_port_link(struct mlx5_core_dev *dev);