Skip to content

Commit e3dd762

Browse files
davem330davem330
committed
Merge branch 'mlxsw-fw_load_policy'
Ido Schimmel says: ==================== mlxsw: Add 'fw_load_policy' devlink parameter Shalom says: Currently, drivers do not have the ability to control the firmware loading policy and they always use their own fixed policy. This prevents drivers from running the device with a different firmware version for testing and/or debugging purposes. For example, testing a firmware bug fix. For these situations, the new devlink generic parameter, 'fw_load_policy', gives the ability to control this option and allows drivers to run with a different firmware version than required by the driver. Patch #1 adds the new parameter to devlink. The other two patches, #2 and #3, add support for this parameter in the mlxsw driver. Example: # Query the devlink parameters supported by the device $ devlink dev param show pci/0000:03:00.0: name fw_load_policy type generic values: cmode driverinit value driver # Flash new firmware using ethtool $ ethtool -f swp1 mellanox/mlxsw_spectrum-13.1703.4.mfa2 # Toggle parameter $ devlink dev param set pci/0000:03:00.0 name fw_load_policy value flash cmode driverinit # devlink reset $ devlink dev reload pci/0000:03:00.0 # Query firmware version to show changes took affect $ ethtool -i swp1 driver: mlxsw_spectrum version: 1.0 firmware-version: 13.1703.4 expansion-rom-version: bus-info: 0000:03:00.0 supports-statistics: yes supports-test: no supports-eeprom-access: no supports-register-dump: no supports-priv-flags: no iproute2 patches available here: https://github.com/tshalom/iproute2-next v2: * Change 'fw_version_check' to 'fw_load_policy' with values 'driver' and 'flash' (Jakub) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 6915bf3 + 064501c commit e3dd762

File tree

8 files changed

+127
-14
lines changed

8 files changed

+127
-14
lines changed

‎Documentation/networking/devlink-params.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,12 @@ msix_vec_per_pf_min [DEVICE, GENERIC]
4040
for the device initialization. Value is same across all
4141
physical functions (PFs) in the device.
4242
Type: u32
43+
44+
fw_load_policy [DEVICE, GENERIC]
45+
Controls the device's firmware loading policy.
46+
Valid values:
47+
* DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER (0)
48+
Load firmware version preferred by the driver.
49+
* DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH (1)
50+
Load firmware currently stored in flash.
51+
Type: u8

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

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -965,10 +965,11 @@ static const struct devlink_ops mlxsw_devlink_ops = {
965965
.sb_occ_tc_port_bind_get = mlxsw_devlink_sb_occ_tc_port_bind_get,
966966
};
967967

968-
int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
969-
const struct mlxsw_bus *mlxsw_bus,
970-
void *bus_priv, bool reload,
971-
struct devlink *devlink)
968+
static int
969+
__mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
970+
const struct mlxsw_bus *mlxsw_bus,
971+
void *bus_priv, bool reload,
972+
struct devlink *devlink)
972973
{
973974
const char *device_kind = mlxsw_bus_info->device_kind;
974975
struct mlxsw_core *mlxsw_core;
@@ -1035,6 +1036,12 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
10351036
goto err_devlink_register;
10361037
}
10371038

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+
10381045
err = mlxsw_hwmon_init(mlxsw_core, mlxsw_bus_info, &mlxsw_core->hwmon);
10391046
if (err)
10401047
goto err_hwmon_init;
@@ -1057,6 +1064,9 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
10571064
err_thermal_init:
10581065
mlxsw_hwmon_fini(mlxsw_core->hwmon);
10591066
err_hwmon_init:
1067+
if (mlxsw_driver->params_unregister && !reload)
1068+
mlxsw_driver->params_unregister(mlxsw_core);
1069+
err_register_params:
10601070
if (!reload)
10611071
devlink_unregister(devlink);
10621072
err_devlink_register:
@@ -1076,6 +1086,29 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
10761086
err_devlink_alloc:
10771087
return err;
10781088
}
1089+
1090+
int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
1091+
const struct mlxsw_bus *mlxsw_bus,
1092+
void *bus_priv, bool reload,
1093+
struct devlink *devlink)
1094+
{
1095+
bool called_again = false;
1096+
int err;
1097+
1098+
again:
1099+
err = __mlxsw_core_bus_device_register(mlxsw_bus_info, mlxsw_bus,
1100+
bus_priv, reload, devlink);
1101+
/* -EAGAIN is returned in case the FW was updated. FW needs
1102+
* a reset, so lets try to call __mlxsw_core_bus_device_register()
1103+
* again.
1104+
*/
1105+
if (err == -EAGAIN && !called_again) {
1106+
called_again = true;
1107+
goto again;
1108+
}
1109+
1110+
return err;
1111+
}
10791112
EXPORT_SYMBOL(mlxsw_core_bus_device_register);
10801113

