From nobody Sat Jun 14 23:54:33 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 4bKY5k0fzRz5Vl0h; Sat, 14 Jun 2025 23:54:34 +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 4bKY5j5qTSz3km7; Sat, 14 Jun 2025 23:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749945273; 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=Ni+TkU+Nw+0BIbx9vYCWBO2/psM+z9x9lGl/Y06ktlo=; b=CyXSTcG3numYSm0FS/fiULImBqv5dKD3Kv3QIiyBslG3pPROVm+mbxtefmPbEe5Ek4MaxJ LdOQDSdt5+3YqfTEvqjz9psKXFsTC1wz4Tc25sCz1eNHDRfr6Up+vz3/7y6/9JvfwDvnY1 UhhreDBZ/KPw4EnVogCQBkJJoAviDBZVgrbFjBaxAbcpJWQaWwovAtXxg27FigV8TA95Wj z8ELQgfwriZA8R6AXqpiEBzc5qRsn/F44CGru+oxZcpwQg0BRXme8oPcAyNvqoitt+LJLh GDp1gaSiSpeg5f58fYddD5JNZKm40tlhPgWmH0QRnh5Y6zQbt9KbfdfvxUIqLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749945273; 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=Ni+TkU+Nw+0BIbx9vYCWBO2/psM+z9x9lGl/Y06ktlo=; b=P0ESpeYjmdSidlj73+ovxthOmlqDCt9A/rV1eIVzcZpxQ/TSgU4GYXjGuXFfit1H1zitbX UYw7Y7u72y+zQvPKQNrdxaJEaTwB5FiBzE9ymLIOzz6JOIDTubBA6omCSog9YfP5Kr+Ws5 MZE8UjeAD/12AfA9LVYJEyukYx+NAhRFIY6x25+VeQvIWvssMbRZfwV9exLGu98hsJI8jH 6ysswkdcVu2ZDLLmSaEcwwV/R+oOHfMbOohZrnJM+AyAyr33YgYeVBb7VdrrVof5V78xlB rp02Hq+JytkmbBRxxYGjzhbsdT6SkXR5I48lWXx4fRryfd5Cz+xVC20+6ut9HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749945273; a=rsa-sha256; cv=none; b=tokUSyHaiAQrEJIt3o2fG4hXz5/it+UmNSnwEPr//AQWc6uTPP/Q706BtfOpz0jlUbxeMC CRJ6VsaYMBIV8SqDnBwc/csm7g5AT6pAMtoYYaFIg4KSfQD8xtYxcD35OQi7p1wFcrXu+a gWSrLZ9qPcwY0DZwf1r9WfM39Fc4ZIQpTXTXtgpbKz1v+LQcb5vDuH14F46P0ZVT6WXgkB 0AD27xIqO3EmZFImtdxDWw9PvEPavUYZFmWAuOWCDGzSUq/NidRo0iXDLniOvgaMRfEr2C u6keZTXXBqy5Gga0P8useQBCguHEyPNrqc/RpRKxr3NelO5OTaZwa+0fE9eYqQ== 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 4bKY5j51mlzpx8; Sat, 14 Jun 2025 23:54:33 +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 55ENsX5h024605; Sat, 14 Jun 2025 23:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55ENsXdm024602; Sat, 14 Jun 2025 23:54:33 GMT (envelope-from git) Date: Sat, 14 Jun 2025 23:54:33 GMT Message-Id: <202506142354.55ENsXdm024602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 5e6e4f752833 - main - bnxt: Fix BASE-T, 40G AOC, 1G-CX, autoneg and unknown media lists 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e6e4f752833acc96f1efc893318d3f6b74b9689 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=5e6e4f752833acc96f1efc893318d3f6b74b9689 commit 5e6e4f752833acc96f1efc893318d3f6b74b9689 Author: Kevin Bowling AuthorDate: 2025-06-14 23:46:05 +0000 Commit: Kevin Bowling CommitDate: 2025-06-14 23:54:22 +0000 bnxt: Fix BASE-T, 40G AOC, 1G-CX, autoneg and unknown media lists This was broken in c63d67e137f3, the early returns prevent building the media lists as expected. The BASE-T parts of the patch were suggested by "cyric@mm.st", while I am adding the additional 40G AOC, 1CX, autoneg and unknown PHY fixes based on code inspection. There may be additional work left here for Broadcom but this is certainly better than the returns. PR: 287395 Reported by: mickael.maillot@gmail.com, cyric@mm.st Tested by: Einar Bjarni Halldórsson MFC after: 1 week --- sys/dev/bnxt/bnxt_en/if_bnxt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index 0e5bb6a736ae..feac3ce54a29 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -4608,34 +4608,34 @@ bnxt_add_media_types(struct bnxt_softc *softc) case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE: media_type = BNXT_MEDIA_AC; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX: media_type = BNXT_MEDIA_BASECX; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE: media_type = BNXT_MEDIA_BASET; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX: media_type = BNXT_MEDIA_BASEKX; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_SGMIIEXTPHY: media_type = BNXT_MEDIA_BASESGMII; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN: /* Only Autoneg is supported for TYPE_UNKNOWN */ - return; + break; default: /* Only Autoneg is supported for new phy type values */ device_printf(softc->dev, "phy type %d not supported by driver\n", phy_type); - return; + break; } switch (link_info->sig_mode) {