| From foo@baz Wed May 31 09:13:34 JST 2017 |
| From: Gal Pressman <galp@mellanox.com> |
| Date: Mon, 3 Apr 2017 15:11:22 +0300 |
| Subject: net/mlx5e: Use the correct pause values for ethtool advertising |
| |
| From: Gal Pressman <galp@mellanox.com> |
| |
| |
| [ Upstream commit b383b544f2666d67446b951a9a97af239dafed5d ] |
| |
| Query the operational pause from firmware (PFCC register) instead of |
| always passing zeros. |
| |
| Fixes: 665bc53969d7 ("net/mlx5e: Use new ethtool get/set link ksettings API") |
| Signed-off-by: Gal Pressman <galp@mellanox.com> |
| Cc: kernel-team@fb.com |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c |
| @@ -806,6 +806,8 @@ static int mlx5e_get_link_ksettings(stru |
| struct mlx5e_priv *priv = netdev_priv(netdev); |
| struct mlx5_core_dev *mdev = priv->mdev; |
| u32 out[MLX5_ST_SZ_DW(ptys_reg)] = {0}; |
| + u32 rx_pause = 0; |
| + u32 tx_pause = 0; |
| u32 eth_proto_cap; |
| u32 eth_proto_admin; |
| u32 eth_proto_lp; |
| @@ -828,11 +830,13 @@ static int mlx5e_get_link_ksettings(stru |
| an_disable_admin = MLX5_GET(ptys_reg, out, an_disable_admin); |
| an_status = MLX5_GET(ptys_reg, out, an_status); |
| |
| + mlx5_query_port_pause(mdev, &rx_pause, &tx_pause); |
| + |
| ethtool_link_ksettings_zero_link_mode(link_ksettings, supported); |
| ethtool_link_ksettings_zero_link_mode(link_ksettings, advertising); |
| |
| get_supported(eth_proto_cap, link_ksettings); |
| - get_advertising(eth_proto_admin, 0, 0, link_ksettings); |
| + get_advertising(eth_proto_admin, tx_pause, rx_pause, link_ksettings); |
| get_speed_duplex(netdev, eth_proto_oper, link_ksettings); |
| |
| eth_proto_oper = eth_proto_oper ? eth_proto_oper : eth_proto_cap; |
