From nobody Tue Nov 03 17:44:29 2026 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 4jJwtj40ZTz6yfv7 for ; Tue, 03 Nov 2026 17:44:29 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJwtj3Kbbz4ddZ for ; Tue, 03 Nov 2026 17:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793727869; 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=utkUn8MLJfcrCcnB9KTw/uYtDcQgY6odUBkyEZ0fD64=; b=k7mtqf/l55WDgo1RkkbjGJLF/O0wsx73r9sNVztbn8nlijpRVE7ohkzmGNK0KlMMxPqR/X tTYVz9tHvGus6lTt3ZPl49fZsa0iTClf/Tm0SNpKlmLsVlANoW+X8gsdMksASR+b6lA8Ll 0kbC64FFODru11LUD944o7QP90TX7k94TTUGWdHJjPIAZ9qeCN7iM32wVlRXLWv/ihQ31W nxZGIDR73Z0UPmqksTG6i1gbCfIHfp/zAL2LAX0DWt0H5Sd+ZGndrayZHHRAji/2Dkk/oa GtjuEHQalBiSUf3AyEDZ1LEmqsObYUpe2Nb0iUxTiXSXPjMB8/G8jTsogcWOaw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793727869; b=yWSersfZOapd28RGjCBxr+QAsBDQeOdxCraLRDuldcyn98QOD3P5O9jl35uFThS0qbzJg4 x8eurdSOeuBE4dus24jzabKl6Tp4Q+LkDISEpYYLAMxPlDhAAmksRYEmTPf+VdyWAwlf7Z qi8FePZTHIrQLh/7z4NzkdkjLByc/LDGNW6sC6l9LMRCcitDXetZHwbaBJ/6qseQ3MmcPy EAYMJmZ0CsqAoZXGDk5sdRZOROliaDWO2aTH27JXYLh1XW00YwzqX1HAvABb1aUDxESpOv FUYpyGnD7K31PvIrcRLRJ8ZF+RhhmG6gdPUfmHj/eih96KMr94IGsHUDIfktLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793727869; 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=utkUn8MLJfcrCcnB9KTw/uYtDcQgY6odUBkyEZ0fD64=; b=siE4gKdxNfTOElUewV8rqYbWjkVTsdICiSePjdpNVNvdpmB4aEZ8ogpFITcTALoYEevToj gFIXMkD0tQyZ05p76Q2Y24Sp0EJeybeQ/zNUs6KOHked5rxDVFk+ner0nRNybtwI5Wd15M f2ZheS19JR22zOKMXT0XUldmKS3aJQbw8EhHOIUvW2Q0DUr1xxUkbFEtyd7WXxZBN5Pn4w JQ8QtGapVffoneydV1LTL6xux2o6EPqPrZN2bZcY2X1/G7Gn6NlfM9ZB/sP2ZTwrF6XFfX kTYON3NPcCv8vjTlRTR0z45QHLk90irg3HZgR9waZWRvfjefqGLJwyeeTJt4cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJwtj2zZlzQQL for ; Tue, 03 Nov 2026 17:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25f82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 17:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 28d8abeaa574 - main - bnxt: correct more mappings for 400G optics and 100G LR List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28d8abeaa5741768cbf01be1aa3f34c6cd6db9a2 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 17:44:29 +0000 Message-Id: <6aea1d7d.25f82.795da313@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=28d8abeaa5741768cbf01be1aa3f34c6cd6db9a2 commit 28d8abeaa5741768cbf01be1aa3f34c6cd6db9a2 Author: Andrew Gallatin AuthorDate: 2026-11-03 17:40:18 +0000 Commit: Andrew Gallatin CommitDate: 2026-11-03 17:43:56 +0000 bnxt: correct more mappings for 400G optics and 100G LR - Support 400G-DR4 optics - Support 400G-CR8 and -SR8 with their types, rather than generic 400G-AUI8 - Use the generic 400G-AUI8 for 400G-SR4, rather than mislabeling it -DR4 (We probably should add a 400G-SR media type, but I don't have any to test ATM) - Add missing legacy PAM4 100G LR entry and matching media-selection cases. Reviewed by: sumit.saxena_broadcom.com Differential Revision: https://reviews.freebsd.org/D61162 Sponsored by: Netflix --- sys/dev/bnxt/bnxt_en/bnxt.h | 1 + sys/dev/bnxt/bnxt_en/if_bnxt.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h index ba0ab96bd45a..b4011ee1a52e 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -505,6 +505,7 @@ enum bnxt_phy_type { BNXT_MEDIA_BASET, BNXT_MEDIA_BASEKX, BNXT_MEDIA_BASESGMII, + BNXT_MEDIA_DR, BNXT_MEDIA_END }; diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index 145f9cf05758..3bca17fb8823 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -4353,6 +4353,8 @@ bnxt_media_change(if_ctx_t ctx) break; + case IFM_400G_CR8: + case IFM_400G_SR8: case IFM_400G_FR8: case IFM_400G_LR8: case IFM_400G_AUI8: @@ -5250,7 +5252,7 @@ add_media(struct bnxt_softc *softc, u8 media_type, u16 supported_NRZ_speeds, BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_50GB_PAM4_56, IFM_50G_CP); BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_100GB_PAM4_56, IFM_100G_CP2); BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_200GB_PAM4_56, IFM_200G_CR4_PAM4); - BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_56, IFM_400G_AUI8); + BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_56, IFM_400G_CR8); /* thor2 PAM112 */ BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_100GB_PAM4_112, IFM_100G_CR_PAM4); BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_200GB_PAM4_112, IFM_200G_AUI4); @@ -5260,6 +5262,7 @@ add_media(struct bnxt_softc *softc, u8 media_type, u16 supported_NRZ_speeds, case BNXT_MEDIA_LR: BNXT_IFMEDIA_ADD(supported_pam4_speeds, PAM4_SPEEDS_50G, IFM_50G_LR); + BNXT_IFMEDIA_ADD(supported_pam4_speeds, PAM4_SPEEDS_100G, IFM_100G_AUI2); BNXT_IFMEDIA_ADD(supported_pam4_speeds, PAM4_SPEEDS_200G, IFM_200G_LR4); BNXT_IFMEDIA_ADD(supported_NRZ_speeds, SPEEDS_100GB, IFM_100G_LR4); BNXT_IFMEDIA_ADD(supported_NRZ_speeds, SPEEDS_50GB, IFM_50G_LR2); @@ -5305,11 +5308,12 @@ add_media(struct bnxt_softc *softc, u8 media_type, u16 supported_NRZ_speeds, BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_50GB_PAM4_56, IFM_50G_SR); BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_100GB_PAM4_56, IFM_100G_SR2); BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_200GB_PAM4_56, IFM_200G_SR4); - BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_56, IFM_400G_AUI8); + BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_56, IFM_400G_SR8); /* thor2 PAM112 */ BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_100GB_PAM4_112, IFM_100G_AUI2_AC); BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_200GB_PAM4_112, IFM_200G_AUI4); - BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_112, IFM_400G_DR4); + /* No IFM_400G_SR4; use the generic media type. */ + BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_112, IFM_400G_AUI8_AC); break; case BNXT_MEDIA_ER: @@ -5326,6 +5330,11 @@ add_media(struct bnxt_softc *softc, u8 media_type, u16 supported_NRZ_speeds, BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_112, IFM_400G_AUI8_AC); break; + case BNXT_MEDIA_DR: + /* thor2 PAM112 */ + BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_112, IFM_400G_DR4); + break; + case BNXT_MEDIA_FR: /* thor2 PAM112 */ BNXT_IFMEDIA_ADD(supported_speeds2, SPEEDS2_400GB_PAM4_112, IFM_400G_FR4); @@ -5485,6 +5494,10 @@ bnxt_add_media_types(struct bnxt_softc *softc) media_type = BNXT_MEDIA_KR; break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_400G_BASEDR4: + media_type = BNXT_MEDIA_DR; + break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_400G_BASEFR4: media_type = BNXT_MEDIA_FR; break;