From nobody Tue Apr 22 11:22:53 2025 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 4Zhfwt3xkMz5sTyt; Tue, 22 Apr 2025 11:22:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zhfws5hKPz3CCT; Tue, 22 Apr 2025 11:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745320973; 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=vXZY9eSiwbID6L4SjElAnWh3B0eu/RMth3zNDrbhJcw=; b=NbSvvjXj0k/kjupzQ3hOygXsu0vgOgG53M6B/OQtVuPmWA0IpEL/r+T/qd0onAR6AEJkjs 6DH1vX3lF0VbGcN9xy5ayk8YVNPx8/sFaNbZ+78uZa35Zji52k3NLKIBx5zD89xCViA58m AYr6dn9szev0M/iGDc7Y3Ri2Eit+3wBtAtpedjL7HyvfM9NdQBqRu/a5oK/rww60ptTLIZ 3lWtOXCUCGt5Jpz2Ngj1bbpLmwG7flS7FdzvtdYlbQh5n0g66h7V5Y9c3193vg/H2fcl1u XPVu5gKGND2UzOfrBn10RoMg3hhH1/X3M0RMZ+dUd5R27YIAQQ+ItJrvub2bwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745320973; a=rsa-sha256; cv=none; b=XY+5OBkQod1IU07gBRsLzmVh30jPtioJdD/BaQrqeiLf2coORQYI3pN6qK8j2IXM3kU5A9 +fP41JNrqbBPkcbtglrxLE5YQinMjubGZpkLNSfRbeRPqzYB4yrO23bnDoMaC6UKtWJF7w ZN2Otab5KXxiH5tloHeuYqV/VaSAqF4yCjGLhEX5tDk7Vwp/za0hna4Vmt/grCSUGoWF7L Y/p0jbSm+B9rqOI8JPHrRSaoQuVk9RASdtMXwqjkedDhdgKwK1aMb5fu7wTgQ+5xyq83WT WhE5CZGywOs+tKRPKibrhd2t/xLyMvkY14APSNnMoLZ9IGgESkv9n6sa5RSuVQ== 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=1745320973; 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=vXZY9eSiwbID6L4SjElAnWh3B0eu/RMth3zNDrbhJcw=; b=tTU+h+fgra1u0ui1KJe/ilRjhnQ3BnDtkjTYp9u3kKyWtH+6VluS+iF91SuafKoCwIVZJR UuJRnnvo+hg1GhWyeHmyGbUTC34FD53m7vfYJ1DujEEXiP2hPnx0ZcUBzAGZJDONu7qrB6 pX2O5JZYoLYGb3p/qKjQDHezACHrn9H44Dhey/7wjUKNynfMLIcPq8RLDiF4zVLVGycnBr i0EyAsOeI5S9gi/Mx4gzQJkaSE1WsFdWUEE6CTo1IjAzmJSDYVoiT1VKX4FsJkECmcvXvP bmMTHcwbxvuQ5ZYovVh9HK9eObCsrbwYlJfzvy0nvwncPV/imymZVIl+g+pKBw== 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 4Zhfws3T2Xz2Mv; Tue, 22 Apr 2025 11:22:53 +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 53MBMr8u026296; Tue, 22 Apr 2025 11:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MBMroS026293; Tue, 22 Apr 2025 11:22:53 GMT (envelope-from git) Date: Tue, 22 Apr 2025 11:22:53 GMT Message-Id: <202504221122.53MBMroS026293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 47cdd7a9ebc6 - stable/14 - cxgbe(4): Add two new transceiver types. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 47cdd7a9ebc6f8ced53c57cd6d3c322c453caad8 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=47cdd7a9ebc6f8ced53c57cd6d3c322c453caad8 commit 47cdd7a9ebc6f8ced53c57cd6d3c322c453caad8 Author: Navdeep Parhar AuthorDate: 2025-03-16 02:26:08 +0000 Commit: Navdeep Parhar CommitDate: 2025-04-22 11:12:46 +0000 cxgbe(4): Add two new transceiver types. Future firmwares will report these types to the driver. These transceivers work already but are misidentified as a different type. Sponsored by: Chelsio Communications (cherry picked from commit c22b297062e1440676973a8aa89cbad1571e22f9) --- sys/dev/cxgbe/firmware/t4fw_interface.h | 2 ++ sys/dev/cxgbe/t4_main.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index 686bb55d658b..2794bae9474b 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -7820,6 +7820,8 @@ enum fw_port_module_type { FW_PORT_MOD_TYPE_TWINAX_PASSIVE = 0x4, FW_PORT_MOD_TYPE_TWINAX_ACTIVE = 0x5, FW_PORT_MOD_TYPE_LRM = 0x6, + FW_PORT_MOD_TYPE_LR_SIMPLEX = 0x7, + FW_PORT_MOD_TYPE_DR = 0x8, FW_PORT_MOD_TYPE_ERROR = M_FW_PORT_CMD_MODTYPE - 3, FW_PORT_MOD_TYPE_UNKNOWN = M_FW_PORT_CMD_MODTYPE - 2, FW_PORT_MOD_TYPE_NOTSUPPORTED = M_FW_PORT_CMD_MODTYPE - 1, diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 1f08a1611f1d..537249c8e5c3 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3549,6 +3549,7 @@ port_mword(struct port_info *pi, uint32_t speed) /* Pluggable transceiver */ switch (pi->mod_type) { case FW_PORT_MOD_TYPE_LR: + case FW_PORT_MOD_TYPE_LR_SIMPLEX: switch (speed) { case FW_PORT_CAP32_SPEED_1G: return (IFM_1000_LX); @@ -3605,6 +3606,10 @@ port_mword(struct port_info *pi, uint32_t speed) if (speed == FW_PORT_CAP32_SPEED_10G) return (IFM_10G_LRM); break; + case FW_PORT_MOD_TYPE_DR: + if (speed == FW_PORT_CAP32_SPEED_100G) + return (IFM_100G_DR); + break; case FW_PORT_MOD_TYPE_NA: MPASS(0); /* Not pluggable? */ /* fall throough */ @@ -12224,7 +12229,8 @@ t4_os_portmod_changed(struct port_info *pi) struct vi_info *vi; if_t ifp; static const char *mod_str[] = { - NULL, "LR", "SR", "ER", "TWINAX", "active TWINAX", "LRM" + NULL, "LR", "SR", "ER", "TWINAX", "active TWINAX", "LRM", + "LR_SIMPLEX", "DR" }; KASSERT((pi->flags & FIXED_IFMEDIA) == 0,