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 840BF45804 for ; Fri, 23 Aug 2024 18:23:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 706E44337C; Fri, 23 Aug 2024 18:23:15 +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 C968F4336F for ; Fri, 23 Aug 2024 18:23:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430192; 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=lLawsMEp979gsOp29/XkkUx0hLSBdAttwWEW7oRAQNw=; b=bEhXELtnUnGmuIUC7zmzjcoxnqVKwAzd7lqacF46C6xEUxwrcX+c5+DuyHh+ONRo/M3Z0f l2NaJ112O9kUEhRUsU8uqJYxF2A8fn5XM6laDs2Au1KTEAkOQn3AouSnHtGRHnF3rapt0+ YgdV3adoSGNGNFu7YfjI457dnKnYvks= 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-591-cX37_tnuNEap40pImiehtg-1; Fri, 23 Aug 2024 12:23:11 -0400 X-MC-Unique: cX37_tnuNEap40pImiehtg-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 624F61955D4C; Fri, 23 Aug 2024 16:23:09 +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 687881956053; Fri, 23 Aug 2024 16:23:07 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: keep PHY power down while device probing' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:48 +0100 Message-ID: <20240823161929.1004778-100-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/f557cce558df1e565edf1463e6d9477f25d5dc70 Thanks. Kevin --- >From f557cce558df1e565edf1463e6d9477f25d5dc70 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:39 +0800 Subject: [PATCH] net/ngbe: keep PHY power down while device probing [ upstream commit 01d94f0fb04cbb59e77b8b045616aeb11722bacf ] The internal PHY will be set to default power down after LAN reset, but the external PHY will not. To keep the PHY behavior consistent, set PHY power down uniformly here. Fixes: 708ebe7d0399 ("net/ngbe: fix external PHY power down") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_devids.h | 1 + drivers/net/ngbe/base/ngbe_hw.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/ngbe/base/ngbe_devids.h b/drivers/net/ngbe/base/ngbe_devids.h index 6010cc050e..75fb6d702a 100644 --- a/drivers/net/ngbe/base/ngbe_devids.h +++ b/drivers/net/ngbe/base/ngbe_devids.h @@ -78,4 +78,5 @@ #define NGBE_YT8521S_SFP 0x0060 #define NGBE_LY_YT8521S_SFP 0x0070 +#define NGBE_RGMII_FPGA 0x0080 #define NGBE_WOL_SUP 0x4000 #define NGBE_NCSI_SUP 0x8000 diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c index 08a7e02943..abfe800caf 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -174,4 +174,7 @@ s32 ngbe_reset_hw_em(struct ngbe_hw *hw) hw->mac.clear_hw_cntrs(hw); + if (!((hw->sub_device_id & NGBE_OEM_MASK) == NGBE_RGMII_FPGA)) + hw->phy.set_phy_power(hw, false); + msec_delay(50); -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.666141626 +0100 +++ 0100-net-ngbe-keep-PHY-power-down-while-device-probing.patch 2024-08-23 17:18:09.824430469 +0100 @@ -1 +1 @@ -From 01d94f0fb04cbb59e77b8b045616aeb11722bacf Mon Sep 17 00:00:00 2001 +From f557cce558df1e565edf1463e6d9477f25d5dc70 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 01d94f0fb04cbb59e77b8b045616aeb11722bacf ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 83eedf423e..e1efa62015 100644 +index 6010cc050e..75fb6d702a 100644 @@ -23,2 +24,2 @@ -@@ -84,4 +84,5 @@ - #define NGBE_INTERNAL_YT8521S_SFP_GPIO 0x0064 +@@ -78,4 +78,5 @@ + #define NGBE_YT8521S_SFP 0x0060 @@ -30 +31 @@ -index 22ccdb0b7d..4dced0d328 100644 +index 08a7e02943..abfe800caf 100644