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: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index c67825a68a26249870623e6949ae65834accb267..685037e052af2d6a8255e28ef7f4f8740c0a6352 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -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;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index ec424d388eccb9cafd5016208878fed360a6d8a4..6558f9cde3d692ad56a01850c093fcea7630b5e3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index c010db2c9dba99566a2f06dcc70adebc5cbb5c6e..b34c44723f8b673105b37a0b1056564d295abb9f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index df8175cd44ab22d39b6e3d0d8105ff38b6993f53..516d6cb45c9fad4ba5c243111170cd680ce729bc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -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;