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 324CE454E9 for ; Tue, 25 Jun 2024 02:02:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E07340EDD; Tue, 25 Jun 2024 02:02:19 +0200 (CEST) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mails.dpdk.org (Postfix) with ESMTP id EACE440EDD for ; Tue, 25 Jun 2024 02:02:17 +0200 (CEST) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52ce674da85so1626198e87.2 for ; Mon, 24 Jun 2024 17:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273737; x=1719878537; darn=dpdk.org; 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=sQMR5txxMozGvPZ1SGs2zWF3en+XNXR8FfyDR/YMKYM=; b=aIKYIurwB7kurcTT5qgNRsBjIof6wh5W4L38IU6vErCU6IrmBAv6MZH/LlcUDLBIfU XJMKU730UAJeb0oqvGyXfr4No7OB+gcNndt7vfXJvbx/bX3V8Ocz/SBpTFQ3aCCSuCD2 Ep9zGx3xCpzxPDyu+nUtiyeENXhYKqy/mNAJASr1AUCLRObEPundZJgjljvao3Wbh2s/ h+T6JQK+/zaz9TOvaI3NNECW/XtB9tg3TdcPg+w3kdMjbHBNREvGTlYu7dxJsZzWSmd5 YTMvsiKp5+Yjw6NC0BmVO3Agos8pKf9XC3FCWAnH3XRcgDl7S0woRf2NTXGF1pKIbkBL FijQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273737; x=1719878537; 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=sQMR5txxMozGvPZ1SGs2zWF3en+XNXR8FfyDR/YMKYM=; b=R4CpveAooMqvt9ojzv0OiDXtJlBVDV2trt+qVAhD21mahIbyfqImZC013pDIuF5cYr lqNIBPnpaioHoilRUHarsRet4p8jbgKAvt6jElA1Jn882BnElF2J8k8Zgx+lcjBQ+gGZ bg6r+jcSN3YqWVmkB5gBGI5AUwDXHN1Jsg/YghwG6IKVtYek0IL2RypPrE+vR/iwsiYf RMiL3UosynCA3Nu3MDP/hQcQ6zmbh3Oz2B8rHjPY8EVYOIEWddwfpMIMNDgFF34mp1iF jtzaUpWHSU05yI6xg8b4id2wyvnZuq4ouKw+9PElWGn2Vpwm1mMFeXbhFOTBPXT0LpD2 5jUw== X-Forwarded-Encrypted: i=1; AJvYcCUnI6cwukR7d7AtFj9at+mT7u1BzZz6xUmPNVnzLC5SPyHUt9cR/UxBTIeBh/U7mV+fk2m9xsMdk13zcy2S9UA= X-Gm-Message-State: AOJu0YyDOXujXRczwUMWXVaU3OK0vmAt1k3OiGk0Hh0tn1Hwg/u+kPy/ S7MYiYFBI007m/5RP6hB1L7GjEFlonCenWoffthWb2fGhrd7+pOG3cfAdhQR X-Google-Smtp-Source: AGHT+IFmPgp39hAA50pLyifrIuD8sYcTY6BfKbyckLszZ4s/3rs6QNl3HkQO2SZrbqYLeXzo9w+Hew== X-Received: by 2002:a05:6512:10c7:b0:52b:9c8a:734f with SMTP id 2adb3069b0e04-52ce185d33amr4919995e87.50.1719273737364; Mon, 24 Jun 2024 17:02:17 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d0be818sm189873605e9.15.2024.06.24.17.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:02:16 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Tue, 25 Jun 2024 00:58:43 +0100 Message-Id: <20240624235907.885628-57-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-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 22.11.6 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/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8873f14545fb51cc67f25d38f0eb7d3c1c5cc24b Thanks. Luca Boccassi --- >From 8873f14545fb51cc67f25d38f0eb7d3c1c5cc24b 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 3a8e603472..56267bb00d 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -432,8 +432,7 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) case TN1010_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; break; 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 @@ -1663,6 +1663,7 @@ struct ixgbe_dmac_config { #define TN1010_PHY_ID 0x00A19410 #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 #define X557_PHY_ID 0x01540240 -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.733656108 +0100 +++ 0057-net-ixgbe-base-fix-PHY-ID-for-X550.patch 2024-06-25 00:22:13.209186138 +0100 @@ -1 +1 @@ -From a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add Mon Sep 17 00:00:00 2001 +From 8873f14545fb51cc67f25d38f0eb7d3c1c5cc24b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a9f5a3bd4c179e54b5ca95b0ce191bf4f33d2add ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -40 +41 @@ -index 35212a561b..f709681df2 100644 +index dc765f13c9..5973c60477 100644 @@ -43 +44 @@ -@@ -1664,6 +1664,7 @@ struct ixgbe_dmac_config { +@@ -1663,6 +1663,7 @@ struct ixgbe_dmac_config {