shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

net/mlx5: Remove redundant cmdif revision check

Browse Source 
[ Upstream commit 0714ec9ea1 ]

mlx5 is checking the cmdif revision twice, for no reason.
Remove the latter check.

Signed-off-by: Shay Drory <shayd@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Stable-dep-of: d62b14045c65 ("net/mlx5: Fix command bitmask initialization")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Shay Drory
2023-01-29 12:08:30 +02:00
committed by Greg Kroah-Hartman
parent 03015b6329
commit 5cd775efbb
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
View File

@@ -2216,16 +2216,15 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
int align = roundup_pow_of_two(size); int align = roundup_pow_of_two(size);
struct mlx5_cmd *cmd = &dev->cmd; struct mlx5_cmd *cmd = &dev->cmd;
u32 cmd_h, cmd_l; u32 cmd_h, cmd_l;
u16 cmd_if_rev;
int err; int err;
int i; int i;
memset(cmd, 0, sizeof(*cmd)); memset(cmd, 0, sizeof(*cmd));
cmd_if_rev = cmdif_rev(dev); cmd->vars.cmdif_rev = cmdif_rev(dev);
if (cmd_if_rev != CMD_IF_REV) { if (cmd->vars.cmdif_rev != CMD_IF_REV) {
mlx5_core_err(dev, mlx5_core_err(dev,
"Driver cmdif rev(%d) differs from firmware's(%d)\n", "Driver cmdif rev(%d) differs from firmware's(%d)\n",
CMD_IF_REV, cmd_if_rev); CMD_IF_REV, cmd->vars.cmdif_rev);
return -EINVAL; return -EINVAL;
} }
@@ -2258,14 +2257,6 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1; cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1;
cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1; cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1;
cmd->vars.cmdif_rev = ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;
if (cmd->vars.cmdif_rev > CMD_IF_REV) {
mlx5_core_err(dev, "driver does not support command interface version. driver %d, firmware %d\n",
CMD_IF_REV, cmd->vars.cmdif_rev);
err = -EOPNOTSUPP;
goto err_free_page;
}
spin_lock_init(&cmd->alloc_lock); spin_lock_init(&cmd->alloc_lock);
spin_lock_init(&cmd->token_lock); spin_lock_init(&cmd->token_lock);
for (i = 0; i < MLX5_CMD_OP_MAX; i++) for (i = 0; i < MLX5_CMD_OP_MAX; i++)