From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 0151345610
for <public@inbox.dpdk.org>; Fri, 12 Jul 2024 12:52:46 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id EE7B2402E5;
Fri, 12 Jul 2024 12:52:45 +0200 (CEST)
Received: from NAM10-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam10on2059.outbound.protection.outlook.com [40.107.93.59])
by mails.dpdk.org (Postfix) with ESMTP id DB39E42F07
for <stable@dpdk.org>; Fri, 12 Jul 2024 12:52:43 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=urBkh1bVAD7IUB9/MLylqsQzRKnkfD+p3vkERPskK1LHf5/nimTM7nt/Wi8/hbO9Cb6oGh/lMqKK3a033PDVciPJa2/NUXNML/hC/1Cc+h4if3avMOtFhD/W8BPmSH+tLrHhg6yINOgT/BhzqgaJg1wLXRr1RBRD/3cFyqKHFMZzLkk4+kgET0M4ch/MzkJezTyxjzbbrU7ycfnxT4y03rrQ8A7CiQ22FV6GzeARcMcwcv8ru+oZnf/Avcsc7/w9Mje6PUbVfuhAMAz/U+9ZDGSbDa1cyPRJpIacB5Jjj0GB5fUqaSYf9YcAMPA9O8u6/LN+Lv6rPRSz0gg1MeIIZA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=Oi7IfznWmjYizEfDQN4FoQ/Qxt550RTcQUfJg+T81Q0=;
b=fG2SezuueAGaFnP2TCfU5HpLw+4KukoLiqTb3VHKFBrZnYLnXrdKXyVSb+qEVoArds+9NXtE2o0hncTJguoM4NZuJfJHho7cHUImUoW524hhsCVgfCNgGGuMbZFf67E9P8AABBXbZxhEgjX0wbJ4N0uyD4RHQJxr28feApW9uxcfnEFEJSiCL5JMEPB1ypSJX5NRibg+Ytp+QgXL3NrbFnHsmze1qkXDSkkhjWAvMMuNubEtuyrGrq9kflvSX04EcS7ozDOF66t3cZDSCFMJCwRvH1c0fGMPgm6/QTjFTwy2iZjop3Ayt9sRIu8YJaROYGGCXUUAoN3cWQOGqGcm1w==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com;
dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;
dkim=none (message not signed); arc=none (0)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=Oi7IfznWmjYizEfDQN4FoQ/Qxt550RTcQUfJg+T81Q0=;
b=GeyJMzhNxEzjaEP9VCfIp/gTt6qZF6gM4iplMEDQFfcvfR5flyYDpLI5QmZEZlwkjngznKkSAr4NhCQ01JBqGqeJ7DwnyOeUzE0wf1GszExzGBg5jgoerRXZiOz2yrrbLhJfg8JYJoqeu2QwUveTsB/ey+eLc7Bd4TZcNl5K5vV664xxE2WadLcUorBicpWWM/3PS4nZcb2PCi8/bONUvoOyGZqZdP1A/5423esYIib0Ku1UBCfxpTjUg5+PyBqBt1A8YKukH5wfIPx+C3JVDNO4gr4FJqdcr/Ws+71mLX6dduVuX/jNeiTagHRB2jRLvaKRs9uGJiCKlgd2uuov4g==
Received: from BL1PR13CA0113.namprd13.prod.outlook.com (2603:10b6:208:2b9::28)
by LV2PR12MB5752.namprd12.prod.outlook.com (2603:10b6:408:177::19)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul
2024 10:52:39 +0000
Received: from BN2PEPF000055DC.namprd21.prod.outlook.com
(2603:10b6:208:2b9:cafe::d4) by BL1PR13CA0113.outlook.office365.com
(2603:10b6:208:2b9::28) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend
Transport; Fri, 12 Jul 2024 10:52:39 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161)
smtp.mailfrom=nvidia.com;
dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.117.161 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C
Received: from mail.nvidia.com (216.228.117.161) by
BN2PEPF000055DC.mail.protection.outlook.com (10.167.245.6) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:52:39 +0000
Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com
(10.129.200.67) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul
2024 03:52:23 -0700
Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com
(10.129.68.8) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul
2024 03:52:21 -0700
From: Xueming Li <xuemingl@nvidia.com>
To: Anatoly Burakov <anatoly.burakov@intel.com>
CC: Bruce Richardson <bruce.richardson@intel.com>, dpdk stable
<stable@dpdk.org>
Subject: patch 'net/e1000/base: fix link power down' has been queued to stable
release 23.11.2
Date: Fri, 12 Jul 2024 18:44:51 +0800
Message-ID: <20240712104528.308638-66-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com>
References: <20240712104528.308638-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [10.126.231.35]
X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To
rnnvmail201.nvidia.com (10.129.68.8)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: BN2PEPF000055DC:EE_|LV2PR12MB5752:EE_
X-MS-Office365-Filtering-Correlation-Id: c55271a6-da1d-4183-fee2-08dca260bf74
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|376014|1800799024|82310400026|36860700013;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?D1SkJMaI4eD44bebtzCeqvS4zjwjfuPeth122lktw6z+6h8baXA8VKG0K/3C?=
=?us-ascii?Q?ENw1d6tg7WO2Ul3ad9PKc4yAH/hwb0p3PX3CjcUsphRqniEXtPzRc9g8SwAD?=
=?us-ascii?Q?zfDg5Rhj8NxonoMbfDfaU8OPaZ2Bl9I4MEz/Apl4zcjPLSLVKh0eFqOmEEXq?=
=?us-ascii?Q?gTf8jhfYwExpvQZp8J/1/TPjJSQ381pgXJLExmlOLJ7331tEmytZp+ecDFUJ?=
=?us-ascii?Q?182FOww5Ono+fORv8/v2BQ12wgO7IUMThoe/klVtbzUNW6U8yuO61jkROLRI?=
=?us-ascii?Q?sTrw+i5hued6+09jkDSDydeECy+VIJOB0P+ORfU68DS+BfUyDYoTMspHSS/F?=
=?us-ascii?Q?uLKZ2DnkzbKgZVIOWjy0VoJggQk/KJC23WME1P7BxpLwr8e3oHSeDys942KB?=
=?us-ascii?Q?qbqeqEFUEm45EjR28nwN5cwVQ/y+UaB8O9we02CqzltoKeyRtx4oRm541IUZ?=
=?us-ascii?Q?gBBeSxfLbGuSks+QhKh1AFaENLqaba42AlKD4owszOmiEq8ByjTPAC+pxyMl?=
=?us-ascii?Q?ZcdeWoqKmrkPLcVqjxOmGHZg21MVsIzvwQ6sNx5pJSPYhmnQNKWeLnKMl8QM?=
=?us-ascii?Q?RnVsbhLO8OiGgZZDB44QvtGJpNWdk8twAhx00g1NpEdjojJhVDbjLnJuAJeF?=
=?us-ascii?Q?Oz2WZiFJla1y1d2tfic9N7ssyQ98Wlb4rOnkuwLqdhrZbCi2WlxSnwMW3LHT?=
=?us-ascii?Q?ZdLA0TiU/0pOblNm9KQkuy9rTdAkCJyjKuO/YNCkwfj42FkOhiGL0/JpuM8O?=
=?us-ascii?Q?UeAwXsWhP7AUcnTrbaLIc11HBQcSu0eN+aPOlfUJ5PI+XsaDwuiymS4pTuvq?=
=?us-ascii?Q?RK+IW6AO4wBL1Kj+YywKjv4OydkJs0HdgB4KRN8OMW6vhuG/oIt+WxQG/Q9Z?=
=?us-ascii?Q?Ohm46/vi5Pz+0XTfuASGlVhUAFWB3GoOq9Mu8g4F9iNyqk9H9NxVlhUwTNJR?=
=?us-ascii?Q?UzPUKIh2eDsJbkYDjF47+OYeY0H/JZPup6nnWjnRgdD+Bq/b9JtRwyzvOzV+?=
=?us-ascii?Q?O4ir1gr+aKWdwTrANVJDu+fGhORqwQ8pR+qEkZgUeita2bHTVZKJjsaAttME?=
=?us-ascii?Q?YuUCTXPZqxuCKDb65Kv+hhpBGJH1u6ZCEx9dl+QGxIg6QkMWB3vOCxmDNBQT?=
=?us-ascii?Q?olGISOpwQpxjdOADjzvQfjqiiKWxADzPeeh0SYugA0fgfyq3v9gwgpEweY1x?=
=?us-ascii?Q?YXnBwgOE+YayjhOT69CE3NFFuS1/b3eVWFsdWQyCAYpNF08FkLePMEdj4HxW?=
=?us-ascii?Q?ZlPAz+dWVTXz+rGV+/Tvd1kRFSMLl/jnLYn7nfT09cf347W8Vb1r9pMQDzgC?=
=?us-ascii?Q?BtSwK3HcbYiFJymCtjtZ02QDgO2QNcDMOQ8WgOiR/UIGAzoIwSygdW7K4+Bx?=
=?us-ascii?Q?kbcMjbDlO3iPB9c6X5/nekXoPOAXeR5N3QQtr5OGSXipMOHJhFaZP0gE8JQx?=
=?us-ascii?Q?/ZT1GoRmWgLOuRGG05Um5bqCuhHv2yze?=
X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE;
SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013); DIR:OUT;
SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:39.0412 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: c55271a6-da1d-4183-fee2-08dca260bf74
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000055DC.namprd21.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5752
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 23.11.2
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/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e883a2d8438f4bbed1dd3a99ecd32cd7ff5b275d
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From e883a2d8438f4bbed1dd3a99ecd32cd7ff5b275d Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Tue, 14 May 2024 16:17:16 +0100
Subject: [PATCH] net/e1000/base: fix link power down
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit a8218d09e3aaae5307325ff4b2f92ed4a3c37a8c ]
Current code is a result of work to reduce duplication between various
device models. However, the logic that was replaced did not exactly
match the new logic, and as a result the link power down was not
working correctly for some NICs, and the link remained up even when
the interface is down.
Fix it to correctly power down the link under all circumstances that
were supported by old logic.
Fixes: 44dddd14059f ("net/e1000/base: remove duplicated codes")
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/e1000/base/e1000_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c
index ab73e1e59e..3ec32e7240 100644
--- a/drivers/net/e1000/base/e1000_base.c
+++ b/drivers/net/e1000/base/e1000_base.c
@@ -107,7 +107,7 @@ void e1000_power_down_phy_copper_base(struct e1000_hw *hw)
return;
/* If the management interface is not enabled, then power down */
- if (phy->ops.check_reset_block(hw))
+ if (!(e1000_enable_mng_pass_thru(hw) || phy->ops.check_reset_block(hw)))
e1000_power_down_phy_copper(hw);
}
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-07-12 18:40:17.115400766 +0800
+++ 0065-net-e1000-base-fix-link-power-down.patch 2024-07-12 18:40:14.156594221 +0800
@@ -1 +1 @@
-From a8218d09e3aaae5307325ff4b2f92ed4a3c37a8c Mon Sep 17 00:00:00 2001
+From e883a2d8438f4bbed1dd3a99ecd32cd7ff5b275d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit a8218d09e3aaae5307325ff4b2f92ed4a3c37a8c ]
@@ -16 +18,0 @@
-Cc: stable@dpdk.org