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 854B445804 for ; Fri, 23 Aug 2024 18:20:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 811214336F; Fri, 23 Aug 2024 18:20:40 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3F1264336D for ; Fri, 23 Aug 2024 18:20:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430038; 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=+FWe01qWoCGL1Lk5tFq6KRUhUeHMWPLl8jJsgTxfOhM=; b=i3dT4eRlvutrQoC3vF8tV3nKjWe5UGbCqH/3e5XEnjksS6VHb0C/XG8sBReRCBM2T1jkXc nZxAM5yGzTyVo5+es7jofirdXZKGeZU3vlMnnlgjWbwwDQsylFP2HYusdbbyoiz6GGfD2U 6NH10nKCHbXGovaB2k5M76GSxfEGDGU= Received: from mx-prod-mc-03.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-623-Pz0i9flLMQ-ysMH2-tjWOw-1; Fri, 23 Aug 2024 12:20:35 -0400 X-MC-Unique: Pz0i9flLMQ-ysMH2-tjWOw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CE5751955F3D; Fri, 23 Aug 2024 16:20:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 26B851956053; Fri, 23 Aug 2024 16:20:32 +0000 (UTC) From: Kevin Traynor To: Venkat Kumar Ande Cc: Selwin Sebastian , dpdk stable Subject: patch 'net/axgbe: fix linkup in PHY status' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:35 +0100 Message-ID: <20240823161929.1004778-27-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/c2baa4b8da3005ad18a1ec2e4c1267c5f399b111 Thanks. Kevin --- >From c2baa4b8da3005ad18a1ec2e4c1267c5f399b111 Mon Sep 17 00:00:00 2001 From: Venkat Kumar Ande Date: Tue, 4 Jun 2024 17:41:45 +0530 Subject: [PATCH] net/axgbe: fix linkup in PHY status [ upstream commit 50362d0e1f386563a026b314bd0a7eedcd188910 ] In the event of a change in axgbe mode, the current auto-negotiation needs to be reset and the AN cycle needs to be re-triggered. However, the current code ignores the return value of axgbe_set_mode(), leading to false information as the link is declared without checking the status register. Fix this by propagating the mode switch status information to axgbe_phy_status(). Fixes: 102b6ec3d5c3 ("net/axgbe: support auto-negotiation for 1Gbps") Signed-off-by: Venkat Kumar Ande Acked-by: Selwin Sebastian --- drivers/net/axgbe/axgbe_mdio.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index e573ecc4d9..ce449f3ed6 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -236,11 +236,12 @@ static void axgbe_switch_mode(struct axgbe_port *pdata) } -static void axgbe_set_mode(struct axgbe_port *pdata, +static bool axgbe_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode) { if (mode == axgbe_cur_mode(pdata)) - return; + return false; axgbe_change_mode(pdata, mode); + return true; } @@ -1040,5 +1041,5 @@ static enum axgbe_mode axgbe_phy_status_aneg(struct axgbe_port *pdata) } -static void axgbe_phy_status_result(struct axgbe_port *pdata) +static bool axgbe_phy_status_result(struct axgbe_port *pdata) { enum axgbe_mode mode; @@ -1074,5 +1075,8 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) pdata->phy.duplex = DUPLEX_FULL; - axgbe_set_mode(pdata, mode); + if (axgbe_set_mode(pdata, mode)) + return true; + else + return false; } @@ -1141,5 +1145,8 @@ static void axgbe_phy_status(struct axgbe_port *pdata) } } - axgbe_phy_status_result(pdata); + + if (axgbe_phy_status_result(pdata)) + return; + if (rte_bit_relaxed_get32(AXGBE_LINK_INIT, &pdata->dev_state)) rte_bit_relaxed_clear32(AXGBE_LINK_INIT, -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.785123035 +0100 +++ 0027-net-axgbe-fix-linkup-in-PHY-status.patch 2024-08-23 17:18:09.646429847 +0100 @@ -1 +1 @@ -From 50362d0e1f386563a026b314bd0a7eedcd188910 Mon Sep 17 00:00:00 2001 +From c2baa4b8da3005ad18a1ec2e4c1267c5f399b111 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 50362d0e1f386563a026b314bd0a7eedcd188910 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index e1a737cf62..d95a52659e 100644 +index e573ecc4d9..ce449f3ed6 100644 @@ -28 +29 @@ -@@ -201,11 +201,12 @@ static void axgbe_switch_mode(struct axgbe_port *pdata) +@@ -236,11 +236,12 @@ static void axgbe_switch_mode(struct axgbe_port *pdata) @@ -43 +44 @@ -@@ -1008,5 +1009,5 @@ static enum axgbe_mode axgbe_phy_status_aneg(struct axgbe_port *pdata) +@@ -1040,5 +1041,5 @@ static enum axgbe_mode axgbe_phy_status_aneg(struct axgbe_port *pdata) @@ -50 +51 @@ -@@ -1042,5 +1043,8 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) +@@ -1074,5 +1075,8 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) @@ -60 +61 @@ -@@ -1109,5 +1113,8 @@ static void axgbe_phy_status(struct axgbe_port *pdata) +@@ -1141,5 +1145,8 @@ static void axgbe_phy_status(struct axgbe_port *pdata)