summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-09-11 16:10:05 +0200
committerDavid S. Miller <davem@davemloft.net>2019-09-11 16:10:05 +0200
commit2f2fa16e23816bded4b97117faf6e97a95ba9056 (patch)
tree0ffcc3b3519dd32ae2f8f08349c6f4e8712ce828 /drivers
parentMerge tag 'mac80211-next-for-davem-2019-09-11' of git://git.kernel.org/pub/sc... (diff)
parentnfp: devlink: set unknown fw_load_policy (diff)
downloadlinux-2f2fa16e23816bded4b97117faf6e97a95ba9056.tar.xz
linux-2f2fa16e23816bded4b97117faf6e97a95ba9056.zip
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 <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/netronome/nfp/devlink_param.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/devlink_param.c b/drivers/net/ethernet/netronome/nfp/devlink_param.c
index 4a8141b4d625..36491835ac65 100644
--- a/drivers/net/ethernet/netronome/nfp/devlink_param.c
+++ b/drivers/net/ethernet/netronome/nfp/devlink_param.c
@@ -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,