10811114
void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
@@ -1097,6 +1130,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
10971130
mlxsw_core->driver->fini(mlxsw_core);
10981131
mlxsw_thermal_fini(mlxsw_core->thermal);
10991132
mlxsw_hwmon_fini(mlxsw_core->hwmon);
1133+
if (mlxsw_core->driver->params_unregister && !reload)
1134+
mlxsw_core->driver->params_unregister(mlxsw_core);
11001135
if (!reload)
11011136
devlink_unregister(devlink);
11021137
mlxsw_emad_fini(mlxsw_core);
@@ -1109,6 +1144,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
11091144
return;
11101145

11111146
reload_fail_deinit:
1147+
if (mlxsw_core->driver->params_unregister)
1148+
mlxsw_core->driver->params_unregister(mlxsw_core);
11121149
devlink_unregister(devlink);
11131150
devlink_resources_unregister(devlink, NULL);
11141151
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/pci.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,6 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
17201720
{
17211721
const char *driver_name = pdev->driver->name;
17221722
struct mlxsw_pci *mlxsw_pci;
1723-
bool called_again = false;
17241723
int err;
17251724

17261725
mlxsw_pci = kzalloc(sizeof(*mlxsw_pci), GFP_KERNEL);
@@ -1777,18 +1776,10 @@ static int mlxsw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
17771776
mlxsw_pci->bus_info.dev = &pdev->dev;
17781777
mlxsw_pci->id = id;
17791778

1780-
again:
17811779
err = mlxsw_core_bus_device_register(&mlxsw_pci->bus_info,
17821780
&mlxsw_pci_bus, mlxsw_pci, false,
17831781
NULL);
1784-
/* -EAGAIN is returned in case the FW was updated. FW needs
1785-
* a reset, so lets try to call mlxsw_core_bus_device_register()
1786-
* again.
1787-
*/
1788-
if (err == -EAGAIN && !called_again) {
1789-
called_again = true;
1790-
goto again;
1791-
} else if (err) {
1782+
if (err) {
17921783
dev_err(&pdev->dev, "cannot register bus device\n");
17931784
goto err_bus_device_register;
17941785
}

‎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,

‎include/net/devlink.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ enum devlink_param_generic_id {
365365
DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI,
366366
DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,
367367
DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,
368+
DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,
368369

369370
/* add new param generic ids above here*/
370371
__DEVLINK_PARAM_GENERIC_ID_MAX,
@@ -392,6 +393,9 @@ enum devlink_param_generic_id {
392393
#define DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_NAME "msix_vec_per_pf_min"
393394
#define DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_TYPE DEVLINK_PARAM_TYPE_U32
394395

396+
#define DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME "fw_load_policy"
397+
#define DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE DEVLINK_PARAM_TYPE_U8
398+
395399
#define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate) \
396400
{ \
397401
.id = DEVLINK_PARAM_GENERIC_ID_##_id, \

‎include/uapi/linux/devlink.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ enum devlink_param_cmode {
163163
DEVLINK_PARAM_CMODE_MAX = __DEVLINK_PARAM_CMODE_MAX - 1
164164
};
165165

166+
enum devlink_param_fw_load_policy_value {
167+
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER,
168+
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH,
169+
};
170+
166171
enum devlink_attr {
167172
/* don't change the order or add anything between, this is ABI! */
168173
DEVLINK_ATTR_UNSPEC,

‎net/core/devlink.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,6 +2692,11 @@ static const struct devlink_param devlink_param_generic[] = {
26922692
.name = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_NAME,
26932693
.type = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_TYPE,
26942694
},
2695+
{
2696+
.id = DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY,
2697+
.name = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_NAME,
2698+
.type = DEVLINK_PARAM_GENERIC_FW_LOAD_POLICY_TYPE,
2699+
},
26952700
};
26962701

26972702
static int devlink_param_generic_verify(const struct devlink_param *param)

0 commit comments

Comments
 (0)