Skip to content

Commit 2f2fa16

Browse files
committed
Merge branch 'devlink-unknown'
Simon Horman says: ==================== devlink: add unknown 'fw_load_policy' value Dirk says: Recently we added an unknown value for the 'reset_dev_on_drv_probe' devlink parameter. Extend the 'fw_load_policy' parameter in the same way. The only driver that uses this right now is the nfp driver. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents c1b3ddf + 44798ec commit 2f2fa16

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

drivers/net/ethernet/netronome/nfp/devlink_param.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ static const struct nfp_devlink_param_u8_arg nfp_devlink_u8_args[] = {
3232
[DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY] = {
3333
.hwinfo_name = "app_fw_from_flash",
3434
.default_hi_val = NFP_NSP_APP_FW_LOAD_DEFAULT,
35-
.invalid_dl_val = -EINVAL,
35+
.invalid_dl_val =
36+
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,
3637
.hi_to_dl = {
3738
[NFP_NSP_APP_FW_LOAD_DISK] =
3839
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK,

include/uapi/linux/devlink.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ enum devlink_param_fw_load_policy_value {
203203
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER,
204204
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH,
205205
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK,
206+
DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,
206207
};
207208

208209
enum devlink_param_reset_dev_on_drv_probe_value {

0 commit comments

Comments
 (0)