From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 8330D4410E
	for <public@inbox.dpdk.org>; Thu, 30 May 2024 13:14:28 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id D4DA640EDB;
	Thu, 30 May 2024 13:14:26 +0200 (CEST)
Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9])
 by mails.dpdk.org (Postfix) with ESMTP id 8640040E68;
 Thu, 30 May 2024 13:14:24 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
 t=1717067665; x=1748603665;
 h=from:to:cc:subject:date:message-id:in-reply-to:
 references:mime-version:content-transfer-encoding;
 bh=MiRQVDfu+ENHKZICn9OlVLShw/50Smpfl3hrP7t+rEU=;
 b=eSdpoE5nRxEoOP01AyNor3rIWdyqrGlRQlYkQ/8F/WEkisCvcZMjc6PP
 YUnFzWuh/jPJc81XNcZnw/LMZa0hy02eS/JLXyqpI3h5cmL2a/QpGuXyE
 2uufV+iDIRwS4twkUmqpV/TGlABiH8TsL43fMGMbRT6kr94lhRJ7VbmyU
 peKKKsEbBiAwyFwO28lFMsC5ml+dHn6aQcqCPRVQQQQ7VSmp3n/FYTHji
 bHhmIDEI6y1xbBprDIAzPtz7g6j8YoPAwZo8cQo3waVl+l2YrSgPWG2vR
 B7BeJZz3Mf5aRbeH7XraNqSqvI9k9qNOl76/fbXaXh95Wh+lFdCXhgHuF w==;
X-CSE-ConnectionGUID: Ef38OGQjTdOvm3y+piY3vw==
X-CSE-MsgGUID: o1QOe0uUSVa66DqIvaki8A==
X-IronPort-AV: E=McAfee;i="6600,9927,11087"; a="36063554"
X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="36063554"
Received: from orviesa007.jf.intel.com ([10.64.159.147])
 by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
 30 May 2024 04:14:24 -0700
X-CSE-ConnectionGUID: tLded46uSAeRqhkwv7seFg==
X-CSE-MsgGUID: Zlnc3dYISt+vDAA69k8GoA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="36419297"
Received: from silpixa00401119.ir.intel.com ([10.55.129.167])
 by orviesa007.jf.intel.com with ESMTP; 30 May 2024 04:14:21 -0700
From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org, Wenzhuo Lu <wenzhuo.lu@intel.com>,
 Helin Zhang <helin.zhang@intel.com>
Cc: Radoslaw Tyl <radoslawx.tyl@intel.com>,
	vladimir.medvedkin@intel.com, bruce.richardson@intel.com,
	stable@dpdk.org, Skajewski@dpdk.org,
	PiotrX <piotrx.skajewski@intel.com>, Michael@dpdk.org,
	Alice <alice.michael@intel.com>
Subject: [PATCH v3 03/30] net/ixgbe/base: fix PHY ID for X550
Date: Thu, 30 May 2024 12:13:36 +0100
Message-ID: <5d5dc668ec26c6bc620f922bfc51af3257556095.1717067519.git.anatoly.burakov@intel.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <cover.1717067518.git.anatoly.burakov@intel.com>
References: <cover.1714744628.git.anatoly.burakov@intel.com>
 <cover.1717067518.git.anatoly.burakov@intel.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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org

From: Radoslaw Tyl <radoslawx.tyl@intel.com>

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")
Cc: stable@dpdk.org

Signed-off-by: Radoslaw Tyl <radoslawx.tyl@intel.com>
Reviewed-by: Skajewski, PiotrX <piotrx.skajewski@intel.com>
Reviewed-by: Michael, Alice <alice.michael@intel.com>
---
 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 35212a561b..f709681df2 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -1664,6 +1664,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.43.0