diff options
| author | Jakub Kicinski <[email protected]> | 2021-05-27 14:51:20 -0700 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2021-05-27 14:51:20 -0700 |
| commit | 91b17a436759e9f3a6f9ff090693564c3299cd9a (patch) | |
| tree | 25b12f38c19de3a1aadb76b70667b4b6e5d43284 | |
| parent | 557c4d2f780ce73ffad8dfe4d03a27dc9e13dfde (diff) | |
| parent | 7dafcc4c9dfb417fc1ad19881c802af2101d0bfd (diff) | |
Merge branch 'mlx-devlink-dev-info-versions-adjustments'
Jiri Pirko says:
====================
mlx*: devlink dev info versions adjustments
Couple of adjustments in Mellanox drivers regarding devlink dev
versions fill-up.
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/core.c | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c index 44c458443428..d791d351b489 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c @@ -63,6 +63,11 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, err = devlink_info_version_running_put(req, "fw.version", version_str); if (err) return err; + err = devlink_info_version_running_put(req, + DEVLINK_INFO_VERSION_GENERIC_FW, + version_str); + if (err) + return err; /* no pending version, return running (stored) version */ if (stored_fw == 0) @@ -74,8 +79,9 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, err = devlink_info_version_stored_put(req, "fw.version", version_str); if (err) return err; - - return 0; + return devlink_info_version_stored_put(req, + DEVLINK_INFO_VERSION_GENERIC_FW, + version_str); } static int mlx5_devlink_reload_fw_activate(struct devlink *devlink, struct netlink_ext_ack *extack) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index ad93e01b2cda..e775f08fb464 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1444,7 +1444,9 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, if (err) return err; - err = devlink_info_version_fixed_put(req, "fw.psid", fw_info_psid); + err = devlink_info_version_fixed_put(req, + DEVLINK_INFO_VERSION_GENERIC_FW_PSID, + fw_info_psid); if (err) return err; @@ -1453,7 +1455,9 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, if (err) return err; - return 0; + return devlink_info_version_running_put(req, + DEVLINK_INFO_VERSION_GENERIC_FW, + buf); } static int |