mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 06:30:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

net/mlx5: Remove dead code from total_vfs setter

Browse Source 
The mlx5_devlink_total_vfs_set function branches based on per_pf_support
twice. Remove the second branch as the first one exits the function when
per_pf_support is false.

Accidentally added as part of commit a4c49611cf ("net/mlx5: Implement
devlink total_vfs parameter").

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-rdma/aMQWenzpdjhAX4fm@stanley.mountain/
Signed-off-by: Vlad Dumitrescu <vdumitrescu@nvidia.com>
Link: https://patch.msgid.link/a6142a60-1948-439a-b0ae-ff1df26a37f8@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Vlad Dumitrescu
2025-09-18 15:05:07 -07:00
committed by Jakub Kicinski
parent 85c7333c35
commit 6a46e4faa8
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/mellanox/mlx5/core/lib/nv_param.c
View File

@@ -458,7 +458,6 @@ static int mlx5_devlink_total_vfs_set(struct devlink *devlink, u32 id,
{
struct mlx5_core_dev *dev = devlink_priv(devlink);
u32 mnvda[MLX5_ST_SZ_DW(mnvda_reg)];
bool per_pf_support;
void *data;
int err;
@@ -474,9 +473,7 @@ static int mlx5_devlink_total_vfs_set(struct devlink *devlink, u32 id,
return -EOPNOTSUPP;
}
per_pf_support = MLX5_GET(nv_global_pci_cap, data,
per_pf_total_vf_supported);
if (!per_pf_support) {
if (!MLX5_GET(nv_global_pci_cap, data, per_pf_total_vf_supported)) {
/* We don't allow global SRIOV setting on per PF devlink */
NL_SET_ERR_MSG_MOD(extack,
"SRIOV is not per PF on this device");
@@ -489,14 +486,8 @@ static int mlx5_devlink_total_vfs_set(struct devlink *devlink, u32 id,
return err;
MLX5_SET(nv_global_pci_conf, data, sriov_valid, 1);
MLX5_SET(nv_global_pci_conf, data, per_pf_total_vf, per_pf_support);
MLX5_SET(nv_global_pci_conf, data, per_pf_total_vf, 1);
if (!per_pf_support) {
MLX5_SET(nv_global_pci_conf, data, total_vfs, ctx->val.vu32);
return mlx5_nv_param_write(dev, mnvda, sizeof(mnvda));
}
/* SRIOV is per PF */
err = mlx5_nv_param_write(dev, mnvda, sizeof(mnvda));
if (err)
return err;