Skip to contentSkip to conversation

net/mlx4_core: Correctly set PFC param if global pause is turned off.

PATCH In review Tarick Bedeir 3 participants 4 messages Dec 7, 2018 – Dec 9, 2018

Subsystems (5)
Networking Network drivers InfiniBand Mellanox MLX4 core VPI driver +1 more subsystems
lore
Share & tools
lore

Tarick Bedeir

author
#0 lore raw

PATCH 1/1 net/mlx4_core: Correctly set PFC param if global pause is turned off.

rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.

Fixes 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
Signed-off-by Tarick Bedeir <[email protected]>
---
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +2 -2
index f11b45001cad..d290f0787dfb 100644
@@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,
 
 	tx_pause = !!(pause->tx_pause);
 	rx_pause = !!(pause->rx_pause);
-	rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause);
-	tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause);
+	rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp;
+	tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp;
 
 	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
 				    priv->rx_skb_size + ETH_FCS_LEN,
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
maintainer
#1 lore raw

From: Tarick Bedeir <[email protected]>
Date: Fri, 7 Dec 2018 00:30:26 -0800

Quoted 4 lines

rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.

Fixes 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
Signed-off-by Tarick Bedeir <[email protected]>

Tariq and co., please review.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Tarick Bedeir
Quoted 14 lines · Tarick Bedeir

rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.

Fixes 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
Signed-off-by Tarick Bedeir <[email protected]>
---
  drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +0 -0
index f11b45001cad..d290f0787dfb 100644

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c static int mlx4_en_set_pauseparam(struct net_device *dev, · line 1091

Quoted 10 lines
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +2 -2
@@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,
 
  	tx_pause = !!(pause->tx_pause);
  	rx_pause = !!(pause->rx_pause);
-	rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause);
-	tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause);
+	rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp;
+	tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp;
 
  	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
  				    priv->rx_skb_size + ETH_FCS_LEN,

thanks for the Tarick.

Reviewed-by Eran Ben Elisha <[email protected]>