mlxsw: spectrum_span: Put buffsize update code into helper function (31c25b94) · Commits · 戴 / test

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

+15 −22

Original line number	Diff line number	Diff line
		@@ -754,26 +754,25 @@ static int mlxsw_sp_span_mtu_to_buffsize(const struct mlxsw_sp *mlxsw_sp,
		return mlxsw_sp_bytes_cells(mlxsw_sp, mtu * 5 / 2) + 1;
		}

		int mlxsw_sp_span_port_mtu_update(struct mlxsw_sp_port *port, u16 mtu)
		static int
		mlxsw_sp_span_port_buffsize_update(struct mlxsw_sp_port *mlxsw_sp_port, u16 mtu)
		{
		struct mlxsw_sp *mlxsw_sp = port->mlxsw_sp;
		struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
		char sbib_pl[MLXSW_REG_SBIB_LEN];
		int err;
		u32 buffsize;

		buffsize = mlxsw_sp_span_mtu_to_buffsize(mlxsw_sp, mtu);
		mlxsw_reg_sbib_pack(sbib_pl, mlxsw_sp_port->local_port, buffsize);
		return 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
		* updated according to the mtu value
		*/
		if (mlxsw_sp_span_is_egress_mirror(port)) {
		u32 buffsize = mlxsw_sp_span_mtu_to_buffsize(mlxsw_sp, mtu);

		mlxsw_reg_sbib_pack(sbib_pl, port->local_port, buffsize);
		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sbib), sbib_pl);
		if (err) {
		netdev_err(port->dev, "Could not update shared buffer for mirroring\n");
		return err;
		}
		}

		if (mlxsw_sp_span_is_egress_mirror(port))
		return mlxsw_sp_span_port_buffsize_update(port, mtu);
		return 0;
		}

		@@ -836,16 +835,10 @@ mlxsw_sp_span_inspected_port_add(struct mlxsw_sp_port *port,

		/* if it is an egress SPAN, bind a shared buffer to it */
		if (type == MLXSW_SP_SPAN_EGRESS) {
		u32 buffsize = mlxsw_sp_span_mtu_to_buffsize(mlxsw_sp,
		port->dev->mtu);

		mlxsw_reg_sbib_pack(sbib_pl, port->local_port, buffsize);
		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sbib), sbib_pl);
		if (err) {
		netdev_err(port->dev, "Could not create shared buffer for mirroring\n");
		err = mlxsw_sp_span_port_buffsize_update(port, port->dev->mtu);
		if (err)
		return err;
		}
		}

		if (bind) {
		err = mlxsw_sp_span_inspected_port_bind(port, span_entry, type,

Admin message