[PATCH net-next 1/2] net/mlx5e: Select DCBX HOST/AUTO from capability flags in setdcbx
flat view
WARM1d
REVIEWED: 2 (1M)
From: Tariq Toukan <tariqt@nvidia.com>
Date: 2026-10-11 11:29:32
Also in:
linux-rdma, lkml
Subsystem:
mellanox ethernet driver (mlx5e), mellanox mlx5 core vpi driver, networking drivers, the rest · Maintainers:
Saeed Mahameed, Tariq Toukan, Mark Bloch, Leon Romanovsky, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
2 review trailers.
From: Alexei Lazar <redacted> mlx5e_dcbnl_setdcbx() used two different policies: mode 0 switched firmware to AUTO, and any other request was accepted only with DCB_CAP_DCBX_HOST. Switch the firmware HOST/AUTO modes based on the DCB_CAP_DCBX_HOST bit. This better aligns with the DCBX capability flags. It also allows folding the two different code paths into one. When switching to firmware-controlled (non-host) mode, report CEE, IEEE and LLD_MANAGED together due to a FW limitation. Signed-off-by: Alexei Lazar <redacted> Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> Reviewed-by: Carolina Jubran <redacted> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> --- .../ethernet/mellanox/mlx5/core/en_dcbnl.c | 48 ++++++------------- 1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
index 741f75b5bfec..4eef929f5ae9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c@@ -99,25 +99,6 @@ static int mlx5e_dcbnl_set_dcbx_mode(struct mlx5e_priv *priv, return mlx5_set_port_dcbx_param(mdev, param); } -static int mlx5e_dcbnl_switch_to_host_mode(struct mlx5e_priv *priv) -{ - struct mlx5e_dcbx *dcbx = &priv->dcbx; - int err; - - if (!MLX5_CAP_GEN(priv->mdev, dcbx)) - return 0; - - if (dcbx->mode == MLX5E_DCBX_PARAM_VER_OPER_HOST) - return 0; - - err = mlx5e_dcbnl_set_dcbx_mode(priv, MLX5E_DCBX_PARAM_VER_OPER_HOST); - if (err) - return err; - - dcbx->mode = MLX5E_DCBX_PARAM_VER_OPER_HOST; - return 0; -} - static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, struct ieee_ets *ets) {
@@ -453,32 +434,31 @@ static u8 mlx5e_dcbnl_getdcbx(struct net_device *dev) static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode) { + bool new_is_host = mode & DCB_CAP_DCBX_HOST; struct mlx5e_priv *priv = netdev_priv(dev); struct mlx5e_dcbx *dcbx = &priv->dcbx; + enum mlx5_dcbx_oper_mode target_mode; if (mode & DCB_CAP_DCBX_LLD_MANAGED) return 1; - if ((!mode) && MLX5_CAP_GEN(priv->mdev, dcbx)) { - if (dcbx->mode == MLX5E_DCBX_PARAM_VER_OPER_AUTO) - return 0; - - /* set dcbx to fw controlled */ - if (!mlx5e_dcbnl_set_dcbx_mode(priv, MLX5E_DCBX_PARAM_VER_OPER_AUTO)) { - dcbx->mode = MLX5E_DCBX_PARAM_VER_OPER_AUTO; - dcbx->cap &= ~DCB_CAP_DCBX_HOST; - return 0; - } + if (!MLX5_CAP_GEN(priv->mdev, dcbx)) + return !new_is_host; - return 1; - } + target_mode = new_is_host ? MLX5E_DCBX_PARAM_VER_OPER_HOST : + MLX5E_DCBX_PARAM_VER_OPER_AUTO; + if (dcbx->mode == target_mode) + return 0; - if (!(mode & DCB_CAP_DCBX_HOST)) + if (mlx5e_dcbnl_set_dcbx_mode(priv, target_mode)) return 1; - if (mlx5e_dcbnl_switch_to_host_mode(netdev_priv(dev))) - return 1; + if (!new_is_host) + mode = DCB_CAP_DCBX_VER_CEE | + DCB_CAP_DCBX_VER_IEEE | + DCB_CAP_DCBX_LLD_MANAGED; + dcbx->mode = target_mode; dcbx->cap = mode; return 0;
--
2.44.0