Commit 50779c33 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

mlxsw: Ignore ports that are connected to eXtended mezanine 



Use the info stored in the bus_info struct about the eXtended mezanine
connected ports and don't expose them.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2ea3f4c7

drivers/net/ethernet/mellanox/mlxsw/core.c

+12 −0
Original line number Diff line number Diff line
@@ -2856,6 +2856,18 @@ mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_port_devlink_port_get);



bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u8 local_port)

{

	const struct mlxsw_bus_info *bus_info = mlxsw_core->bus_info;

	int i;



	for (i = 0; i < bus_info->xm_local_ports_count; i++)

		if (bus_info->xm_local_ports[i] == local_port)

			return true;

	return false;

}

EXPORT_SYMBOL(mlxsw_core_port_is_xm);



struct mlxsw_env *mlxsw_core_env(const struct mlxsw_core *mlxsw_core)

{

	return mlxsw_core->env;

drivers/net/ethernet/mellanox/mlxsw/core.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, 
struct devlink_port *

mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,

				 u8 local_port);

bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u8 local_port);

struct mlxsw_env *mlxsw_core_env(const struct mlxsw_core *mlxsw_core);

bool mlxsw_core_is_initialized(const struct mlxsw_core *mlxsw_core);

int mlxsw_core_module_max_width(struct mlxsw_core *mlxsw_core, u8 module);

drivers/net/ethernet/mellanox/mlxsw/minimal.c

+2 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m) 


	/* Create port objects for each valid entry */

	for (i = 0; i < mlxsw_m->max_ports; i++) {

		if (mlxsw_m->module_to_port[i] > 0) {

		if (mlxsw_m->module_to_port[i] > 0 &&

		    !mlxsw_core_port_is_xm(mlxsw_m->core, i)) {

			err = mlxsw_m_port_create(mlxsw_m,

						  mlxsw_m->module_to_port[i],

						  i);

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+3 −0
Original line number Diff line number Diff line
@@ -1840,6 +1840,9 @@ static int mlxsw_sp_port_module_info_init(struct mlxsw_sp *mlxsw_sp) 
		return -ENOMEM;



	for (i = 1; i < max_ports; i++) {

		if (mlxsw_core_port_is_xm(mlxsw_sp->core, i))

			continue;



		err = mlxsw_sp_port_module_info_get(mlxsw_sp, i, &port_mapping);

		if (err)

			goto err_port_module_info_get;