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

Commit 334e7678 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Update-supported-firmware-version' 



Ido Schimmel says:

====================
mlxsw: Update supported firmware version

The first patch bumps the firmware version supported by the driver. The
second patch enables a feature introduced in the new version,
auto-negotiation disable.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7381f93a 8e1ed739

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

+10 −1
Original line number Diff line number Diff line
@@ -2872,6 +2872,14 @@ static inline void mlxsw_reg_pmtu_pack(char *payload, u8 local_port, 


MLXSW_REG_DEFINE(ptys, MLXSW_REG_PTYS_ID, MLXSW_REG_PTYS_LEN);



/* an_disable_admin

 * Auto negotiation disable administrative configuration

 * 0 - Device doesn't support AN disable.

 * 1 - Device supports AN disable.

 * Access: RW

 */

MLXSW_ITEM32(reg, ptys, an_disable_admin, 0x00, 30, 1);



/* reg_ptys_local_port

 * Local port number.

 * Access: Index
@@ -3000,12 +3008,13 @@ MLXSW_ITEM32(reg, ptys, ib_proto_oper, 0x28, 0, 16); 
MLXSW_ITEM32(reg, ptys, eth_proto_lp_advertise, 0x30, 0, 32);



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

					   u32 proto_admin)

					   u32 proto_admin, bool autoneg)

{

	MLXSW_REG_ZERO(ptys, payload);

	mlxsw_reg_ptys_local_port_set(payload, local_port);

	mlxsw_reg_ptys_proto_mask_set(payload, MLXSW_REG_PTYS_PROTO_MASK_ETH);

	mlxsw_reg_ptys_eth_proto_admin_set(payload, proto_admin);

	mlxsw_reg_ptys_an_disable_admin_set(payload, !autoneg);

}



static inline void mlxsw_reg_ptys_eth_unpack(char *payload,

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

+6 −6
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
#include "../mlxfw/mlxfw.h"



#define MLXSW_FWREV_MAJOR 13

#define MLXSW_FWREV_MINOR 1530

#define MLXSW_FWREV_SUBMINOR 152

#define MLXSW_FWREV_MINOR 1620

#define MLXSW_FWREV_SUBMINOR 192

#define MLXSW_FWREV_MINOR_TO_BRANCH(minor) ((minor) / 100)



#define MLXSW_SP_FW_FILENAME \
@@ -2390,7 +2390,7 @@ static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev, 
	int err;



	autoneg = mlxsw_sp_port->link.autoneg;

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

	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port, 0, false);

	err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);

	if (err)

		return err;
@@ -2424,7 +2424,7 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev, 
	bool autoneg;

	int err;



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

	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port, 0, false);

	err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);

	if (err)

		return err;
@@ -2442,7 +2442,7 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *dev, 
	}



	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port,

				eth_proto_new);

				eth_proto_new, autoneg);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);

	if (err)

		return err;
@@ -2653,7 +2653,7 @@ mlxsw_sp_port_speed_by_width_set(struct mlxsw_sp_port *mlxsw_sp_port, u8 width) 


	eth_proto_admin = mlxsw_sp_to_ptys_upper_speed(upper_speed);

	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port,

				eth_proto_admin);

				eth_proto_admin, mlxsw_sp_port->link.autoneg);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl);

}

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

+4 −4
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ mlxsw_sx_port_get_link_ksettings(struct net_device *dev, 
	u32 supported, advertising, lp_advertising;

	int err;



	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sx_port->local_port, 0);

	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sx_port->local_port, 0, false);

	err = mlxsw_reg_query(mlxsw_sx->core, MLXSW_REG(ptys), ptys_pl);

	if (err) {

		netdev_err(dev, "Failed to get proto");
@@ -879,7 +879,7 @@ mlxsw_sx_port_set_link_ksettings(struct net_device *dev, 
		mlxsw_sx_to_ptys_advert_link(advertising) :

		mlxsw_sx_to_ptys_speed(speed);



	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sx_port->local_port, 0);

	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sx_port->local_port, 0, false);

	err = mlxsw_reg_query(mlxsw_sx->core, MLXSW_REG(ptys), ptys_pl);

	if (err) {

		netdev_err(dev, "Failed to get proto");
@@ -897,7 +897,7 @@ mlxsw_sx_port_set_link_ksettings(struct net_device *dev, 
		return 0;



	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sx_port->local_port,

				eth_proto_new);

				eth_proto_new, true);

	err = mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(ptys), ptys_pl);

	if (err) {

		netdev_err(dev, "Failed to set proto admin");
@@ -1029,7 +1029,7 @@ mlxsw_sx_port_speed_by_width_set(struct mlxsw_sx_port *mlxsw_sx_port, u8 width) 


	eth_proto_admin = mlxsw_sx_to_ptys_upper_speed(upper_speed);

	mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sx_port->local_port,

				eth_proto_admin);

				eth_proto_admin, true);

	return mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(ptys), ptys_pl);

}