From nobody Thu Sep 19 20:43:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X8nXp0N0bz5XNZf; Thu, 19 Sep 2024 20:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8nXn6WdTz4jTF; Thu, 19 Sep 2024 20:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726778601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9t9rHK7ecRLAhYgViuqLMR807VIfXsM3ZV5ua/ZREU=; b=sicK6yBd+AxGKI/NevCIZvcW2NZFUYyha3hgo7dqQIarNLKQHCiwqsJj1pFnie4zNUgml3 xnYTtySyNbf0YKUFt+M+TBC4FOhPN8f07ob1hFP5hlgj62okC9VfzJqViqJGxCC9KUGwg1 XeQq8+JgG5wyxdLYAgIQMh0r1ls1OB+LzfPUCyLV9mJDaUaB31ZJ5V0Ne+C6AP2pYV30Ta 3p2eu7n6037705heJ5YQww5eYqDeSQEjAX+ZyojLJ50+9mcbU6RssPAZGKFPrnbLBdVV+U +nABCr0vIcXPf0+LGnf+gWlqWnmiK6WQNaKO8HeaEWfneJkvajIkIrYDrQvInQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726778601; a=rsa-sha256; cv=none; b=P161pPm3ksaEia75JQJQY1OWXDnoCQ4FuriVJt76w1G3Dk4D1e5KO7hpdgFmJtO1QusY2I PO/RM9NOg6Y3KXIoJJcXzSTCAQA664KrJsaaUZLvUA3M0dQ4DxNnsraLjpou5PESu3snot yYRnaK1wxB0Vycg8lNZsaZ0OiJgWF1Z+ccFrAeEUpNWuCCVI8AaNCIfxg/xbWGYySo4rLF 7jNg5ZiDnPMEc529EIQNRxlntkn26npaJoVrsA1P4w3vBNwRIVmHL7kIs2MhM92hj81Sl4 jTGBf+Psj0XV7gH2wWa+Mad73gFXTUn2NFSV7y0Vhie2gtGOHg00hcAxZ6tTeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726778601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9t9rHK7ecRLAhYgViuqLMR807VIfXsM3ZV5ua/ZREU=; b=fELPlFJpg4kRzQyPhdb+3gctc1jiwCZHwzyDqhX+RNoClkobVJYDkAuRFbFIUxf5funNWd em1r9AA0cEtiLIwVZxvseWutSfMopOkFB0ava9woGUynU2p5ck0zHOepIbhCl4vtHMcaNt F75FgO/LkbNuOnEDRU1+S0Bb/Ck4nUL288cyYjq6qrfASp6t5W5u8Dpm6fVjjhpFN8xFNS ChZim9fGAYVbqFv/tUgi2GlLRyRYQo3Tq+8QJZ4xeMyFXF2D6/+inZ0fE9JBT7RaTH68uX dcqbZiBYTDOp2aGQmoWbSiWGtRl0NCRBmYxt298bjHL88acfTE/L5cxbxJ0w5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X8nXn66ynzLhl; Thu, 19 Sep 2024 20:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48JKhLsB086777; Thu, 19 Sep 2024 20:43:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JKhLIe086774; Thu, 19 Sep 2024 20:43:21 GMT (envelope-from git) Date: Thu, 19 Sep 2024 20:43:21 GMT Message-Id: <202409192043.48JKhLIe086774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 9b56dfd27c64 - main - ixgbe: fix PHY ID for X550 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b56dfd27c64fcaf2dfbaa1eb3e2bd2b163fa56c Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9b56dfd27c64fcaf2dfbaa1eb3e2bd2b163fa56c commit 9b56dfd27c64fcaf2dfbaa1eb3e2bd2b163fa56c Author: Radoslaw Tyl AuthorDate: 2024-09-19 20:42:14 +0000 Commit: Kevin Bowling CommitDate: 2024-09-19 20:42:14 +0000 ixgbe: fix PHY ID for X550 DPDK commit message net/ixgbe/base: fix PHY ID for X550 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: 58ddc80 ("ixgbe/base: add new X550 PHY ids") Cc: stable@dpdk.org Signed-off-by: Radoslaw Tyl Reviewed-by: Piotr Skajewski Reviewed-by: Alice Michael Obtained from: DPDK (a9f5a3b) MFC after: 1 week --- sys/dev/ixgbe/ixgbe_phy.c | 3 +-- sys/dev/ixgbe/ixgbe_type.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index f4bee6c34f53..00f396283879 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -462,8 +462,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/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h index deb68fa03312..1b447f42f17a 100644 --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -1696,6 +1696,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