mlxsw: core: Extend driver ops by remove selected ports op

In case of line card implementation, the core has to have a way to
remove relevant ports manually. Extend the Spectrum driver ops by an op
that implements port removal of selected ports upon request.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 5e1855f752d016724a33eeb3a8625e332d4dbd6b..9b5c2c60b9aadc723846ac428da1ecfdf29cbb67 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -3143,6 +3143,15 @@ bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u16 local_port)
 }
 EXPORT_SYMBOL(mlxsw_core_port_is_xm);
 
+void mlxsw_core_ports_remove_selected(struct mlxsw_core *mlxsw_core,
+                                     bool (*selector)(void *priv, u16 local_port),
+                                     void *priv)
+{
+       if (WARN_ON_ONCE(!mlxsw_core->driver->ports_remove_selected))
+               return;
+       mlxsw_core->driver->ports_remove_selected(mlxsw_core, selector, priv);
+}
+
 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 7d6f8f3bcd93a5c36efb43cbcbcebd92ec005019..865252e97e14e98326032c537512c220ce5776ca 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -258,6 +258,10 @@ struct devlink_port *
 mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,
                                 u16 local_port);
 bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u16 local_port);
+void mlxsw_core_ports_remove_selected(struct mlxsw_core *mlxsw_core,
+                                     bool (*selector)(void *priv,
+                                                      u16 local_port),
+                                     void *priv);
 struct mlxsw_env *mlxsw_core_env(const struct mlxsw_core *mlxsw_core);
 
 int mlxsw_core_schedule_dw(struct delayed_work *dwork, unsigned long delay);
@@ -331,6 +335,10 @@ struct mlxsw_driver {
                          unsigned int count, struct netlink_ext_ack *extack);
        int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u16 local_port,
                            struct netlink_ext_ack *extack);
+       void (*ports_remove_selected)(struct mlxsw_core *mlxsw_core,
+                                     bool (*selector)(void *priv,
+                                                      u16 local_port),
+                                     void *priv);
        int (*sb_pool_get)(struct mlxsw_core *mlxsw_core,
                           unsigned int sb_index, u16 pool_index,
                           struct devlink_sb_pool_info *pool_info);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index b4e064bd77bc46089d3daf7b646ae10b74a77112..c3b9e244e8881f01ab2f64fb681005154e404333 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1999,6 +1999,20 @@ static void mlxsw_sp_ports_remove(struct mlxsw_sp *mlxsw_sp)
        mlxsw_sp->ports = NULL;
 }
 
+static void
+mlxsw_sp_ports_remove_selected(struct mlxsw_core *mlxsw_core,
+                              bool (*selector)(void *priv, u16 local_port),
+                              void *priv)
+{
+       struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);
+       unsigned int max_ports = mlxsw_core_max_ports(mlxsw_core);
+       int i;
+
+       for (i = 1; i < max_ports; i++)
+               if (mlxsw_sp_port_created(mlxsw_sp, i) && selector(priv, i))
+                       mlxsw_sp_port_remove(mlxsw_sp, i);
+}
+
 static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)
 {
        unsigned int max_ports = mlxsw_core_max_ports(mlxsw_sp->core);
@@ -3785,6 +3799,7 @@ static struct mlxsw_driver mlxsw_sp2_driver = {
        .fini                           = mlxsw_sp_fini,
        .port_split                     = mlxsw_sp_port_split,
        .port_unsplit                   = mlxsw_sp_port_unsplit,
+       .ports_remove_selected          = mlxsw_sp_ports_remove_selected,
        .sb_pool_get                    = mlxsw_sp_sb_pool_get,
        .sb_pool_set                    = mlxsw_sp_sb_pool_set,
        .sb_port_pool_get               = mlxsw_sp_sb_port_pool_get,
@@ -3822,6 +3837,7 @@ static struct mlxsw_driver mlxsw_sp3_driver = {
        .fini                           = mlxsw_sp_fini,
        .port_split                     = mlxsw_sp_port_split,
        .port_unsplit                   = mlxsw_sp_port_unsplit,
+       .ports_remove_selected          = mlxsw_sp_ports_remove_selected,
        .sb_pool_get                    = mlxsw_sp_sb_pool_get,
        .sb_pool_set                    = mlxsw_sp_sb_pool_set,
        .sb_port_pool_get               = mlxsw_sp_sb_port_pool_get,
@@ -3857,6 +3873,7 @@ static struct mlxsw_driver mlxsw_sp4_driver = {
        .fini                           = mlxsw_sp_fini,
        .port_split                     = mlxsw_sp_port_split,
        .port_unsplit                   = mlxsw_sp_port_unsplit,
+       .ports_remove_selected          = mlxsw_sp_ports_remove_selected,
        .sb_pool_get                    = mlxsw_sp_sb_pool_get,
        .sb_pool_set                    = mlxsw_sp_sb_pool_set,
        .sb_port_pool_get               = mlxsw_sp_sb_port_pool_get,