Commit e9c97e0e authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_dcb: Convert mlxsw_sp_port_pg_prio_map() to hdroom code 



The new hdroom code has certain conventions: iteration over priorities is
done through a variable named `prio', configuration is not pushed unless it
is dirty, but a `force' flag can be used to override this, updated
configuration is written to port. Convert the function
mlxsw_sp_port_pg_prio_map() to use these conventions and rename
appropriately to fit in.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ec5e6b9

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

+19 −10
Original line number Diff line number Diff line
@@ -64,24 +64,33 @@ static int mlxsw_sp_port_ets_validate(struct mlxsw_sp_port *mlxsw_sp_port, 
	return 0;

}



static int mlxsw_sp_port_pg_prio_map(struct mlxsw_sp_port *mlxsw_sp_port,

				     u8 *prio_tc)

static int mlxsw_sp_hdroom_configure_priomap(struct mlxsw_sp_port *mlxsw_sp_port,

					     const struct mlxsw_sp_hdroom *hdroom, bool force)

{

	char pptb_pl[MLXSW_REG_PPTB_LEN];

	int i;

	bool dirty;

	int prio;

	int err;



	dirty = memcmp(&mlxsw_sp_port->hdroom->prios, &hdroom->prios, sizeof(hdroom->prios));

	if (!dirty && !force)

		return 0;



	mlxsw_reg_pptb_pack(pptb_pl, mlxsw_sp_port->local_port);

	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)

		mlxsw_reg_pptb_prio_to_buff_pack(pptb_pl, i, prio_tc[i]);

	for (prio = 0; prio < IEEE_8021QAZ_MAX_TCS; prio++)

		mlxsw_reg_pptb_prio_to_buff_pack(pptb_pl, prio, hdroom->prios.prio[prio].buf_idx);



	err = mlxsw_reg_write(mlxsw_sp_port->mlxsw_sp->core, MLXSW_REG(pptb), pptb_pl);

	if (err)

		return err;



	return mlxsw_reg_write(mlxsw_sp_port->mlxsw_sp->core, MLXSW_REG(pptb),

			       pptb_pl);

	mlxsw_sp_port->hdroom->prios = hdroom->prios;

	return 0;

}



static int mlxsw_sp_port_headroom_ets_set(struct mlxsw_sp_port *mlxsw_sp_port,

					  struct ieee_ets *ets)

{

	struct ieee_ets *my_ets = mlxsw_sp_port->dcb.ets;

	struct net_device *dev = mlxsw_sp_port->dev;

	struct mlxsw_sp_hdroom orig_hdroom;

	struct mlxsw_sp_hdroom tmp_hdroom;
@@ -115,7 +124,7 @@ static int mlxsw_sp_port_headroom_ets_set(struct mlxsw_sp_port *mlxsw_sp_port, 
		return err;

	}



	err = mlxsw_sp_port_pg_prio_map(mlxsw_sp_port, ets->prio_tc);

	err = mlxsw_sp_hdroom_configure_priomap(mlxsw_sp_port, &hdroom, false);

	if (err) {

		netdev_err(dev, "Failed to set PG-priority mapping\n");

		goto err_port_prio_pg_map;
@@ -130,7 +139,7 @@ static int mlxsw_sp_port_headroom_ets_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	return 0;



err_configure_buffers:

	mlxsw_sp_port_pg_prio_map(mlxsw_sp_port, my_ets->prio_tc);

	mlxsw_sp_hdroom_configure_priomap(mlxsw_sp_port, &tmp_hdroom, false);

err_port_prio_pg_map:

	mlxsw_sp_hdroom_configure(mlxsw_sp_port, &orig_hdroom);

	return err;