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

Commit 0c83f88c authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Correctly report autonegotiation 



Up until now the device always reported autonegotiation to be off
although it was on by default.

Allow the user to disable / enable autonegotiation and report its status
correctly.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36a19b29

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

+12 −2
Original line number Original line Diff line number Diff line
@@ -1815,7 +1815,12 @@ static int mlxsw_sp_port_get_settings(struct net_device *dev, 
			 mlxsw_sp_from_ptys_supported_link(eth_proto_cap) |

			 mlxsw_sp_from_ptys_supported_link(eth_proto_cap) |

			 SUPPORTED_Pause | SUPPORTED_Asym_Pause |

			 SUPPORTED_Pause | SUPPORTED_Asym_Pause |

			 SUPPORTED_Autoneg;

			 SUPPORTED_Autoneg;

	cmd->advertising = mlxsw_sp_from_ptys_advert_link(eth_proto_admin);

	if (mlxsw_sp_port->link.autoneg) {

		cmd->advertising =

			mlxsw_sp_from_ptys_advert_link(eth_proto_admin);

		cmd->advertising |= ADVERTISED_Autoneg;

		cmd->autoneg = AUTONEG_ENABLE;

	}

	mlxsw_sp_from_ptys_speed_duplex(netif_carrier_ok(dev),

	mlxsw_sp_from_ptys_speed_duplex(netif_carrier_ok(dev),

					eth_proto_oper, cmd);

					eth_proto_oper, cmd);
@@ -1873,11 +1878,13 @@ static int mlxsw_sp_port_set_settings(struct net_device *dev, 
	u32 eth_proto_new;

	u32 eth_proto_new;

	u32 eth_proto_cap;

	u32 eth_proto_cap;

	u32 eth_proto_admin;

	u32 eth_proto_admin;

	bool autoneg;

	int err;

	int err;





	autoneg = cmd->autoneg == AUTONEG_ENABLE;

	speed = ethtool_cmd_speed(cmd);

	speed = ethtool_cmd_speed(cmd);





	eth_proto_new = cmd->autoneg == AUTONEG_ENABLE ?

	eth_proto_new = autoneg ?

		mlxsw_sp_to_ptys_advert_link(cmd->advertising) :

		mlxsw_sp_to_ptys_advert_link(cmd->advertising) :

		mlxsw_sp_to_ptys_speed(speed);

		mlxsw_sp_to_ptys_speed(speed);
@@ -1907,6 +1914,8 @@ static int mlxsw_sp_port_set_settings(struct net_device *dev, 
	if (!netif_running(dev))

	if (!netif_running(dev))

		return 0;

		return 0;





	mlxsw_sp_port->link.autoneg = autoneg;



	err = mlxsw_sp_port_admin_status_set(mlxsw_sp_port, false);

	err = mlxsw_sp_port_admin_status_set(mlxsw_sp_port, false);

	if (err) {

	if (err) {

		netdev_err(dev, "Failed to set admin status");

		netdev_err(dev, "Failed to set admin status");
@@ -2082,6 +2091,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_sp_port->mapping.module = module;

	mlxsw_sp_port->mapping.module = module;

	mlxsw_sp_port->mapping.width = width;

	mlxsw_sp_port->mapping.width = width;

	mlxsw_sp_port->mapping.lane = lane;

	mlxsw_sp_port->mapping.lane = lane;

	mlxsw_sp_port->link.autoneg = 1;

	bytes = DIV_ROUND_UP(VLAN_N_VID, BITS_PER_BYTE);

	bytes = DIV_ROUND_UP(VLAN_N_VID, BITS_PER_BYTE);

	mlxsw_sp_port->active_vlans = kzalloc(bytes, GFP_KERNEL);

	mlxsw_sp_port->active_vlans = kzalloc(bytes, GFP_KERNEL);

	if (!mlxsw_sp_port->active_vlans) {

	if (!mlxsw_sp_port->active_vlans) {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -341,7 +341,8 @@ struct mlxsw_sp_port { 
	} vport;

	} vport;

	struct {

	struct {

		u8 tx_pause:1,

		u8 tx_pause:1,

		   rx_pause:1;

		   rx_pause:1,

		   autoneg:1;

	} link;

	} link;

	struct {

	struct {

		struct ieee_ets *ets;

		struct ieee_ets *ets;