Commit 91b17a43 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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/20210526104509.761807-1-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 557c4d2f 7dafcc4c

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+8 −2
Original line number Diff line number Diff line
@@ -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)

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

+6 −2
Original line number Diff line number Diff line
@@ -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