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 5DF6145804 for ; Fri, 23 Aug 2024 18:21:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57E1A402BE; Fri, 23 Aug 2024 18:21:16 +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 BA67240295 for ; Fri, 23 Aug 2024 18:21:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430074; 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=Aj7uEf+JfjrWlP96y0WXckLZLi9t9SSl8VYxf3EJyOM=; b=HBzu9jdWfd3UdZdImXvpEP0NNwpTpapjBG8nkJQfOYNxcfAeapJEWqWu1lH55hY6VSlml1 +Kxkw+2Sa9FxKJIYUA+NS4o7A4rAc1mmhZovZ2Ue6q52F/hS56pBXh1rV99SjC4MZrWAzJ f6F7q83rJSMvZTnHDx3Q0i1IEsdPFWY= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-wYAm7RMROZ6L0XeL-WdM9Q-1; Fri, 23 Aug 2024 12:21:12 -0400 X-MC-Unique: wYAm7RMROZ6L0XeL-WdM9Q-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AB5AB1955D4B; Fri, 23 Aug 2024 16:21:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 63BE91955F45; Fri, 23 Aug 2024 16:21:09 +0000 (UTC) From: Kevin Traynor To: Piotr Pietruszewski Cc: Piotr Skajewski , Marek Mical , Jeff Kirsher , Alice Michael , dpdk stable Subject: patch 'net/ixgbe/base: revert advertising for X550 2.5G/5G' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:51 +0100 Message-ID: <20240823161929.1004778-43-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 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/28/24. 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/2b53ce832bf9b6661549217e738b2e7725fa47c2 Thanks. Kevin --- >From 2b53ce832bf9b6661549217e738b2e7725fa47c2 Mon Sep 17 00:00:00 2001 From: Piotr Pietruszewski Date: Thu, 30 May 2024 12:13:34 +0100 Subject: [PATCH] net/ixgbe/base: revert advertising for X550 2.5G/5G [ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ] The commit removing advertising 2.5G and 5G speeds from ixgbe_get_copper_speeds_supported() was supposed to disable 2.5G and 5G during the autonegotiation with default settings. However, that change prevented OS-specific part of the driver from forcing these speeds at user request. This change reverts the commit and adds 2.5G and 5G as speeds supported by the X550. Fixes: 13de2444449e ("net/ixgbe/base: remove default advertising for x550 2.5G/5G") Signed-off-by: Piotr Pietruszewski Reviewed-by: Piotr Skajewski Reviewed-by: Marek Mical Reviewed-by: Jeff Kirsher Reviewed-by: Alice Michael --- .mailmap | 1 + drivers/net/ixgbe/base/ixgbe_phy.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.mailmap b/.mailmap index 7aaed03aab..49e574c3ef 100644 --- a/.mailmap +++ b/.mailmap @@ -847,4 +847,5 @@ Marcin Zapolski Marco Varlese Marc Sune +Marek Mical Maria Lingemark Mario Carrillo diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c index 8d4d9bbfef..f859b152ec 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -916,4 +916,8 @@ static s32 ixgbe_get_copper_speeds_supported(struct ixgbe_hw *hw) switch (hw->mac.type) { + case ixgbe_mac_X550: + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; + break; case ixgbe_mac_X550EM_x: case ixgbe_mac_X550EM_a: -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.216146382 +0100 +++ 0043-net-ixgbe-base-revert-advertising-for-X550-2.5G-5G.patch 2024-08-23 17:18:09.692430008 +0100 @@ -1 +1 @@ -From 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 Mon Sep 17 00:00:00 2001 +From 2b53ce832bf9b6661549217e738b2e7725fa47c2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ac063a739b00188281ba4ef5c6a0e43cc59a3b8 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 075ea40f17..508d4eba24 100644 +index 7aaed03aab..49e574c3ef 100644 @@ -32 +33 @@ -@@ -893,4 +893,5 @@ Marcin Zapolski +@@ -847,4 +847,5 @@ Marcin Zapolski @@ -39 +40 @@ -index 74c5db16fa..3a8e603472 100644 +index 8d4d9bbfef..f859b152ec 100644