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 969524326F for ; Thu, 2 Nov 2023 14:13:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1276C42DA7; Thu, 2 Nov 2023 14:13:49 +0100 (CET) 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 3598C42D80 for ; Thu, 2 Nov 2023 14:13:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930825; 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=dzfBXjvR2WAIzvJO2KUdyAN6wGnriPSLJbPrW6Iu1/M=; b=LHRTllVA02J+5KCxihOaeIRb/vTlsUNJubkN76jqfkxl3iRF9I89xBONpoum1j8dl8CtyP tehj4aTrJ539YLuZIUU7TIcMqdZOeTbg4CcKXd2sxT+yWbZvwEzRsqWLgisTK/5RIxBibi 2PvQAhTy3Fvty18Cw3EkIcv3Vc5gyKM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-403-437kR00nOMapF6eVbEFsNA-1; Thu, 02 Nov 2023 09:13:42 -0400 X-MC-Unique: 437kR00nOMapF6eVbEFsNA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C49F85A59D; Thu, 2 Nov 2023 13:13:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF91F492BFA; Thu, 2 Nov 2023 13:13:41 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: keep link down after device close' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:28 +0000 Message-ID: <20231102131254.315947-22-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/23. 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/5658f2dd846746d6fd5ff567a8abfd5da41079c2 Thanks. Kevin --- >From 5658f2dd846746d6fd5ff567a8abfd5da41079c2 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Thu, 28 Sep 2023 17:47:55 +0800 Subject: [PATCH] net/ngbe: keep link down after device close [ upstream commit 3dd64cf80ed5142eeb0a8e3051a583fb38761221 ] When the port is closed, hardware is reset to power on. And ngbe_dev_stop() is just returned 0 to avoid secondary calls, so that the link led remains on. Fix this bug by adding to turn off the PHY power. Fixes: 3518df5774c7 ("net/ngbe: support device start/stop") Fixes: 708ebe7d0399 ("net/ngbe: fix external PHY power down") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 6ec15b60de..c6e37150e2 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -1146,5 +1146,5 @@ ngbe_dev_stop(struct rte_eth_dev *dev) if (hw->adapter_stopped) - return 0; + goto out; PMD_INIT_FUNC_TRACE(); @@ -1197,4 +1197,8 @@ ngbe_dev_stop(struct rte_eth_dev *dev) dev->data->dev_started = 0; +out: + /* close phy to prevent reset in dev_close from restarting physical link */ + hw->phy.set_phy_power(hw, false); + return 0; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.418444165 +0000 +++ 0022-net-ngbe-keep-link-down-after-device-close.patch 2023-11-02 13:09:40.805163310 +0000 @@ -1 +1 @@ -From 3dd64cf80ed5142eeb0a8e3051a583fb38761221 Mon Sep 17 00:00:00 2001 +From 5658f2dd846746d6fd5ff567a8abfd5da41079c2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3dd64cf80ed5142eeb0a8e3051a583fb38761221 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/ngbe/ngbe_ethdev.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + drivers/net/ngbe/ngbe_ethdev.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) @@ -21 +22 @@ -index dd387779ab..1cdd56497e 100644 +index 6ec15b60de..c6e37150e2 100644 @@ -24 +25 @@ -@@ -1168,5 +1168,5 @@ ngbe_dev_stop(struct rte_eth_dev *dev) +@@ -1146,5 +1146,5 @@ ngbe_dev_stop(struct rte_eth_dev *dev) @@ -31,8 +32 @@ -@@ -1190,6 +1190,4 @@ ngbe_dev_stop(struct rte_eth_dev *dev) - vfinfo[vf].clear_to_send = false; - -- hw->phy.set_phy_power(hw, false); -- - ngbe_dev_clear_queues(dev); - -@@ -1218,4 +1216,8 @@ ngbe_dev_stop(struct rte_eth_dev *dev) +@@ -1197,4 +1197,8 @@ ngbe_dev_stop(struct rte_eth_dev *dev)