Skip to content

Commit 064501c

Browse files
Shalom Toledodavem330
Shalom Toledo
authored and
davem330
committed
mlxsw: spectrum: Load firmware version based on devlink parameter
Load firmware version based on 'fw_load_policy' devlink parameter. The driver supports these two options: * DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER (0) Default, load firmware version preferred by the driver * DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH (1) Load firmware currently stored in flash The second option, 'flash', allow the device to run with different firmware version than preferred by the driver for testing and/or debugging purposes. For example, testing a firmware bug fix. Signed-off-by: Shalom Toledo <shalomt@mellanox.com> Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 03bffca commit 064501c

File tree

3 files changed

+75
-0
lines changed

3 files changed

+75
-0
lines changed

‎drivers/net/ethernet/mellanox/mlxsw/core.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,12 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
10361036
goto err_devlink_register;
10371037
}
10381038

1039+
if (mlxsw_driver->params_register && !reload) {
1040+
err = mlxsw_driver->params_register(mlxsw_core);
1041+
if (err)
1042+
goto err_register_params;
1043+
}
1044+
10391045
err = mlxsw_hwmon_init(mlxsw_core, mlxsw_bus_info, &mlxsw_core->hwmon);
10401046
if (err)
10411047
goto err_hwmon_init;
@@ -1058,6 +1064,9 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
10581064
err_thermal_init:
10591065
mlxsw_hwmon_fini(mlxsw_core->hwmon);
10601066
err_hwmon_init:
1067+
if (mlxsw_driver->params_unregister && !reload)
1068+
mlxsw_driver->params_unregister(mlxsw_core);
1069+
err_register_params:
10611070
if (!reload)
10621071
devlink_unregister(devlink);
10631072
err_devlink_register:
@@ -1121,6 +1130,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
11211130
mlxsw_core->driver->fini(mlxsw_core);
11221131
mlxsw_thermal_fini(mlxsw_core->thermal);
11231132
mlxsw_hwmon_fini(mlxsw_core->hwmon);
1133+
if (mlxsw_core->driver->params_unregister && !reload)
1134+
mlxsw_core->driver->params_unregister(mlxsw_core);
11241135
if (!reload)
11251136
devlink_unregister(devlink);
11261137
mlxsw_emad_fini(mlxsw_core);
@@ -1133,6 +1144,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
11331144
return;
11341145

11351146
reload_fail_deinit:
1147+
if (mlxsw_core->driver->params_unregister)
1148+
mlxsw_core->driver->params_unregister(mlxsw_core);
11361149
devlink_unregister(devlink);
11371150
devlink_resources_unregister(devlink, NULL);
11381151
devlink_free(devlink);

‎drivers/net/ethernet/mellanox/mlxsw/core.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ struct mlxsw_driver {
282282
const struct mlxsw_config_profile *profile,
283283
u64 *p_single_size, u64 *p_double_size,
284284
u64 *p_linear_size);
285+
int (*params_register)(struct mlxsw_core *mlxsw_core);
286+
void (*params_unregister)(struct mlxsw_core *mlxsw_core);
285287
u8 txhdr_len;
286288
const struct mlxsw_config_profile *profile;
287289
bool res_query_enabled;

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,23 @@ static int mlxsw_sp_fw_rev_validate(struct mlxsw_sp *mlxsw_sp)
318318
const struct mlxsw_fw_rev *rev = &mlxsw_sp->bus_info->fw_rev;
319319
const struct mlxsw_fw_rev *req_rev = mlxsw_sp->req_rev;
320320
const char *fw_filename = mlxsw_sp->fw_filename;
321+
union devlink_param_value value;
321322
const struct firmware *firmware;
322323
int err;
323324

324325
/* Don't check if driver does not require it */
325326
if (!req_rev || !fw_filename)
326327
return 0;
327328

