Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ec4bce authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-dcb-fixes' 



Ido Schimmel says:

====================
mlxsw: DCB fixes

Patches 1 and 2 fix a problem in which PAUSE frames settings are wrongly
overridden when ieee_setpfc() gets called.

Patch 3 adds a missing rollback in port's creation error path.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3b3bf80b 4de34eb5

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

+1 −0
Original line number Diff line number Diff line
@@ -2220,6 +2220,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
err_core_port_init:

	unregister_netdev(dev);

err_register_netdev:

	mlxsw_sp_port_dcb_fini(mlxsw_sp_port);

err_port_dcb_init:

err_port_ets_init:

err_port_buffers_init:

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

+6 −4
Original line number Diff line number Diff line
@@ -341,6 +341,8 @@ static int mlxsw_sp_port_pfc_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	char pfcc_pl[MLXSW_REG_PFCC_LEN];



	mlxsw_reg_pfcc_pack(pfcc_pl, mlxsw_sp_port->local_port);

	mlxsw_reg_pfcc_pprx_set(pfcc_pl, mlxsw_sp_port->link.rx_pause);

	mlxsw_reg_pfcc_pptx_set(pfcc_pl, mlxsw_sp_port->link.tx_pause);

	mlxsw_reg_pfcc_prio_pack(pfcc_pl, pfc->pfc_en);



	return mlxsw_reg_write(mlxsw_sp_port->mlxsw_sp->core, MLXSW_REG(pfcc),
@@ -351,17 +353,17 @@ static int mlxsw_sp_dcbnl_ieee_setpfc(struct net_device *dev, 
				      struct ieee_pfc *pfc)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	bool pause_en = mlxsw_sp_port_is_pause_en(mlxsw_sp_port);

	int err;



	if ((mlxsw_sp_port->link.tx_pause || mlxsw_sp_port->link.rx_pause) &&

	    pfc->pfc_en) {

	if (pause_en && pfc->pfc_en) {

		netdev_err(dev, "PAUSE frames already enabled on port\n");

		return -EINVAL;

	}



	err = __mlxsw_sp_port_headroom_set(mlxsw_sp_port, dev->mtu,

					   mlxsw_sp_port->dcb.ets->prio_tc,

					   false, pfc);

					   pause_en, pfc);

	if (err) {

		netdev_err(dev, "Failed to configure port's headroom for PFC\n");

		return err;
@@ -380,7 +382,7 @@ static int mlxsw_sp_dcbnl_ieee_setpfc(struct net_device *dev, 


err_port_pfc_set:

	__mlxsw_sp_port_headroom_set(mlxsw_sp_port, dev->mtu,

				     mlxsw_sp_port->dcb.ets->prio_tc, false,

				     mlxsw_sp_port->dcb.ets->prio_tc, pause_en,

				     mlxsw_sp_port->dcb.pfc);

	return err;

}