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 930E142D83 for ; Wed, 28 Jun 2023 16:11:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8EE2642BAC; Wed, 28 Jun 2023 16:11:22 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 29E92400EF for ; Wed, 28 Jun 2023 16:11:21 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-313f18f5295so3839172f8f.3 for ; Wed, 28 Jun 2023 07:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961481; x=1690553481; 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=Q3+y/w4zTjr/k8g2W4gKgrDPy4MZIvxOZBkZUN6EC+I=; b=fZMd5VcqCzQ1tgNMOU45x4YpxFncRTldpLKCpz6Jg4QD9YH40eUp4Kgcx0opjSufTS w4l6V9VOPjuquo2Rr70XYgr9P7otYhy6xqQPw+lZrf5Z822i8Q0+VCuXIZQYNUjc0DFE 9kbMJrA0Oyq00Ylq6YeQSjd8An2OQG0axXL67FoIO3CqaYz+4FiMI6M+akq21buvQ/XE g9QQYiyhtoVUhgcSbMfVP0e/ema39QhJPEkPswRD7+iKC1RZVYzzrUM/+SWHAtT/CmZv w/ezcexfze333G8tSjmHvBSyhSuPQSbvgtK2P7NVg2uG3iCbd3+nZe3zkxoLnQ0Jx02Q Rgow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961481; x=1690553481; 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=Q3+y/w4zTjr/k8g2W4gKgrDPy4MZIvxOZBkZUN6EC+I=; b=Sz7kjaimKXIMnSOuxcxcsXrMSL1C7ERvJzEszRSagl7Hd0mb68lVO5z8jdHLXDHUZ4 XnfN3M/0uCAF03kqwdP+mWnGacBt7W9eZxctyQelFfnkl4s0nJSQu12JtzR3rqIl6VC6 QQgSpPI2NCkjHpf5FMiiVNR7X7qm0Jo/2TnQzhZKHImzWqT7yShH9cinfmIecaqD+0sH Sw+Dw00+tpIE6UlGsOlUZPecBHO92WfwqozmLU/xw74OQbmRCafvbD0zohioWC4+FsBX 1a3Ky4kWivKAC+se2jQXMUM1JugSiG1JDN9aM08tBadkJ5LBH02PRjy2kTJ294bhLLnu 0o0g== X-Gm-Message-State: ABy/qLaOXaESDFf2fSgnT28nvYcMh2ldZ9aRdYBR98ol26R+M6mohzpC iQC9vmE5ycjhUjJTN1YWtz0I70ewpPIWiA== X-Google-Smtp-Source: APBJJlEsYHK0maRlzdqBeZ372w9s6kxlZzDsuIM7F9sV6YmH5L1Oj76o8ahTd0qKVbhW6uuVra0FYw== X-Received: by 2002:a5d:4e84:0:b0:314:10a1:a8bd with SMTP id e4-20020a5d4e84000000b0031410a1a8bdmr734083wru.41.1687961480646; Wed, 28 Jun 2023 07:11:20 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id cs7-20020a056000088700b0030ada01ca78sm13479195wrb.10.2023.06.28.07.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe/base: fix Tx with fiber hotplug' has been queued to stable release 20.11.9 Date: Wed, 28 Jun 2023 15:10:34 +0100 Message-Id: <20230628141046.2145871-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/46919634904dc7c45fd623b66a6ad704d799698e Thanks. Luca Boccassi --- >From 46919634904dc7c45fd623b66a6ad704d799698e 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 [ 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 73f3cdced1..01bd5a72f1 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -1454,8 +1454,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) @@ -1654,8 +1655,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) @@ -1849,8 +1851,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); @@ -2189,6 +2192,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) txgbe_set_link_to_sfi(hw, speed); } + 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) @@ -2196,5 +2201,6 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) /* enable mac transmitter */ wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_SPEED_MASK, mactxcfg); + wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_ENA, TXGBE_MACRXCFG_ENA); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.496004188 +0100 +++ 0010-net-txgbe-base-fix-Tx-with-fiber-hotplug.patch 2023-06-28 11:40:08.052027423 +0100 @@ -1 +1 @@ -From 196e412b80afe165ca78457d5f9bb1a5bace28ea Mon Sep 17 00:00:00 2001 +From 46919634904dc7c45fd623b66a6ad704d799698e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 196e412b80afe165ca78457d5f9bb1a5bace28ea ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f4cadcc510..1eb45b068a 100644 +index 73f3cdced1..01bd5a72f1 100644 @@ -23 +24 @@ -@@ -1541,8 +1541,9 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg) +@@ -1454,8 +1454,9 @@ txgbe_set_link_to_kx4(struct txgbe_hw *hw, bool autoneg) @@ -35 +36 @@ -@@ -1756,8 +1757,9 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw, +@@ -1654,8 +1655,9 @@ txgbe_set_link_to_kx(struct txgbe_hw *hw, @@ -47 +48 @@ -@@ -1963,8 +1965,9 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw, +@@ -1849,8 +1851,9 @@ txgbe_set_link_to_sfi(struct txgbe_hw *hw, @@ -59,2 +60,2 @@ -@@ -2315,6 +2318,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) - txgbe_set_sgmii_an37_ability(hw); +@@ -2189,6 +2192,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) + txgbe_set_link_to_sfi(hw, speed); @@ -68,4 +69,4 @@ -@@ -2324,6 +2329,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); +@@ -2196,5 +2201,6 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) + + /* enable mac transmitter */ + wr32m(hw, TXGBE_MACTXCFG, TXGBE_MACTXCFG_SPEED_MASK, mactxcfg); @@ -75 +75,0 @@ - void txgbe_bp_down_event(struct txgbe_hw *hw)