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 8201C431D5 for ; Sun, 22 Oct 2023 16:26:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C46F40A76; Sun, 22 Oct 2023 16:26:05 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2088.outbound.protection.outlook.com [40.107.220.88]) by mails.dpdk.org (Postfix) with ESMTP id 601FC406B7 for ; Sun, 22 Oct 2023 16:26:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LQY9X3l4jQtAAgGhuiVoGxhB/BodgGma9qeFpNtMHcxxTCkJPK5zRc0bw5GWAbQ/VyRr62nWh1R6/fNJcKoVBpbdGy0whdYt8gidZXljCEgn1I0T/glv7nMZdrGs0FU/jm5zmyIBiJtieJjKuTuki1eOXWLVJ+EkUcIlKpcBGOY+IwQwF0TJIaNhU9BZi5rkdu4ZoxLYHk7Z+TkxGqNSOL5L57PMl6m5XG7Rf1fYXRby5y9Z7oeHi9chSwfNMSJOfYhWhSdLNA+SRtR1JOHEpCzr9vteBkKTlLiBgcaS9lQ6qLbk3VkNR/XXGrSbGKKxG8v1E2yYPlR080M6jqLemQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=JQpgAR+4rvVm2ZPfcwENFCkEiMCH7ci18eKMgQCLkTs=; b=cX/wtf+cGK3WyWIkjYuQMgOCXSuUu3D2P18Erku8mJkDw7KH1rbLqU8Kc1EPiMD8SkM/5D21pZBn7cTK0ma+rPqWid2o+4l/Poq+/tdUsIg5ZOb7iE7Gq7yUM++Ycz1o4kWEe161Zg2pTVlJTBpXV+2U1hsUX6IpIndLHqvbbWcIsZMhfEChi9TNSyvnKpq7P3FQccdbZgTDnxZOoqKQ+8sDYU3PswEv7ZT1HZmjlgxR+VgiadvMt9TlLBdRr+UQcbd/eZiMPiREeoTdHLbERj1SKv4dHvvn6TRnWXUKVPAN8xGwwl/AkkyBdOVoSjmpJV+KncK6UK+1w/BvNdHmPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.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 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=JQpgAR+4rvVm2ZPfcwENFCkEiMCH7ci18eKMgQCLkTs=; b=raNlgC7IMT69pDXm7jgUgabbKIkCwmVZOXAMbS7K6Osuo+nUD2WwCw3vqFv/4U2pTdaCYVNvRr4j4S6xaZgC/B7eKIgthsN50UivIWXIZQileSy6maBh53Mhp3joJjyxfXODivGDc2b/ovJorq1kQAytVFkum07RW62xGyijU+ZD60sheJBbLSh/r6Y5quR25QNWyhHFHPtfu31HC2EDsBTCYsfFgXR3eARH8Abz3nSr+xZSyO7pVTGK9YwenQnwo2shsS7Xs0BjBJORStBWN5/b88iKJ6cYVVo5ePmZcS0/g+7R+76MmIuacLlZrRB2SUmmZuyTdIJtR8qi9dK0Ow== Received: from MW4PR03CA0061.namprd03.prod.outlook.com (2603:10b6:303:b6::6) by BL1PR12MB5045.namprd12.prod.outlook.com (2603:10b6:208:310::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:26:02 +0000 Received: from CO1PEPF000044F1.namprd05.prod.outlook.com (2603:10b6:303:b6:cafe::c3) by MW4PR03CA0061.outlook.office365.com (2603:10b6:303:b6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:26:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000044F1.mail.protection.outlook.com (10.167.241.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:26:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:25:49 -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.986.41; Sun, 22 Oct 2023 07:25:47 -0700 From: Xueming Li To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: keep link down after device close' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:00 +0800 Message-ID: <20231022142250.10324-32-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F1:EE_|BL1PR12MB5045:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d430235-ac96-4659-2ab8-08dbd30ad15e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2LqzvNWKmaod9GBhPmHMrkETNzTkjzCSIrBw4y6kZfKvdx61VlqEzQTX5Wj9ED3K91D9N43dToYRGvo7Vkp2qQqzJeykPAfj2ZQza/Rmt/D+Cn77APQYkiGwad9DjM+XjONzpXa0nLMG9nfNH52ojr6iUYxuFwo4zCgolkqsbQkefzqDYRnzaW7Cus7xKbLNFQ/r74zFUR/w10n6dDmWQwpp4uKRMm862tp1kfjhDSZMjMhV1pyDt+ItqBEPVp7VYRBzeFYwUlGN89PSLLhxevWg9RSKvyxPqL4ncCCo1KPHRhYNmpH4lDcu/3EeGXZSH+6v+ecqsC+fTv9BfcVCJHrItduB+tAWMw1Kuyn77UysJeKnyhORvhRxcTfpwBHfJlD5dqGtpsdNHYFCY6VF6HP3ukWL7v0BdABQ+QSM27Lj/U+pYWuhW+5MRkAPA3+gYvsy6IJ3+vItwsdF6z/AvGbp16YQTvtQOw609MHKPleF3FZtQ0jveYhOE+pju57rbIgur+HCiGATLdEFhMD8wYLweT4U64oMoZ+sc6NEa2w2blKngNiUotCp8SAtNe0YXFoXzUC3bOXd8PTlvJZom7U3ksgAvozLj/yfFrRlXEIp9eE53WoxCSA6ebf3ysv9Xqr2boFu+5C+npHcZncAadzqKSiAenWXD0YStsQSLscurqaJE7cQw7TGJSFEBoHVeHA4gbCWT9Q/1NrBC4To4z7rlSq8IwLx0QiNP008xRDYLFRtdtM5m8JxH1gEEpWaTCKsYQE8ftKYN/smoIobLBgT3iumb5cVAaii1nuqP+k= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(396003)(136003)(346002)(39860400002)(230922051799003)(186009)(64100799003)(82310400011)(1800799009)(451199024)(46966006)(40470700004)(36840700001)(55016003)(40460700003)(36860700001)(6666004)(336012)(4326008)(83380400001)(8676002)(5660300002)(426003)(8936002)(41300700001)(7696005)(6286002)(26005)(47076005)(2906002)(53546011)(16526019)(2616005)(1076003)(40480700001)(86362001)(36756003)(4001150100001)(316002)(70206006)(70586007)(6916009)(356005)(478600001)(82740400003)(966005)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:26:01.6925 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d430235-ac96-4659-2ab8-08dbd30ad15e 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5045 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.4 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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=adb1b606012dd1ac8f0374177c6432cd325347a3 Thanks. Xueming Li --- >From adb1b606012dd1ac8f0374177c6432cd325347a3 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 Cc: Xueming Li [ 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 7b558940c3..5f596e9ab9 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1917,7 +1917,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev) struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev); if (hw->adapter_stopped) - return 0; + goto out; PMD_INIT_FUNC_TRACE(); @@ -1940,14 +1940,6 @@ txgbe_dev_stop(struct rte_eth_dev *dev) for (vf = 0; vfinfo != NULL && vf < pci_dev->max_vfs; vf++) 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); /* Clear stored conf */ @@ -1978,6 +1970,16 @@ txgbe_dev_stop(struct rte_eth_dev *dev) dev->data->dev_started = 0; 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:35.577311400 +0800 +++ 0031-net-txgbe-keep-link-down-after-device-close.patch 2023-10-22 22:17:34.186723700 +0800 @@ -1 +1 @@ -From 409a08c34fd20a25dd209438f52cb38ace081b19 Mon Sep 17 00:00:00 2001 +From adb1b606012dd1ac8f0374177c6432cd325347a3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 409a08c34fd20a25dd209438f52cb38ace081b19 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index e789e34c01..2dad820cb5 100644 +index 7b558940c3..5f596e9ab9 100644 @@ -23 +25 @@ -@@ -1929,7 +1929,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev) +@@ -1917,7 +1917,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev) @@ -32 +34 @@ -@@ -1953,14 +1953,6 @@ txgbe_dev_stop(struct rte_eth_dev *dev) +@@ -1940,14 +1940,6 @@ txgbe_dev_stop(struct rte_eth_dev *dev) @@ -47 +49 @@ -@@ -1991,6 +1983,16 @@ txgbe_dev_stop(struct rte_eth_dev *dev) +@@ -1978,6 +1970,16 @@ txgbe_dev_stop(struct rte_eth_dev *dev)