From nobody Tue Mar 18 19:23:31 2025 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 4ZHMFb3Cm9z5r6h5; Tue, 18 Mar 2025 19:23:31 +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 4ZHMFb1r1Jz45Mb; Tue, 18 Mar 2025 19:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742325811; 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=SjxbcojV5Vv16Lf5lbd0N3PufT37eJHypqeI89xI1zo=; b=rFG5G9/Qjx0+ZQNPJI6Y870BP1gsTCZT2lDPq4VEUtpF0cJu3Iho26zAcz9TDovl2CfjMr Mp5ySdvXG/GvytWN+MB2g5WgSpO7XgCHn4EopYmC2EzK7khuJKtfv8AV+jXLrIl1Ec3lrd Snff3E3MLZFGZmeQiC+Hi0u/IFUiNH7iBflhIIbSJseSQhChlZ+QjSyzEKfvnkM2ll99yv ro5FXHCah2RiTrlM4dnwhkdqaZUHeBHM2DT0I9PE8tMSzr/ZH6ar/umQBhoGze0QKVflFL LC6xCyWD+QfCq3Vbd7z7CAoqZo00WSw8vUX1q0Q9YQyiOq2urhzYFVmn0XslnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742325811; a=rsa-sha256; cv=none; b=rqw26/T30IIz/X6Z3fl/Cb5sYwRBnDJZJs87QPV8wYheyW1QKmyOfzpzcoCSfvpI9HyCdt vJWibtKXWrIFEY2mkfwPwOyWUIq84UqXRs097Bqz7cRgbcqibhNgSJAChddv61yhsZCwgg yIy8HuZPOhnliSUvQAlEhW645XaGtgtCg+TdHv4U2XW2SQc2YkG8w1AABHDZHWlAl7YNtL spYf1bLM+BIJV8Icxj6MZfVXifZICYkUUu15anGlrNjCMa/8nCpjOk4/Oi2QDWzCJAlWdb NhtrmkjVuG/kf31FMhra7lcXQX9XOqSY6nTFxLCxEnDlXTkipmVBijV+PGxHRw== 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=1742325811; 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=SjxbcojV5Vv16Lf5lbd0N3PufT37eJHypqeI89xI1zo=; b=aut7njLfHqT//54sJw74a8jRYgz1mOIN0jZMuMNzlLu6klAE+E9uKkaa1QSK8/QobcX1gP T9HZt0H+twJkOJcNvquuEzqhzjwOdaqM/IxJ6KUmYcmBWAitnJQ/VMIT3RlUcNT7bCdjGs ltJqrSpbCgQGs5y9bq8eP5AbURLpw9KTwPwtLVauAhPVYJWc2eFIShC/eoQWzF29kPvR/B WGGn4mwZaq8Mt6BCM/m5TrtT/R3PZ70Y62wsAKgTdwZHXWTmc+47LPTGY27RrakkILQ61L f6UqwIAdzdCFwr61nLP0wS1Hr22Otu5W9ePR88aOd6mNFTO6oYHsQTWboSJimA== 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 4ZHMFb0xc3zmj2; Tue, 18 Mar 2025 19:23:31 +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 52IJNVuw002187; Tue, 18 Mar 2025 19:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IJNVxZ002184; Tue, 18 Mar 2025 19:23:31 GMT (envelope-from git) Date: Tue, 18 Mar 2025 19:23:31 GMT Message-Id: <202503181923.52IJNVxZ002184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: c22b297062e1 - main - cxgbe(4): Add two new transceiver types. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c22b297062e1440676973a8aa89cbad1571e22f9 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c22b297062e1440676973a8aa89cbad1571e22f9 commit c22b297062e1440676973a8aa89cbad1571e22f9 Author: Navdeep Parhar AuthorDate: 2025-03-16 02:26:08 +0000 Commit: Navdeep Parhar CommitDate: 2025-03-18 18:36:00 +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. MFC after: 1 month Sponsored by: Chelsio Communications --- 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 20df6a97aa87..9e91250cb61c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3537,6 +3537,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); @@ -3593,6 +3594,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 */ @@ -12210,7 +12215,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,