From nobody Thu Sep 26 03:29:52 2024
X-Original-To: dev-commits-src-all@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 4XDfH449Nrz5Y6P2;
Thu, 26 Sep 2024 03:29:52 +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 4XDfH41bXcz4WJ5;
Thu, 26 Sep 2024 03:29:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1727321392;
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=FvjPdEbOgGMzgzA+iN0Bc3FtWdOyDumK4PvifI5n7CM=;
b=ZAlMyACtRza+fV8E7JqkNOqy/NBN42WY6L9itBkUVtPtxV7jf70Ify15sQECxVJlO/5KLW
QMeyMatvjOn/NwdZeD5dY0d96l5NXWiALCaYZsOwLFmCqkebu86LzsTNDdlV1OCpijdogj
/r9EsEnQ7GSh5cb3dWtI0k4CrsTbrVqKUzzYTIVUD84Ilv8DU4dy0s24PgtITO0UtPsIc0
9xR/COWv4j15ay862IFpe2GE2/jJ3L8GcczgIo+7uDt+wxSn6/V/G3xVP2kf30so14nJiW
PM9/G6OwM/uoYFMyDZ3RVqpKM5JhOPSeyswJvorohHQgPrzzRRnba3cpsIOdsg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1727321392;
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=FvjPdEbOgGMzgzA+iN0Bc3FtWdOyDumK4PvifI5n7CM=;
b=WsWIqAFHhZIr8YET1K1lh9S2tN6EpTi64NqmksKEsY2aJalm0qQmH9ebV5QxD6WoM8hLc8
qlTLXElV9h4zhCseIyDSfUqVO6AMB/euj8u6NHGARtCVSwg3yA1G0UNmjaK3zv4Fz69a4Y
G70HEOuF1r1kkBL//AwZkVOv8pMOgpKkyYOvQoCi1lrcDUbUrnz6+mf0cnXqozArZwTvgu
8aoZ1C0J2eMKcj51uEil2tFYGB8zf6OJ2QRr8mJBiUtxBp3okhi8P8CO9MqGmNdkJt5/tt
fAccYvXg04H2EhpVVcuH8X4QbWc0zSIC6UCt3aT6lrMCKKGbR0SKut+vam+JSg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727321392; a=rsa-sha256; cv=none;
b=Sn8ibT36+ldJUQk45vpEIwz/mElb5AyrVpuvEkBE2giRnz8ilPg3vOkVSWySgdgle5Eb9j
0cb8uY39RBVLcRUr13DkKfvU6souAzaTRxUFlCiSRrmojeKPjNd6Ej7/cLJNXX+ySEgd2Y
0uyuo0y6Ic2pqzusz0QGFsmEoELKn6kz8ZbwevVcT2qZK6FXkrjbC7ItvfQ/Gwoxjrszes
vjeeOvjedsshjGol/qRoJZQ9E6xLx1w6RJVr9QyoUqEOY8mnKpo0OUHseqB0Sz8+vcwINV
j3erf9D2zgtQJyXSQKUpKnZ6YgnwNpbuPh6eObTclZdst9bOC8gnqnAuAeyDvw==
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 4XDfH4142XzgQL;
Thu, 26 Sep 2024 03:29:52 +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 48Q3TqRe082749;
Thu, 26 Sep 2024 03:29:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q3TqYL082746;
Thu, 26 Sep 2024 03:29:52 GMT
(envelope-from git)
Date: Thu, 26 Sep 2024 03:29:52 GMT
Message-Id: <202409260329.48Q3TqYL082746@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kevin Bowling <kbowling@FreeBSD.org>
Subject: git: a23401dd1afd - stable/14 - ixgbe: fix PHY ID for X550
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-dev-commits-src-all@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/stable/14
X-Git-Reftype: branch
X-Git-Commit: a23401dd1afdf7b2617bf09072781580b12d587c
Auto-Submitted: auto-generated
The branch stable/14 has been updated by kbowling:
URL: https://cgit.FreeBSD.org/src/commit/?id=a23401dd1afdf7b2617bf09072781580b12d587c
commit a23401dd1afdf7b2617bf09072781580b12d587c
Author: Radoslaw Tyl <radoslawx.tyl@intel.com>
AuthorDate: 2024-09-19 20:42:14 +0000
Commit: Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2024-09-26 03:28:47 +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 <radoslawx.tyl@intel.com>
Reviewed-by: Piotr Skajewski <piotrx.skajewski@intel.com>
Reviewed-by: Alice Michael <alice.michael@intel.com>
Obtained from: DPDK (a9f5a3b)
(cherry picked from commit 9b56dfd27c64fcaf2dfbaa1eb3e2bd2b163fa56c)
---
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