From patchwork Fri May 3 13:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Burakov, Anatoly" X-Patchwork-Id: 139831 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0E50643F76; Fri, 3 May 2024 15:58:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D6634064A; Fri, 3 May 2024 15:58:22 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by mails.dpdk.org (Postfix) with ESMTP id A474D402F1; Fri, 3 May 2024 15:58:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714744701; x=1746280701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MiRQVDfu+ENHKZICn9OlVLShw/50Smpfl3hrP7t+rEU=; b=FitJuiR3tlaWapd6UUTgaF60ms2m945MQJ+1Z9/xJR63pyBO1AeENBrT pIolTm0wMILBiB6ioNRShipXV1G7yaPBFAOFW1mkxQ+FOqBVOWqvIX8gg JWfLaAp+MPIXpRrxpX/ceBrAImRUp+feWnH02MWE5BlT0f3LRoBU2yyS9 3FlWhntJg4DZ5cV+vbnkSCGN8oryQu1efXfH+QOBjItQ7RvkXG3iTH6yL Fh+N6ZEoLzBan3sPG7GduPOeOLaoF+ek2aLjXKQVI3vOa2xvPIqRUTLV2 sNNrBTqrX3bgl5XC2ipz1x69XQ6HZSO8B+Cr1Nk2LcPK3JBkvGxwvn9Y7 A==; X-CSE-ConnectionGUID: eB89wZT/S3C37uOrLJFcng== X-CSE-MsgGUID: 4eTBPVblRH2/ZwecrXXDlg== X-IronPort-AV: E=McAfee;i="6600,9927,11063"; a="10714896" X-IronPort-AV: E=Sophos;i="6.07,251,1708416000"; d="scan'208";a="10714896" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2024 06:58:20 -0700 X-CSE-ConnectionGUID: IVn8m1uvQ9e0RrXNOY0KfQ== X-CSE-MsgGUID: MBTOIXeYTmGA3UeZeh9KtQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,251,1708416000"; d="scan'208";a="50641915" Received: from silpixa00401119.ir.intel.com ([10.55.129.167]) by fmviesa002.fm.intel.com with ESMTP; 03 May 2024 06:58:18 -0700 From: Anatoly Burakov To: dev@dpdk.org, Helin Zhang , Wenzhuo Lu Cc: Radoslaw Tyl , bruce.richardson@intel.com, vladimir.medvedkin@intel.com, stable@dpdk.org, Skajewski@dpdk.org, PiotrX , Michael@dpdk.org, Alice Subject: [PATCH v2 03/27] net/ixgbe/base: fix PHY ID for X550 Date: Fri, 3 May 2024 14:57:34 +0100 Message-ID: <6009f127a0e22e986469b8e9d45fab882556e2b9.1714744628.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Radoslaw Tyl 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 Reviewed-by: Skajewski, PiotrX Reviewed-by: Michael, Alice --- 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