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

Merge branch 'mlxsw-Firmware-version-updates' 



Ido Schimmel says:

====================
mlxsw: Firmware version updates

This patch sets contains two firmware-related updates.

Patch #1 bumps the required firmware version in order to support 2x50
Gb/s split on SN3800 systems.

Patch #2 changes the driver to only enforce a minimum required firmware
version, which should allow us to reduce the frequency in which we need
to update the driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a2d6d7ae 4dab08df

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

+6 −9
Original line number Diff line number Diff line
@@ -45,11 +45,9 @@ 
#include "spectrum_ptp.h"

#include "../mlxfw/mlxfw.h"



#define MLXSW_SP_FWREV_MINOR_TO_BRANCH(minor) ((minor) / 100)



#define MLXSW_SP1_FWREV_MAJOR 13

#define MLXSW_SP1_FWREV_MINOR 2000

#define MLXSW_SP1_FWREV_SUBMINOR 2308

#define MLXSW_SP1_FWREV_SUBMINOR 2714

#define MLXSW_SP1_FWREV_CAN_RESET_MINOR 1702



static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = {
@@ -66,7 +64,7 @@ static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = { 


#define MLXSW_SP2_FWREV_MAJOR 29

#define MLXSW_SP2_FWREV_MINOR 2000

#define MLXSW_SP2_FWREV_SUBMINOR 2308

#define MLXSW_SP2_FWREV_SUBMINOR 2714



static const struct mlxsw_fw_rev mlxsw_sp2_fw_rev = {

	.major = MLXSW_SP2_FWREV_MAJOR,
@@ -423,13 +421,12 @@ static int mlxsw_sp_fw_rev_validate(struct mlxsw_sp *mlxsw_sp) 
		     rev->major, req_rev->major);

		return -EINVAL;

	}

	if (MLXSW_SP_FWREV_MINOR_TO_BRANCH(rev->minor) ==

	    MLXSW_SP_FWREV_MINOR_TO_BRANCH(req_rev->minor) &&

	    mlxsw_core_fw_rev_minor_subminor_validate(rev, req_rev))

	if (mlxsw_core_fw_rev_minor_subminor_validate(rev, req_rev))

		return 0;



	dev_info(mlxsw_sp->bus_info->dev, "The firmware version %d.%d.%d is incompatible with the driver\n",

		 rev->major, rev->minor, rev->subminor);

	dev_err(mlxsw_sp->bus_info->dev, "The firmware version %d.%d.%d is incompatible with the driver (required >= %d.%d.%d)\n",

		rev->major, rev->minor, rev->subminor, req_rev->major,

		req_rev->minor, req_rev->subminor);

	dev_info(mlxsw_sp->bus_info->dev, "Flashing firmware using file %s\n",

		 fw_filename);

CRA Git | Maintained and supported by SUSTech CRA and CCSE