From nobody Mon Sep 29 14:38:02 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 4cb3hC0010z68KSZ; Mon, 29 Sep 2025 14:38:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cb3hB2zNsz3t56; Mon, 29 Sep 2025 14:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759156682; 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=lVOcbiWBJHYhP2xCppBndr8Cefq34S3yXmbQeNq5CQ0=; b=YcoU/Xn3BO6j3gpuYEFWMxSxwsq1641mVrX3jR1Bc1I0uoKM2fi+0GBPGSuYjbFHBoElC+ /xfNCnYh/E1P3lg6y2EUs3k2b2C+jpee0yeK3SKmQAqV9Q/V04+u3XI13MRxDIo7uitmaB lsJ8TT+4J6SZOLV0fhW4c3KcqA+U3Y4K0PBsdD/1/lIMCEaNvNvT9FKqL8uZCbso81cogy F5awy/NK/eUbuOKgdkyNzzGghkyJHaSlmVxTJ7bWlMJu1+opCmxRAklOcTtxYqx6sdCRdI iYc3knLhEYPcxtB3kcq/PDMIYtM2OlcO8oUge0F1WIP3S3Bhu9uHCysitvH2og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759156682; 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=lVOcbiWBJHYhP2xCppBndr8Cefq34S3yXmbQeNq5CQ0=; b=yVJEh8NzI1ZiKtn1Q9eEHMp4lMsh6Pkk9XGAGOFUuMMw+FCpFYU2xXyspZuWR23t/wSTOF hNL9+aZIsk4lL8QX0VExS1u8fB+QN9aMzARc/de0Er1OkA75R0y95Li/CZjbOmfXylxdbP WBYQw2cxonSDwIFM8urfp7eMJK1VHeWEVoKDv3exFX50uJxeQHvZgPWMFGmaTkb5qgN0jI ertC87XlhHB8rT/pfjyZ407LV7W9cXvzGWbd9OzPBQy/UqGJJo+QSAyjAhXOk0LyfvkFBz sKhejGqIjBqQKN9P0nlbUyrFD/Ikec7A4L+JMF0aQFoGeSQa0AeR6eyIfEj9YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759156682; a=rsa-sha256; cv=none; b=xNKclvKfiPt2XMsSp5jomZSMEiJFevqQK3AnS38DjbLck01+V5vzrDp+b/H5wob/oGXu4n wWYCP1LvPORM8vDCnDYcPei8gujzED6F7EaXxGf0xKtArbYEbwCGLRxkF0Jeo14F7A44WF 3/cXZCp475bWxOpxiHB4GR63upF5ZgegJZgNlUJ4M8N2fcP1EsUHnvJWR0TuTcMRkaqfCz 7ZLfgJuIfFcG1Bnlllu4wCBpiQxk4P43SrGJvffL0nKDb/WTZTWV2D5Sq3RdRA5eAZHfKD WleWgPn1JR0i2Y8xOYL+oWlQy5xr13J+oxnE9Srfomokn4dYErurx6QBdj4hmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cb3hB1W3Mz18gV; Mon, 29 Sep 2025 14:38:02 +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 58TEc2gq018291; Mon, 29 Sep 2025 14:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TEc2Hh018288; Mon, 29 Sep 2025 14:38:02 GMT (envelope-from git) Date: Mon, 29 Sep 2025 14:38:02 GMT Message-Id: <202509291438.58TEc2Hh018288@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: a02f38ccedc2 - main - cxgbe(4): Add support for port types SFP56 and QSFP56 and speed 200Gbps 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/main X-Git-Reftype: branch X-Git-Commit: a02f38ccedc2c648d57fb6e575723b0b31b67ea0 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=a02f38ccedc2c648d57fb6e575723b0b31b67ea0 commit a02f38ccedc2c648d57fb6e575723b0b31b67ea0 Author: Navdeep Parhar AuthorDate: 2025-09-29 14:20:07 +0000 Commit: Navdeep Parhar CommitDate: 2025-09-29 14:27:13 +0000 cxgbe(4): Add support for port types SFP56 and QSFP56 and speed 200Gbps This enables the 2x200/100/40Gbps and 4x50/25/10/1Gbps boards. MFC after: 3 days Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 0ad162cf2231..e9cb56562abe 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -557,6 +557,9 @@ static int t4_fec = -1; SYSCTL_INT(_hw_cxgbe, OID_AUTO, fec, CTLFLAG_RDTUN, &t4_fec, 0, "Forward Error Correction (bit 0 = RS, bit 1 = BASER_RS)"); +static const char * +t4_fec_bits = "\20\1RS-FEC\2FC-FEC\3NO-FEC\4RSVD1\5RSVD2\6auto\7module"; + /* * Controls when the driver sets the FORCE_FEC bit in the L1_CFG32 that it * issues to the firmware. If the firmware doesn't support FORCE_FEC then the @@ -3637,6 +3640,8 @@ port_mword(struct port_info *pi, uint32_t speed) case FW_PORT_TYPE_CR_QSFP: case FW_PORT_TYPE_CR2_QSFP: case FW_PORT_TYPE_SFP28: + case FW_PORT_TYPE_SFP56: + case FW_PORT_TYPE_QSFP56: /* Pluggable transceiver */ switch (pi->mod_type) { case FW_PORT_MOD_TYPE_LR: @@ -3654,6 +3659,8 @@ port_mword(struct port_info *pi, uint32_t speed) return (IFM_50G_LR2); case FW_PORT_CAP32_SPEED_100G: return (IFM_100G_LR4); + case FW_PORT_CAP32_SPEED_200G: + return (IFM_200G_LR4); } break; case FW_PORT_MOD_TYPE_SR: @@ -3670,6 +3677,8 @@ port_mword(struct port_info *pi, uint32_t speed) return (IFM_50G_SR2); case FW_PORT_CAP32_SPEED_100G: return (IFM_100G_SR4); + case FW_PORT_CAP32_SPEED_200G: + return (IFM_200G_SR4); } break; case FW_PORT_MOD_TYPE_ER: @@ -3691,6 +3700,8 @@ port_mword(struct port_info *pi, uint32_t speed) return (IFM_50G_CR2); case FW_PORT_CAP32_SPEED_100G: return (IFM_100G_CR4); + case FW_PORT_CAP32_SPEED_200G: + return (IFM_200G_CR4_PAM4); } break; case FW_PORT_MOD_TYPE_LRM: @@ -3700,6 +3711,8 @@ port_mword(struct port_info *pi, uint32_t speed) case FW_PORT_MOD_TYPE_DR: if (speed == FW_PORT_CAP32_SPEED_100G) return (IFM_100G_DR); + if (speed == FW_PORT_CAP32_SPEED_200G) + return (IFM_200G_DR4); break; case FW_PORT_MOD_TYPE_NA: MPASS(0); /* Not pluggable? */ @@ -8932,13 +8945,12 @@ sysctl_link_fec(SYSCTL_HANDLER_ARGS) struct link_config *lc = &pi->link_cfg; int rc; struct sbuf *sb; - static char *bits = "\20\1RS-FEC\2FC-FEC\3NO-FEC\4RSVD1\5RSVD2"; sb = sbuf_new_for_sysctl(NULL, NULL, 128, req); if (sb == NULL) return (ENOMEM); if (lc->link_ok) - sbuf_printf(sb, "%b", lc->fec, bits); + sbuf_printf(sb, "%b", lc->fec, t4_fec_bits); else sbuf_printf(sb, "no link"); rc = sbuf_finish(sb); @@ -8958,14 +8970,12 @@ sysctl_requested_fec(SYSCTL_HANDLER_ARGS) if (req->newptr == NULL) { struct sbuf *sb; - static char *bits = "\20\1RS-FEC\2FC-FEC\3NO-FEC\4RSVD2" - "\5RSVD3\6auto\7module"; sb = sbuf_new_for_sysctl(NULL, NULL, 128, req); if (sb == NULL) return (ENOMEM); - sbuf_printf(sb, "%b", lc->requested_fec, bits); + sbuf_printf(sb, "%b", lc->requested_fec, t4_fec_bits); rc = sbuf_finish(sb); sbuf_delete(sb); } else { @@ -9034,7 +9044,6 @@ sysctl_module_fec(SYSCTL_HANDLER_ARGS) int rc; int8_t fec; struct sbuf *sb; - static char *bits = "\20\1RS-FEC\2FC-FEC\3NO-FEC\4RSVD2\5RSVD3"; sb = sbuf_new_for_sysctl(NULL, NULL, 128, req); if (sb == NULL) @@ -9068,7 +9077,7 @@ sysctl_module_fec(SYSCTL_HANDLER_ARGS) if (fec == 0) fec = FEC_NONE; PORT_UNLOCK(pi); - sbuf_printf(sb, "%b", fec & M_FW_PORT_CAP32_FEC, bits); + sbuf_printf(sb, "%b", fec & M_FW_PORT_CAP32_FEC, t4_fec_bits); } rc = sbuf_finish(sb); done: