mlxsw: spectrum_span: Wrap buffer change in a function

The code that adjusts the egress buffer size is not symmetric at the
moment. The update is done via a call to
mlxsw_sp_span_port_buffer_update(), but the disablement is done inline
by invoking the write to SBIB register directly.

Wrap the disablement code in mlxsw_sp_span_port_buffer_disable().

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Suggested-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
index c52f79a97f36a0d0f5d0136d400e1e6ee5cc200b..2b9d8ce93b133ca8f05fe18fa43456dd351d610b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
@@ -803,6 +803,15 @@ mlxsw_sp_span_port_buffer_update(struct mlxsw_sp_port *mlxsw_sp_port, u16 mtu)
        return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sbib), sbib_pl);
 }
 
+static void mlxsw_sp_span_port_buffer_disable(struct mlxsw_sp *mlxsw_sp,
+                                             u8 local_port)
+{
+       char sbib_pl[MLXSW_REG_SBIB_LEN];
+
+       mlxsw_reg_sbib_pack(sbib_pl, local_port, 0);
+       mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sbib), sbib_pl);
+}
+
 int mlxsw_sp_span_port_mtu_update(struct mlxsw_sp_port *port, u16 mtu)
 {
        /* If port is egress mirrored, the shared buffer size should be
@@ -1154,15 +1163,13 @@ mlxsw_sp_span_analyzed_port_destroy(struct mlxsw_sp_span *span,
                                    analyzed_port)
 {
        struct mlxsw_sp *mlxsw_sp = span->mlxsw_sp;
-       char sbib_pl[MLXSW_REG_SBIB_LEN];
 
        /* Remove egress mirror buffer now that port is no longer analyzed
         * at egress.
         */
-       if (!analyzed_port->ingress) {
-               mlxsw_reg_sbib_pack(sbib_pl, analyzed_port->local_port, 0);
-               mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sbib), sbib_pl);
-       }
+       if (!analyzed_port->ingress)
+               mlxsw_sp_span_port_buffer_disable(mlxsw_sp,
+                                                 analyzed_port->local_port);
 
        list_del(&analyzed_port->list);
        kfree(analyzed_port);