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 96CA04326F for ; Thu, 2 Nov 2023 14:13:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C29A42D83; Thu, 2 Nov 2023 14:13:46 +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 5DC33402E3 for ; Thu, 2 Nov 2023 14:13:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930824; 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=z1bNh/nb9VNosyxyEyol90V5SCJr6IOjy4hAFHI95cY=; b=bmJfOU93Gkj66O+9D87ZLP8sH8ecePr5tQqoxeovvPCfGdg+wVI9n40pqJpAVJt1B1viqy d2/1G5u0vyrr37AyCnfegn8HRNPl2pjTMubRXg4ol772riEHCZGsr3vlcGZcTyPBSdTc7m Bh74kwXxRXIHuymPnV5zlLOcHUS0Qt0= 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-341-3jHy2HLsNqmqvEd-T4xjCQ-1; Thu, 02 Nov 2023 09:13:41 -0400 X-MC-Unique: 3jHy2HLsNqmqvEd-T4xjCQ-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 68608811E82; Thu, 2 Nov 2023 13:13:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9CA9492BFA; Thu, 2 Nov 2023 13:13:40 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: keep link down after device close' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:27 +0000 Message-ID: <20231102131254.315947-21-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/a3d1c5eb0801284c0680c3de7fea48c8dd178fbe Thanks. Kevin --- >From a3d1c5eb0801284c0680c3de7fea48c8dd178fbe Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Thu, 28 Sep 2023 17:47:54 +0800 Subject: [PATCH] net/txgbe: keep link down after device close [ upstream commit 409a08c34fd20a25dd209438f52cb38ace081b19 ] When the port is closed, hardware is reset to power on. And txgbe_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 copper/laser. Fixes: e0d876ef6bbc ("net/txgbe: support device stop and close") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 3b1baf7c48..2a3d9d9d5e 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1883,5 +1883,5 @@ txgbe_dev_stop(struct rte_eth_dev *dev) if (hw->adapter_stopped) - return 0; + goto out; PMD_INIT_FUNC_TRACE(); @@ -1902,12 +1902,4 @@ txgbe_dev_stop(struct rte_eth_dev *dev) vfinfo[vf].clear_to_send = false; - if (hw->phy.media_type == txgbe_media_type_copper) { - /* Turn off the copper */ - hw->phy.set_phy_power(hw, false); - } else { - /* Turn off the laser */ - hw->mac.disable_tx_laser(hw); - } - txgbe_dev_clear_queues(dev); @@ -1940,4 +1932,14 @@ txgbe_dev_stop(struct rte_eth_dev *dev) hw->dev_start = false; +out: + /* close phy to prevent reset in dev_close from restarting physical link */ + if (hw->phy.media_type == txgbe_media_type_copper) { + /* Turn off the copper */ + hw->phy.set_phy_power(hw, false); + } else { + /* Turn off the laser */ + hw->mac.disable_tx_laser(hw); + } + 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.393952837 +0000 +++ 0021-net-txgbe-keep-link-down-after-device-close.patch 2023-11-02 13:09:40.804163307 +0000 @@ -1 +1 @@ -From 409a08c34fd20a25dd209438f52cb38ace081b19 Mon Sep 17 00:00:00 2001 +From a3d1c5eb0801284c0680c3de7fea48c8dd178fbe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 409a08c34fd20a25dd209438f52cb38ace081b19 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e789e34c01..2dad820cb5 100644 +index 3b1baf7c48..2a3d9d9d5e 100644 @@ -23 +24 @@ -@@ -1930,5 +1930,5 @@ txgbe_dev_stop(struct rte_eth_dev *dev) +@@ -1883,5 +1883,5 @@ txgbe_dev_stop(struct rte_eth_dev *dev) @@ -30 +31 @@ -@@ -1954,12 +1954,4 @@ txgbe_dev_stop(struct rte_eth_dev *dev) +@@ -1902,12 +1902,4 @@ txgbe_dev_stop(struct rte_eth_dev *dev) @@ -43 +44 @@ -@@ -1992,4 +1984,14 @@ txgbe_dev_stop(struct rte_eth_dev *dev) +@@ -1940,4 +1932,14 @@ txgbe_dev_stop(struct rte_eth_dev *dev)