329+
/* Don't check if devlink 'fw_load_policy' param is 'flash' */
330+
err = devlink_param_driverinit_value_get(priv_to_devlink(mlxsw_sp->core),
331+
DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,
332+
&value);
333+
if (err)
334+
return err;
335+
if (value.vu8 == DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH)
336+
return 0;
337+
328338
/* Validate driver & FW are compatible */
329339
if (rev->major != req_rev->major) {
330340
WARN(1, "Mismatch in major FW version [%d:%d] is never expected; Please contact support\n",
@@ -4328,6 +4338,52 @@ static int mlxsw_sp_kvd_sizes_get(struct mlxsw_core *mlxsw_core,
43284338
return 0;
43294339
}
43304340

4341+
static int
4342+
mlxsw_sp_devlink_param_fw_load_policy_validate(struct devlink *devlink, u32 id,
4343+
union devlink_param_value val,
4344+
struct netlink_ext_ack *extack)
4345+
{
4346+
if ((val.vu8 != DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER) &&
4347+
(val.vu8 != DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH)) {
4348+
NL_SET_ERR_MSG_MOD(extack, "'fw_load_policy' must be 'driver' or 'flash'");
4349+
return -EINVAL;
4350+
}
4351+
4352+
return 0;
4353+
}
4354+
4355+
static const struct devlink_param mlxsw_sp_devlink_params[] = {
4356+
DEVLINK_PARAM_GENERIC(FW_LOAD_POLICY,
4357+
BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
4358+
NULL, NULL,
4359+
mlxsw_sp_devlink_param_fw_load_policy_validate),
4360+
};
4361+
4362+
static int mlxsw_sp_params_register(struct mlxsw_core *mlxsw_core)
4363+
{
4364+
struct devlink *devlink = priv_to_devlink(mlxsw_core);
4365+
union devlink_param_value value;
4366+
int err;
4367+
4368+
err = devlink_params_register(devlink, mlxsw_sp_devlink_params,
4369+
ARRAY_SIZE(mlxsw_sp_devlink_params));
4370+
if (err)
4371+
return err;
4372+
4373+
value.vu8 = DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER;
4374+
devlink_param_driverinit_value_set(devlink,
4375+
DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,
4376+
value);
4377+
return 0;
4378+
}
4379+
4380+
static void mlxsw_sp_params_unregister(struct mlxsw_core *mlxsw_core)
4381+
{
4382+
devlink_params_unregister(priv_to_devlink(mlxsw_core),
4383+
mlxsw_sp_devlink_params,
4384+
ARRAY_SIZE(mlxsw_sp_devlink_params));
4385+
}
4386+
43314387
static struct mlxsw_driver mlxsw_sp1_driver = {
43324388
.kind = mlxsw_sp1_driver_name,
43334389
.priv_size = sizeof(struct mlxsw_sp),
@@ -4349,6 +4405,8 @@ static struct mlxsw_driver mlxsw_sp1_driver = {
43494405
.txhdr_construct = mlxsw_sp_txhdr_construct,
43504406
.resources_register = mlxsw_sp1_resources_register,
43514407
.kvd_sizes_get = mlxsw_sp_kvd_sizes_get,
4408+
.params_register = mlxsw_sp_params_register,
4409+
.params_unregister = mlxsw_sp_params_unregister,
43524410
.txhdr_len = MLXSW_TXHDR_LEN,
43534411
.profile = &mlxsw_sp1_config_profile,
43544412
.res_query_enabled = true,
@@ -4374,6 +4432,8 @@ static struct mlxsw_driver mlxsw_sp2_driver = {
43744432
.sb_occ_tc_port_bind_get = mlxsw_sp_sb_occ_tc_port_bind_get,
43754433
.txhdr_construct = mlxsw_sp_txhdr_construct,
43764434
.resources_register = mlxsw_sp2_resources_register,
4435+
.params_register = mlxsw_sp_params_register,
4436+
.params_unregister = mlxsw_sp_params_unregister,
43774437
.txhdr_len = MLXSW_TXHDR_LEN,
43784438
.profile = &mlxsw_sp2_config_profile,
43794439
.res_query_enabled = true,

0 commit comments

Comments
 (0)