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 1342FA0555 for ; Thu, 9 Jun 2022 13:38:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CAAF427E9; Thu, 9 Jun 2022 13:38:07 +0200 (CEST) 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 AC56C40220 for ; Thu, 9 Jun 2022 13:38:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774685; 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=hJEpBlqLccGY1TV3Pr4eScuZjxq7Ov7xpVvO7lAt6SM=; b=Uf9ddhrfAJLAoeWlOfnVojj0t+LjmNkM6HHzrEj5kD4Ka+WOI837rFv5UbRCDv+CNrXu4b hqDRa27CXj0qLi7gOG0ylYBfu9/Nhh6x50CZXRfTgRIY6z1L9VwdYgU7vvGnTh9K1IdQw2 RhIOpJDpzX+eXyDUE0gsXXkPQW6JC8o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-1i9ydJL_PDiXCvGgg5wx_Q-1; Thu, 09 Jun 2022 07:38:04 -0400 X-MC-Unique: 1i9ydJL_PDiXCvGgg5wx_Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E8BD6800124; Thu, 9 Jun 2022 11:38:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 471DE1730C; Thu, 9 Jun 2022 11:38:03 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix SGMII mode to link up' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:26 +0100 Message-Id: <20220609113701.386938-39-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-default=true 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.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 06/13/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/57e5b5747a87164938cc6ecf2295a9ff81b27239 Thanks. Kevin --- >From 57e5b5747a87164938cc6ecf2295a9ff81b27239 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 30 May 2022 17:30:15 +0800 Subject: [PATCH] net/txgbe: fix SGMII mode to link up [ upstream commit 6a925602a9cdd903a5ede52a10c6575e499e5b88 ] Fix SGMII mode to link up. Fixes: 01c3cf5c85a7 ("net/txgbe: add autoneg control read and write") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_phy.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c index da2bbc43e0..9f46d5bdb0 100644 --- a/drivers/net/txgbe/base/txgbe_phy.c +++ b/drivers/net/txgbe/base/txgbe_phy.c @@ -1368,7 +1368,15 @@ txgbe_set_sgmii_an37_ability(struct txgbe_hw *hw) { u32 value; + u8 device_type = hw->subsystem_device_id & 0xF0; wr32_epcs(hw, VR_XS_OR_PCS_MMD_DIGI_CTL1, 0x3002); - wr32_epcs(hw, SR_MII_MMD_AN_CTL, 0x0105); + /* for sgmii + external phy, set to 0x0105 (phy sgmii mode) */ + /* for sgmii direct link, set to 0x010c (mac sgmii mode) */ + if (device_type == TXGBE_DEV_ID_MAC_SGMII || + hw->phy.media_type == txgbe_media_type_fiber) + wr32_epcs(hw, SR_MII_MMD_AN_CTL, 0x010C); + else if (device_type == TXGBE_DEV_ID_SGMII || + device_type == TXGBE_DEV_ID_XAUI) + wr32_epcs(hw, SR_MII_MMD_AN_CTL, 0x0105); wr32_epcs(hw, SR_MII_MMD_DIGI_CTL, 0x0200); value = rd32_epcs(hw, SR_MII_MMD_CTL); @@ -2281,4 +2289,6 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 autoc) } else if (hw->phy.media_type == txgbe_media_type_fiber) { txgbe_set_link_to_sfi(hw, speed); + if (speed == TXGBE_LINK_SPEED_1GB_FULL) + txgbe_set_sgmii_an37_ability(hw); } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.692841923 +0100 +++ 0039-net-txgbe-fix-SGMII-mode-to-link-up.patch 2022-06-09 12:34:29.747980644 +0100 @@ -1 +1 @@ -From 6a925602a9cdd903a5ede52a10c6575e499e5b88 Mon Sep 17 00:00:00 2001 +From 57e5b5747a87164938cc6ecf2295a9ff81b27239 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6a925602a9cdd903a5ede52a10c6575e499e5b88 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org