* [patch net-next 1/3] net/mlx5: Expose FW version over defined keyword
2021-05-26 10:45 [patch net-next 0/3] mlx*: devlink dev info versions adjustments Jiri Pirko
@ 2021-05-26 10:45 ` Jiri Pirko
2021-05-27 22:10 ` Saeed Mahameed
2021-05-26 10:45 ` [patch net-next 2/3] mlxsw: core: " Jiri Pirko
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Jiri Pirko @ 2021-05-26 10:45 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, mlxsw, idosch
From: Jiri Pirko <jiri@nvidia.com>
To be aligned with the rest of the drivers, expose FW version under "fw"
keyword in devlink dev info, in addition to the existing "fw.version",
which is currently Mellanox-specific.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 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)
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch net-next 1/3] net/mlx5: Expose FW version over defined keyword
2021-05-26 10:45 ` [patch net-next 1/3] net/mlx5: Expose FW version over defined keyword Jiri Pirko
@ 2021-05-27 22:10 ` Saeed Mahameed
0 siblings, 0 replies; 6+ messages in thread
From: Saeed Mahameed @ 2021-05-27 22:10 UTC (permalink / raw)
To: Jiri Pirko, netdev; +Cc: davem, kuba, mlxsw, idosch
On Wed, 2021-05-26 at 12:45 +0200, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> To be aligned with the rest of the drivers, expose FW version under
> "fw"
> keyword in devlink dev info, in addition to the existing
> "fw.version",
> which is currently Mellanox-specific.
>
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Saeed Mahameed <saeedm@nvidia.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch net-next 2/3] mlxsw: core: Expose FW version over defined keyword
2021-05-26 10:45 [patch net-next 0/3] mlx*: devlink dev info versions adjustments Jiri Pirko
2021-05-26 10:45 ` [patch net-next 1/3] net/mlx5: Expose FW version over defined keyword Jiri Pirko
@ 2021-05-26 10:45 ` Jiri Pirko
2021-05-26 10:45 ` [patch net-next 3/3] mlxsw: core: use PSID string define in devlink info Jiri Pirko
2021-05-27 22:00 ` [patch net-next 0/3] mlx*: devlink dev info versions adjustments patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2021-05-26 10:45 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, mlxsw, idosch
From: Jiri Pirko <jiri@nvidia.com>
To be aligned with the rest of the drivers, expose FW version under "fw"
keyword in devlink dev info, in addition to the existing "fw.version",
which is currently Mellanox-specific.
devlink output before:
running:
fw.version 30.2008.2018
after:
running:
fw.version 30.2008.2018
fw 30.2008.2018
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
---
drivers/net/ethernet/mellanox/mlxsw/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index ad93e01b2cda..b543d4e87951 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1453,7 +1453,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
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch net-next 3/3] mlxsw: core: use PSID string define in devlink info
2021-05-26 10:45 [patch net-next 0/3] mlx*: devlink dev info versions adjustments Jiri Pirko
2021-05-26 10:45 ` [patch net-next 1/3] net/mlx5: Expose FW version over defined keyword Jiri Pirko
2021-05-26 10:45 ` [patch net-next 2/3] mlxsw: core: " Jiri Pirko
@ 2021-05-26 10:45 ` Jiri Pirko
2021-05-27 22:00 ` [patch net-next 0/3] mlx*: devlink dev info versions adjustments patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2021-05-26 10:45 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, mlxsw, idosch
From: Jiri Pirko <jiri@nvidia.com>
Instead of having the string spelled out in the driver, use the global
define with the same value.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
---
drivers/net/ethernet/mellanox/mlxsw/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index b543d4e87951..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;
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch net-next 0/3] mlx*: devlink dev info versions adjustments
2021-05-26 10:45 [patch net-next 0/3] mlx*: devlink dev info versions adjustments Jiri Pirko
` (2 preceding siblings ...)
2021-05-26 10:45 ` [patch net-next 3/3] mlxsw: core: use PSID string define in devlink info Jiri Pirko
@ 2021-05-27 22:00 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-27 22:00 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, kuba, mlxsw, idosch
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Wed, 26 May 2021 12:45:06 +0200 you wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> Couple of adjustments in Mellanox drivers regarding devlink dev
> versions fill-up.
>
> Jiri Pirko (3):
> net/mlx5: Expose FW version over defined keyword
> mlxsw: core: Expose FW version over defined keyword
> mlxsw: core: use PSID string define in devlink info
>
> [...]
Here is the summary with links:
- [net-next,1/3] net/mlx5: Expose FW version over defined keyword
https://git.kernel.org/netdev/net-next/c/2754125ebd33
- [net-next,2/3] mlxsw: core: Expose FW version over defined keyword
https://git.kernel.org/netdev/net-next/c/f55c998c274e
- [net-next,3/3] mlxsw: core: use PSID string define in devlink info
https://git.kernel.org/netdev/net-next/c/7dafcc4c9dfb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread