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 7054F4301E for ; Thu, 10 Aug 2023 01:52:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 655DB40DD8; Thu, 10 Aug 2023 01:52:03 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2083.outbound.protection.outlook.com [40.107.100.83]) by mails.dpdk.org (Postfix) with ESMTP id AE4CC406B6 for ; Thu, 10 Aug 2023 01:52:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RN910iVksHpEKMHSnaxg9ZdTvQ1ZigjFPw4X42VhZrA9Ximuz1yb4F2e/gCunRznKmqdJRKF5dmE1hF4zeFX4x43N+VK/KTOGUOZ18KqtLHY11Y03kaU/C64V6VW0GQWCLqdcP6ti7vx1QtLzBMVBAoQPvGdxZWZe4Q93iuQ9vcgKm/bI40WSxfK9zGGyfj4E7fwDI+yVLlmB6lK5ySKH6QRLQrNrtS+/XhY/kug+3FIPQ/rC4ADMI1XjLzBwoh3K3vjp9D9SGXlUci/PMCmjf9mSknjF49t2FopCJu29KFZvDhWnfHRNOiNA5HLTyJkDt5Ux7iq9nPOFJLWPciR0A== 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=kHPx+MsAshTv4XGJwq6e3yPw4P34gxe3Xxda4RJi+sY=; b=lnIEcDsQWbmkDDNN2IHxWxAae5Qm/XRuYUaDpRXBhiZE3Q+F51c3U6AOIWH/ugRvFIy6KwtIsHFFSclgXbkfnht+y7K3ZQoirAesgkr80Ww8VsrTV+OE9iSficn0YSLicHesAtghfrfbwiA98Zsc5gh9IggyUBK4agK2Udp8k3/HHDjyyJG+79GECAeJrye+/8x7rckt3OIpy5DdeUfpYLrxZIZaRy4p1noJnc2rmZIZkC12UlbyYtHvC+81DRw1HFcUr3PPKkK0wkZIxwnunFh7DcpNaDhgyCOq22aHobPcYgZXVP12DJHqb2fK8ZBikYh28VSAGq3Gdi5zTGIwSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=kHPx+MsAshTv4XGJwq6e3yPw4P34gxe3Xxda4RJi+sY=; b=IUHd+ffIb/jDWI9n51Brfx/t2u5LmCyCND7kPCgw3bepNkV1o+0g7Pskr8m3lsjesOT6ikqpnJZA0P+3y3zy1hdNxYLIvD85U4DmPz1/98t4pvdfVvCvcFAGeRBZ/ZtoJfQrVoR0tto38wbL7I9beULafj/h45Z/KPXkpcCJzUxg7weOQ7b4a+y/kPG3Mrp8JHg2hT5Rse0ZSDCu5eAUSWxUXuIVYoEEh6/cp3mihtqqnBLxTtjqPnijLv0c9nRb6/3gRq6ZQcFmHHv7fMRKk0IOr/ah4MxPEP2zSurZ2bKj9KcLoxh1yQucHcnhPxgZ4siamZJMG/jWWA5BNGLxsQ== Received: from PH0P220CA0016.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:d3::19) by BL1PR12MB5175.namprd12.prod.outlook.com (2603:10b6:208:318::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:52:01 +0000 Received: from SA2PEPF000015CC.namprd03.prod.outlook.com (2603:10b6:510:d3:cafe::93) by PH0P220CA0016.outlook.office365.com (2603:10b6:510:d3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:52:00 +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 SA2PEPF000015CC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:52:00 +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.986.5; Wed, 9 Aug 2023 16:51:42 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Wed, 9 Aug 2023 16:51:41 -0700 From: Xueming Li To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe/base: fix Tx with fiber hotplug' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:44 +0800 Message-ID: <20230809234930.32424-23-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CC:EE_|BL1PR12MB5175:EE_ X-MS-Office365-Filtering-Correlation-Id: f2c2b887-8005-4e90-2fbe-08db99339f8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nyCpcB4VCnpxPbNScLyR8IUq/+mz9AX3bQNJYWj00TkmrPFVaITQokpfxfFIIxpmKIIJrfZEN4n4AiK0Shfi+RerhAwwjkb2weLGRXahqyAqChYky+QSAn61soi8d89fHY9rW6NxW9kfe05U2SpaSvSNnu4QxA6zDhfmPreMJeX7bWd6XEdRJGp3NqjUfjRh7Fhz+Y4J/MJcCXWs/cbfeYYu3KDGM2XX6SIaj+ONHEVr1o/LF2H1qAQl9LYCCByYzs2YGQIL+a7NPX2p3jpzmFPn1j1dPb0HuFqOsOtjatmwDg6CDNXBF9m3PkmGLLHyX/zD6FNwt/Ygt81wkGm5qDHMPl9t8idAPZr9rduc41nzBXF6X+/Pz/xrDgeZfV7ccypW7vVE4DA3MYXvyv2gEVxSf44AkyoE6BWB6cfsjIuBT9MeVQdLvzCM1kZ0T4E7t+xHGTcSEY5jZny3k2+crgxfBpmrrvFxw1fsa/yisMPeDGXdooSuSixqiZRIdr4iul2jgxbcWYcaNxfKWzca+sBxFuR+LH2fxT2YSPXemkex3bS5J0xK1ZoKjdGDRHCNr03DITgtAsZzBoejxn2D4Ut31UreCRiHIPZH6snnDp3TBFEaDGllPBqNn0xT9m4Pzfhmh2W/PM7Y+MFRQ5BxUzfDlFsstcXhKiaZ8watV3V0F88o2N5gzlDt8atctrIvXT0kvZw6UOlZZ7Fo09HTcAz1gyKcMHQWF/V3QjFPz+z+hzo7A4ZajT9ovOj+Xuoj4mW1czEoWQMgFxUYlXnw1A== 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:(13230028)(4636009)(376002)(346002)(39860400002)(136003)(396003)(451199021)(82310400008)(1800799006)(186006)(40470700004)(36840700001)(46966006)(6916009)(36860700001)(70206006)(70586007)(4326008)(966005)(478600001)(41300700001)(36756003)(336012)(16526019)(6286002)(316002)(26005)(1076003)(53546011)(7696005)(8936002)(8676002)(5660300002)(86362001)(356005)(83380400001)(40460700003)(2906002)(82740400003)(47076005)(426003)(2616005)(55016003)(40480700001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:52:00.0666 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f2c2b887-8005-4e90-2fbe-08db99339f8a 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: SA2PEPF000015CC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5175 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.3 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/11/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=d96c0259e78810bb9c8b298659d3a1f76ac33d18 Thanks. Xueming Li --- >From d96c0259e78810bb9c8b298659d3a1f76ac33d18 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Wed, 14 Jun 2023 10:34:21 +0800 Subject: [PATCH] net/txgbe/base: fix Tx with fiber hotplug Cc: Xueming Li [ upstream commit 196e412b80afe165ca78457d5f9bb1a5bace28ea ] Under heavy traffic, unplugging and plugging fiber optic cables may cause Tx failure. The reason is that there is still traffic passing through at PCS VR reset, during txgbe_set_link_to_*. So totally disable Rx and Tx before PCS VR reset to fix it. Fixes: 01c3cf5c85a7 ("net/txgbe: add autoneg control read and write") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_phy.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c index 87935abdaa..6bbb2a5e71 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -1519,8 +1519,9 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg) goto out; } - wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, - ~TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, ~TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, ~TXGBE_MACRXCFG_ENA); + hw->mac.disable_sec_tx_path(hw); /* 2. Disable xpcs AN-73 */ if (!autoneg) @@ -1734,8 +1735,9 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw, goto out; } - wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, - ~TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, ~TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, ~TXGBE_MACRXCFG_ENA); + hw->mac.disable_sec_tx_path(hw); /* 2. Disable xpcs AN-73 */ if (!autoneg) @@ -1941,8 +1943,9 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw, goto out; } - wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, - ~TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_TXE, ~TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, ~TXGBE_MACRXCFG_ENA); + hw->mac.disable_sec_tx_path(hw); /* 2. Disable xpcs AN-73 */ wr32_epcs(hw, SR_AN_CTRL, 0x0); @@ -2293,6 +2296,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) txgbe_set_sgmii_an37_ability(hw); } + hw->mac.enable_sec_tx_path(hw); + if (speed == TXGBE_LINK_SPEED_10GB_FULL) mactxcfg = TXGBE_MACTXCFG_SPEED_10G; else if (speed == TXGBE_LINK_SPEED_1GB_FULL) @@ -2302,6 +2307,7 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_SPEED_MASK | TXGBE_MACTXCFG_TXE, mactxcfg | TXGBE_MACTXCFG_TXE); + wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, TXGBE_MACRXCFG_ENA); } void txgbe_bp_down_event(struct txgbe_hw *hw) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.845253300 +0800 +++ 0022-net-txgbe-base-fix-Tx-with-fiber-hotplug.patch 2023-08-09 21:51:18.144352000 +0800 @@ -1 +1 @@ -From 196e412b80afe165ca78457d5f9bb1a5bace28ea Mon Sep 17 00:00:00 2001 +From d96c0259e78810bb9c8b298659d3a1f76ac33d18 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 196e412b80afe165ca78457d5f9bb1a5bace28ea ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index f4cadcc510..1eb45b068a 100644 +index 87935abdaa..6bbb2a5e71 100644 @@ -23 +25 @@ -@@ -1541,8 +1541,9 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg) +@@ -1519,8 +1519,9 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg) @@ -35 +37 @@ -@@ -1756,8 +1757,9 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw, +@@ -1734,8 +1735,9 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw, @@ -47 +49 @@ -@@ -1963,8 +1965,9 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw, +@@ -1941,8 +1943,9 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw, @@ -59 +61 @@ -@@ -2315,6 +2318,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) +@@ -2293,6 +2296,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) @@ -68 +70 @@ -@@ -2324,6 +2329,7 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) +@@ -2302,6 +2307,7 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc)