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

Commit 4149b97f authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Report link partner's advertised speeds 



If autonegotiation was performed successfully, then we should report the
link partner's advertised speeds instead of the operational speed of the
port.

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 0c83f88c

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

+19 −0
Original line number Original line Diff line number Diff line
@@ -2138,6 +2138,18 @@ MLXSW_ITEM32(reg, ptys, local_port, 0x00, 16, 8); 
 */

 */

MLXSW_ITEM32(reg, ptys, proto_mask, 0x00, 0, 3);

MLXSW_ITEM32(reg, ptys, proto_mask, 0x00, 0, 3);





enum {

	MLXSW_REG_PTYS_AN_STATUS_NA,

	MLXSW_REG_PTYS_AN_STATUS_OK,

	MLXSW_REG_PTYS_AN_STATUS_FAIL,

};



/* reg_ptys_an_status

 * Autonegotiation status.

 * Access: RO

 */

MLXSW_ITEM32(reg, ptys, an_status, 0x04, 28, 4);



#define MLXSW_REG_PTYS_ETH_SPEED_SGMII			BIT(0)

#define MLXSW_REG_PTYS_ETH_SPEED_SGMII			BIT(0)

#define MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX		BIT(1)

#define MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX		BIT(1)

#define MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CX4		BIT(2)

#define MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CX4		BIT(2)
@@ -2184,6 +2196,13 @@ MLXSW_ITEM32(reg, ptys, eth_proto_admin, 0x18, 0, 32); 
 */

 */

MLXSW_ITEM32(reg, ptys, eth_proto_oper, 0x24, 0, 32);

MLXSW_ITEM32(reg, ptys, eth_proto_oper, 0x24, 0, 32);





/* reg_ptys_eth_proto_lp_advertise

 * The protocols that were advertised by the link partner during

 * autonegotiation.

 * Access: RO

 */

MLXSW_ITEM32(reg, ptys, eth_proto_lp_advertise, 0x30, 0, 32);



static inline void mlxsw_reg_ptys_pack(char *payload, u8 local_port,

static inline void mlxsw_reg_ptys_pack(char *payload, u8 local_port,

				       u32 proto_admin)

				       u32 proto_admin)

{

{

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -1800,6 +1800,8 @@ static int mlxsw_sp_port_get_settings(struct net_device *dev, 
	u32 eth_proto_cap;

	u32 eth_proto_cap;

	u32 eth_proto_admin;

	u32 eth_proto_admin;

	u32 eth_proto_oper;

	u32 eth_proto_oper;

	u8 autoneg_status;

	u32 eth_proto_lp;

	int err;

	int err;





	mlxsw_reg_ptys_pack(ptys_pl, mlxsw_sp_port->local_port, 0);

	mlxsw_reg_ptys_pack(ptys_pl, mlxsw_sp_port->local_port, 0);
@@ -1810,6 +1812,8 @@ static int mlxsw_sp_port_get_settings(struct net_device *dev, 
	}

	}

	mlxsw_reg_ptys_unpack(ptys_pl, &eth_proto_cap,

	mlxsw_reg_ptys_unpack(ptys_pl, &eth_proto_cap,

			      &eth_proto_admin, &eth_proto_oper);

			      &eth_proto_admin, &eth_proto_oper);

	eth_proto_lp = mlxsw_reg_ptys_eth_proto_lp_advertise_get(ptys_pl);

	autoneg_status = mlxsw_reg_ptys_an_status_get(ptys_pl);





	cmd->supported = mlxsw_sp_from_ptys_supported_port(eth_proto_cap) |

	cmd->supported = mlxsw_sp_from_ptys_supported_port(eth_proto_cap) |

			 mlxsw_sp_from_ptys_supported_link(eth_proto_cap) |

			 mlxsw_sp_from_ptys_supported_link(eth_proto_cap) |
@@ -1826,7 +1830,10 @@ static int mlxsw_sp_port_get_settings(struct net_device *dev, 




	eth_proto_oper = eth_proto_oper ? eth_proto_oper : eth_proto_cap;

	eth_proto_oper = eth_proto_oper ? eth_proto_oper : eth_proto_cap;

	cmd->port = mlxsw_sp_port_connector_port(eth_proto_oper);

	cmd->port = mlxsw_sp_port_connector_port(eth_proto_oper);

	cmd->lp_advertising = mlxsw_sp_from_ptys_advert_link(eth_proto_oper);



	if (autoneg_status == MLXSW_REG_PTYS_AN_STATUS_OK && eth_proto_lp)

		cmd->lp_advertising =

			mlxsw_sp_from_ptys_advert_link(eth_proto_lp);





	cmd->transceiver = XCVR_INTERNAL;

	cmd->transceiver = XCVR_INTERNAL;

	return 0;

	return 0;