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 9CA9EA0351 for ; Mon, 21 Feb 2022 16:43:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE6044114B; Mon, 21 Feb 2022 16:43:17 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 87DF141153 for ; Mon, 21 Feb 2022 16:43:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qYXWlkakyYbZgFLP6fmtPoNhZLCmO7+ll5stUGPOMEU=; b=FT7c8uIUSDH6pYaF2dKBkleX4gcZnVTQUckyObbdHm0tweo9FhyOC2hKyLi66DV/rvhT5Y yddjawTY7xfWhNee3ComgdZnmqhwVdzRqErpCgEsI3MRhInBAXv0GL3/Y/6AIqQ8QfTu1U tjd3QjwJJ7Sz7axwie2BffaKQf1kX2g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-ob7uPPy6M_qdYMF5Mhzcwg-1; Mon, 21 Feb 2022 10:43:13 -0500 X-MC-Unique: ob7uPPy6M_qdYMF5Mhzcwg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E53641091DA1; Mon, 21 Feb 2022 15:43:12 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CB9A7E131; Mon, 21 Feb 2022 15:43:11 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix KR auto-negotiation' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:13 +0000 Message-Id: <20220221153625.152324-184-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/abfad6b59cc47b1365b7c87df4717e349cf7549b Thanks. Kevin --- >From abfad6b59cc47b1365b7c87df4717e349cf7549b Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Wed, 9 Feb 2022 18:42:13 +0800 Subject: [PATCH] net/txgbe: fix KR auto-negotiation [ upstream commit 238170abe7e41c75bbf77897eb84f637fb8936fd ] Fix failure to enter auto-negotiation mode on some firmware versions for KR NICs. Fixes: f611dada1af8 ("net/txgbe: update link setup process of backplane NICs") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_phy.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c index 3f5229ecc2..3fb929f37a 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -1456,4 +1456,8 @@ txgbe_set_link_to_kr(struct txgbe_hw *hw, bool autoneg) wr32_epcs(hw, SR_AN_CTRL, 0); wr32_epcs(hw, VR_AN_KR_MODE_CL, 0); + } else { + value = rd32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1); + value &= ~(1 << 6); + wr32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1, value); } if (hw->devarg.present == 1) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.524799612 +0000 +++ 0184-net-txgbe-fix-KR-auto-negotiation.patch 2022-02-21 15:22:44.363704739 +0000 @@ -1 +1 @@ -From 238170abe7e41c75bbf77897eb84f637fb8936fd Mon Sep 17 00:00:00 2001 +From abfad6b59cc47b1365b7c87df4717e349cf7549b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 238170abe7e41c75bbf77897eb84f637fb8936fd ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org