From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 090C746211 for ; Thu, 13 Feb 2025 11:03:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0326542EE7; Thu, 13 Feb 2025 11:03:19 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 733E442F41 for ; Thu, 13 Feb 2025 11:03:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Ip5fZ2cXT9qGVH6MCFvH2vmPJb2BqHh3LHhsB2nhMI=; b=DLgY2sZYJQ0AHSog7cUkrQl+03WrMcR230L+g6RsTF8mjPsOpf/gJm4/cB5Pg9H1f2DPzY zZJJYCQObV4ze7ZLX9UR8ZSybk9dwVd+52gXJ5u4TgHH0SwaV92PNeYQrAeFwxfW60w1rh lrDrnB26RbD9TpV3wu4VuiTYXrX7s0Y= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-576-LLjZcwJZPyW6dBcBPBicHA-1; Thu, 13 Feb 2025 05:03:15 -0500 X-MC-Unique: LLjZcwJZPyW6dBcBPBicHA-1 X-Mimecast-MFC-AGG-ID: LLjZcwJZPyW6dBcBPBicHA Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 868261903096; Thu, 13 Feb 2025 10:03:13 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 01C951800365; Thu, 13 Feb 2025 10:03:11 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: correct mPHY access logic' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:57 +0000 Message-ID: <20250213095933.362078-90-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 4pOf3Zk9LxpmzZkBt9JOg3Ps49cYkDw9kH-RrmNGxEU_1739440993 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/dddb2f7b48c88161476524da855223dfeac0da17 Thanks. Kevin --- >From dddb2f7b48c88161476524da855223dfeac0da17 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 6 Feb 2025 16:08:38 +0000 Subject: [PATCH] net/e1000/base: correct mPHY access logic [ upstream commit 62adddef81d4ddb9789e9f0e5a0899b399bd5d8d ] The original code had incorrect indentation, and the fix was applied to follow the indentation, i.e. adding brackets making the indentation valid. However, the actual issue was incorrect indentation and not missing braces, so the fix was incorrect. This fix restores the original logic and corrects indentation. Fixes: d5e39d1ca460 ("net/e1000/base: fix build with gcc 6") Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_phy.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c index 62d0be5080..208fb3f81b 100644 --- a/drivers/net/e1000/base/e1000_phy.c +++ b/drivers/net/e1000/base/e1000_phy.c @@ -4135,11 +4135,10 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) /* Disable access to mPHY if it was originally disabled */ - if (locked) { + if (locked) ready = e1000_is_mphy_ready(hw); - if (!ready) - return -E1000_ERR_PHY; - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, - E1000_MPHY_DIS_ACCESS); - } + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); return E1000_SUCCESS; @@ -4201,11 +4200,10 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, /* Disable access to mPHY if it was originally disabled */ - if (locked) { + if (locked) ready = e1000_is_mphy_ready(hw); - if (!ready) - return -E1000_ERR_PHY; - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, - E1000_MPHY_DIS_ACCESS); - } + if (!ready) + return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); return E1000_SUCCESS; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:44.195561734 +0000 +++ 0090-net-e1000-base-correct-mPHY-access-logic.patch 2025-02-12 17:29:34.556947159 +0000 @@ -1 +1 @@ -From 62adddef81d4ddb9789e9f0e5a0899b399bd5d8d Mon Sep 17 00:00:00 2001 +From dddb2f7b48c88161476524da855223dfeac0da17 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 62adddef81d4ddb9789e9f0e5a0899b399bd5d8d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - drivers/net/intel/e1000/base/e1000_phy.c | 22 ++++++++++------------ + drivers/net/e1000/base/e1000_phy.c | 22 ++++++++++------------ @@ -22 +23 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_phy.c b/drivers/net/intel/e1000/base/e1000_phy.c +diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c @@ -24,2 +25,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_phy.c -+++ b/drivers/net/intel/e1000/base/e1000_phy.c +--- a/drivers/net/e1000/base/e1000_phy.c ++++ b/drivers/net/e1000/base/e1000_phy.c