Commit 34639fa3 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: Enforce firmware version for Spectrum-3 



In a fashion similar to the other Spectrum systems, enforce a specific
firmware version for Spectrum-3 so that the driver and firmware are
always in sync with regards to new features.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69c8a8c5

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

+18 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,21 @@ static const struct mlxsw_fw_rev mlxsw_sp2_fw_rev = { 
	"." __stringify(MLXSW_SP2_FWREV_MINOR) \

	"." __stringify(MLXSW_SP2_FWREV_MINOR) \

	"." __stringify(MLXSW_SP2_FWREV_SUBMINOR) ".mfa2"

	"." __stringify(MLXSW_SP2_FWREV_SUBMINOR) ".mfa2"





#define MLXSW_SP3_FWREV_MAJOR 30

#define MLXSW_SP3_FWREV_MINOR 2007

#define MLXSW_SP3_FWREV_SUBMINOR 1168



static const struct mlxsw_fw_rev mlxsw_sp3_fw_rev = {

	.major = MLXSW_SP3_FWREV_MAJOR,

	.minor = MLXSW_SP3_FWREV_MINOR,

	.subminor = MLXSW_SP3_FWREV_SUBMINOR,

};



#define MLXSW_SP3_FW_FILENAME \

	"mellanox/mlxsw_spectrum3-" __stringify(MLXSW_SP3_FWREV_MAJOR) \

	"." __stringify(MLXSW_SP3_FWREV_MINOR) \

	"." __stringify(MLXSW_SP3_FWREV_SUBMINOR) ".mfa2"



static const char mlxsw_sp1_driver_name[] = "mlxsw_spectrum";

static const char mlxsw_sp1_driver_name[] = "mlxsw_spectrum";

static const char mlxsw_sp2_driver_name[] = "mlxsw_spectrum2";

static const char mlxsw_sp2_driver_name[] = "mlxsw_spectrum2";

static const char mlxsw_sp3_driver_name[] = "mlxsw_spectrum3";

static const char mlxsw_sp3_driver_name[] = "mlxsw_spectrum3";
@@ -4642,6 +4657,8 @@ static int mlxsw_sp3_init(struct mlxsw_core *mlxsw_core, 
{

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);





	mlxsw_sp->req_rev = &mlxsw_sp3_fw_rev;

	mlxsw_sp->fw_filename = MLXSW_SP3_FW_FILENAME;

	mlxsw_sp->kvdl_ops = &mlxsw_sp2_kvdl_ops;

	mlxsw_sp->kvdl_ops = &mlxsw_sp2_kvdl_ops;

	mlxsw_sp->afa_ops = &mlxsw_sp2_act_afa_ops;

	mlxsw_sp->afa_ops = &mlxsw_sp2_act_afa_ops;

	mlxsw_sp->afk_ops = &mlxsw_sp2_afk_ops;

	mlxsw_sp->afk_ops = &mlxsw_sp2_afk_ops;
@@ -6333,3 +6350,4 @@ MODULE_DEVICE_TABLE(pci, mlxsw_sp2_pci_id_table); 
MODULE_DEVICE_TABLE(pci, mlxsw_sp3_pci_id_table);

MODULE_DEVICE_TABLE(pci, mlxsw_sp3_pci_id_table);

MODULE_FIRMWARE(MLXSW_SP1_FW_FILENAME);

MODULE_FIRMWARE(MLXSW_SP1_FW_FILENAME);

MODULE_FIRMWARE(MLXSW_SP2_FW_FILENAME);

MODULE_FIRMWARE(MLXSW_SP2_FW_FILENAME);

MODULE_FIRMWARE(MLXSW_SP3_FW_FILENAME);

CRA Git | Maintained and supported by SUSTech CRA and CCSE