Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarDavid S. Miller <davem@davemloft.net>
parents c1b3ddf7 44798ece

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

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ static const struct nfp_devlink_param_u8_arg nfp_devlink_u8_args[] = { 
	[DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY] = {

		.hwinfo_name = "app_fw_from_flash",

		.default_hi_val = NFP_NSP_APP_FW_LOAD_DEFAULT,

		.invalid_dl_val = -EINVAL,

		.invalid_dl_val =

			DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,

		.hi_to_dl = {

			[NFP_NSP_APP_FW_LOAD_DISK] =

				DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK,

include/uapi/linux/devlink.h

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ enum devlink_param_fw_load_policy_value { 
	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER,

	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH,

	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK,

	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,

};



enum devlink_param_reset_dev_on_drv_probe_value {