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 D292F455AD for ; Mon, 15 Jul 2024 17:30:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD98340E19; Mon, 15 Jul 2024 17:30:44 +0200 (CEST) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by mails.dpdk.org (Postfix) with ESMTP id 829F140E18 for ; Mon, 15 Jul 2024 17:30:43 +0200 (CEST) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-52ea7bdde68so4803802e87.0 for ; Mon, 15 Jul 2024 08:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057443; x=1721662243; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9EXiGPhXPr0AZRU+Lc9KoYCQotR9bbZqzJ+velDcT4s=; b=h1wPC90L8aPvjejBnCg1Ec7afGKx8yJNC8tA5oT8kvTArNoUzwKpTTzpAMFA7+BYma ICEsDhtGh5VpowhZnyFohqGliRuqQmNqQEpnjK7Eky6BG2S0ZAc4t53Roe0SB/Z7YNEv K/01JnFMHC7dqzYx03+vLWZ6e5itU99S8ZeQzlU8KnRNwV9NGB7jq3oY34uOMownRnvK PBCU35tHUCZGgvEi6xbD+p/sblDW7zPWL7bJAYLeYS9JGmnJoORrMb5zRajYrTalNK3i ACNT5ODtnt37Wcoau3XZa4scfaT1AHw/8UM6Y4KsUIY2rGnBFrqShrrbmkyKhjgK2lMO TMfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057443; x=1721662243; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9EXiGPhXPr0AZRU+Lc9KoYCQotR9bbZqzJ+velDcT4s=; b=BfbALWXLsjH1PAmvcLh1qCxffKJ/BGjkHz9CtLYoojaGnZ58a/lTxrLOoO9pzzhW+F skoWMabq9bvylVDMOgN63wWAhmwkCPnI4yvZH7ZxVsdd+Uy3fRVEIAZKkFKWiwkVr638 PcFm7Y7MTwmJoyKVmXgB3B4W0Lw5LRFq76wvH7kzKorMVzx/YhHFcLyzxngipi1BQsgK 9TJugKAyNOjJwq9IBbjZAIzpW0mtZQb0h4UUF5rzSwv8muFgOJbIjRoz5K9VilatSYzA e1T/nhlynyc1Ln7fmItE8k5NVBDhi0pZ3dasnU0pW7e1gjxC5BeHgZtqOTNYWCSeNxmp g+tA== X-Gm-Message-State: AOJu0YwbsT1AzcfSTVbNDyFMt1bkZS3inDXggVX2ubiJhW75sj3u0cJK 7GxMhWggoToIWdZ418dnFoKLcvSjzhFmT8JOTy2oyYIqR0cbhlvsPD4lAMXbKxg= X-Google-Smtp-Source: AGHT+IHeC9rcc5C2yCyB4EML/RThoEalJZ+gM+8So3UVfzLqChs4JW7+infVqlBFW4SqsVBU7hTRsA== X-Received: by 2002:a05:6512:b16:b0:52e:a63d:e5c1 with SMTP id 2adb3069b0e04-52eb99a1941mr13901916e87.30.1721057442924; Mon, 15 Jul 2024 08:30:42 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680db0f18bsm6687257f8f.117.2024.07.15.08.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:30:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: keep PHY power down while device probing' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:45 +0100 Message-Id: <20240715152704.2229503-67-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.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 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e8d10f45d668ab89068f902466b32b00396dd75e Thanks. Luca Boccassi --- >From e8d10f45d668ab89068f902466b32b00396dd75e 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 83eedf423e..e1efa62015 100644 --- a/drivers/net/ngbe/base/ngbe_devids.h +++ b/drivers/net/ngbe/base/ngbe_devids.h @@ -83,6 +83,7 @@ #define NGBE_YT8521S_SFP_GPIO 0x0062 #define NGBE_INTERNAL_YT8521S_SFP_GPIO 0x0064 #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 27243d85c8..b9bb861adc 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -173,6 +173,9 @@ s32 ngbe_reset_hw_em(struct ngbe_hw *hw) ngbe_reset_misc_em(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); /* Store the permanent mac address */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:37.947690814 +0100 +++ 0067-net-ngbe-keep-PHY-power-down-while-device-probing.patch 2024-07-15 16:19:34.680208855 +0100 @@ -1 +1 @@ -From 01d94f0fb04cbb59e77b8b045616aeb11722bacf Mon Sep 17 00:00:00 2001 +From e8d10f45d668ab89068f902466b32b00396dd75e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 01d94f0fb04cbb59e77b8b045616aeb11722bacf ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ -index 22ccdb0b7d..4dced0d328 100644 +index 27243d85c8..b9bb861adc 100644