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 CC84345804 for ; Fri, 23 Aug 2024 18:21:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C70E643385; Fri, 23 Aug 2024 18:21:22 +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 1E5D143384 for ; Fri, 23 Aug 2024 18:21:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430080; 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=dlKB5EYtqfx5KXJmwg3iU+0wh2PDxh2Jb7/1IhlxZM8=; b=IyV6Pm6tR26wunWgN1vPRKzx3dSYybLcd+k+Pl5KU9riBipvGdF4InIcl5VKh8NwGCC1GX wtoI/YQCsLowsTPoZ4v/YRq5JqW47jQzzKAxt+rGkkCccu1099uTh53Yib1g9k/NJvdGiQ 7aLAlRJf769yg2Bjy00vL0MoCX2TlgI= Received: from mx-prod-mc-05.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-136-Zk95nMECNmei6T6uoftLkQ-1; Fri, 23 Aug 2024 12:21:17 -0400 X-MC-Unique: Zk95nMECNmei6T6uoftLkQ-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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 634781956095; Fri, 23 Aug 2024 16:21:16 +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 811A51956053; Fri, 23 Aug 2024 16:21:14 +0000 (UTC) From: Kevin Traynor To: Radoslaw Tyl Cc: Piotr Skajewski , Alice Michael , dpdk stable Subject: patch 'net/ixgbe/base: fix PHY ID for X550' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:53 +0100 Message-ID: <20240823161929.1004778-45-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/2070487977c9aded1d4d77baa14960e390a84c5b Thanks. Kevin --- >From 2070487977c9aded1d4d77baa14960e390a84c5b Mon Sep 17 00:00:00 2001 From: Radoslaw Tyl Date: Thu, 30 May 2024 12:13:36 +0100 Subject: [PATCH] net/ixgbe/base: fix PHY ID for X550 [ upstream commit a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add ] Function ixgbe_get_phy_type_from_id() for X550_PHY_ID2 and X550_PHY_ID3 always return ixgbe_phy_unknown instead of ixgbe_phy_aq because phy ID's last 4 bits are always masked, and should not be taken into account when selecting phy type. This patch adds default PHY ID for X550 devices with mask on last 4 bits (0xFFFFFFF0), and fixes the switch statement to use it. Fixes: 58ddc803e412 ("ixgbe/base: add new X550 PHY ids") Signed-off-by: Radoslaw Tyl Reviewed-by: Piotr Skajewski Reviewed-by: Alice Michael --- drivers/net/ixgbe/base/ixgbe_phy.c | 3 +-- drivers/net/ixgbe/base/ixgbe_type.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c index f859b152ec..a072769af2 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -433,6 +433,5 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) phy_type = ixgbe_phy_tn; break; - case X550_PHY_ID2: - case X550_PHY_ID3: + case X550_PHY_ID: case X540_PHY_ID: phy_type = ixgbe_phy_aq; diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h index dc765f13c9..5973c60477 100644 --- a/drivers/net/ixgbe/base/ixgbe_type.h +++ b/drivers/net/ixgbe/base/ixgbe_type.h @@ -1664,4 +1664,5 @@ struct ixgbe_dmac_config { #define TNX_FW_REV 0xB #define X540_PHY_ID 0x01540200 +#define X550_PHY_ID 0x01540220 #define X550_PHY_ID2 0x01540223 #define X550_PHY_ID3 0x01540221 -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.270883266 +0100 +++ 0045-net-ixgbe-base-fix-PHY-ID-for-X550.patch 2024-08-23 17:18:09.698430029 +0100 @@ -1 +1 @@ -From a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add Mon Sep 17 00:00:00 2001 +From 2070487977c9aded1d4d77baa14960e390a84c5b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 3a8e603472..56267bb00d 100644 +index f859b152ec..a072769af2 100644 @@ -38 +39 @@ -index 35212a561b..f709681df2 100644 +index dc765f13c9..5973c60477 100644 @@ -41 +42 @@ -@@ -1665,4 +1665,5 @@ struct ixgbe_dmac_config { +@@ -1664,4 +1664,5 @@ struct ixgbe_dmac_config {