From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D09E134BB for ; Mon, 24 Jul 2023 22:44:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3F1BC43391; Mon, 24 Jul 2023 22:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690238677; bh=s2U4wH3J1BEwd3118cI/GAlqlModOsh0C6qShVkcmyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzbOKDOChKqMn8D33KI+ScK78txJfF2B03RlKCMdl05iXGco5Pd3Nxrsu+h/OOvb5 2OvNbXbK3q+m7D/cAueruI1P15MDX+agYtJkDVWSoFViczmouOC9oDZyrWgo+ajPva UnUgTmZfbZ5+ucN5+asdwh2SgOq7nuyKrics/gtm7ip3pk8VFMRF6WSmfRPiZer/xx JUmFYaHa1HD2IXkQPcV2ZbTY8D8iGD1JAUZy8KlsCfEqw3kjbQVbfEeutb3IiylcqV dK6cdeHK818Ha6dhQbHl1hhKGRoEWCCWUN4exwD/jS77Z82nHjX5CY+ARQ8Q+xcJV6 1Xm/NfxKMoqnA== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: Saeed Mahameed , netdev@vger.kernel.org, Tariq Toukan , Shay Drory , Moshe Shemesh Subject: [net-next 08/14] net/mlx5: Remove redundant cmdif revision check Date: Mon, 24 Jul 2023 15:44:20 -0700 Message-ID: <20230724224426.231024-9-saeed@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724224426.231024-1-saeed@kernel.org> References: <20230724224426.231024-1-saeed@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Shay Drory mlx5 is checking the cmdif revision twice, for no reason. Remove the latter check. Signed-off-by: Shay Drory Reviewed-by: Moshe Shemesh Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index f175af528fe0..9ced943ebd0d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -2191,16 +2191,15 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) int align = roundup_pow_of_two(size); struct mlx5_cmd *cmd = &dev->cmd; u32 cmd_h, cmd_l; - u16 cmd_if_rev; int err; int i; memset(cmd, 0, sizeof(*cmd)); - cmd_if_rev = cmdif_rev(dev); - if (cmd_if_rev != CMD_IF_REV) { + cmd->vars.cmdif_rev = cmdif_rev(dev); + if (cmd->vars.cmdif_rev != CMD_IF_REV) { mlx5_core_err(dev, "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; } @@ -2233,14 +2232,6 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 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->token_lock); for (i = 0; i < MLX5_CMD_OP_MAX; i++) -- 2.41.0