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 DA5437F7F5; Wed, 7 Aug 2024 15:14:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723043684; cv=none; b=SUIdCeT0hVbdvLXLPpSo5OLI8OKIAZEmJ6PsEj42H6ODfjYucMJ5WQH0ATiVUGMk83s/ErVUY7YGwkH+fgvRQTfb7FuQ3wDpvvrI7abiCdrLdhSgAK5eQmlrbPYj7QbqMho/d291f2ee/5n9hui8dKgyXdfUNOaCBEwZWaSDau8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723043684; c=relaxed/simple; bh=/33FugNLN2sP3BgQiBF3dU7OLYzMpQaDA5Fg1rBW+rE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KyiA/qCFmRniRLoXUH32yAPKRDjN4J18ylebvxsUhaNk9eLrc+4gAsx+hyfDTNplYXOmtCp0oZCquWH8sGOcGd1cBFt7mYrqDKPegU7q0jqPuMFdE52bjnQio0oWepEw90bYUit8u9MXSLpsKAtflB9y254hEkt+7/dhpnWmQqQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CxItA+QC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CxItA+QC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62166C32781; Wed, 7 Aug 2024 15:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723043684; bh=/33FugNLN2sP3BgQiBF3dU7OLYzMpQaDA5Fg1rBW+rE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CxItA+QCFHmaIz/Evl2gQDZ9p3VcfKm84ilUB9daLrqr7Arm+BtDsp0iV82HLjssa TGcRGZ+8zL1H7hjBw+mlsiRz8Ev+ac5c9wAmW52e99MgH5z/3rknoc+HwJp4wVdY7r S5gvtoJpeIACgoSnDlU6gblxO2cVafAuFDX7Ts6s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shahar Shitrit , Carolina Jubran , Tariq Toukan , Wojciech Drewek , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 62/86] net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys Date: Wed, 7 Aug 2024 17:00:41 +0200 Message-ID: <20240807150041.301192814@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240807150039.247123516@linuxfoundation.org> References: <20240807150039.247123516@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shahar Shitrit [ Upstream commit 3f8e82a020a5c22f9b791f4ac499b8e18007fbda ] Since the documentation for mlx5_toggle_port_link states that it should only be used after setting the port register, we add a check for the return value from mlx5_port_set_eth_ptys to ensure the register was successfully set before calling it. Fixes: 667daedaecd1 ("net/mlx5e: Toggle link only after modifying port parameters") Signed-off-by: Shahar Shitrit Reviewed-by: Carolina Jubran Signed-off-by: Tariq Toukan Reviewed-by: Wojciech Drewek Link: https://patch.msgid.link/20240730061638.1831002-9-tariqt@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index ceeb23f478e15..3ee61987266c4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -1223,7 +1223,12 @@ int mlx5e_ethtool_set_link_ksettings(struct mlx5e_priv *priv, if (!an_changes && link_modes == eproto.admin) goto out; - mlx5_port_set_eth_ptys(mdev, an_disable, link_modes, ext); + err = mlx5_port_set_eth_ptys(mdev, an_disable, link_modes, ext); + if (err) { + netdev_err(priv->netdev, "%s: failed to set ptys reg: %d\n", __func__, err); + goto out; + } + mlx5_toggle_port_link(mdev); out: -- 2.43.0