From nobody Tue Sep 16 16:31:08 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 4cR6pj1jdpz67ZBy; Tue, 16 Sep 2025 16:31:09 +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 4cR6ph5KMQz41d0; Tue, 16 Sep 2025 16:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040268; 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=v/gCd88eKnk1GflWbfOmZsykHFKWgK0EOzMXOXuRCdk=; b=VlzyURYF3ukuEEZJG8s79AUM+EkB8Ek02eclhNR9I4KoVrTEzvKiOQxQxucd6mmW2WGR71 SsijmmNdA/M2+6AB0xO/fHD5r6zWym46SG1m98d0YXiRAw8RcgsHoS44ky0RRSIau/Y0a9 2hY1/tIH/dR4cLMhl3bIdmoiNLYXr6FTwDWBxO2tFBoI1Zjhu+MVwkXBpGLvqcfc5GIYo5 PpUWRYeKZdOF300SnwHS3SRF8DWPwDTJ/mxIBhI0xKZK9dggs+1+fIYCg5X3HuzKg/eCdU FDBaqi672otRy+K/FT+zr9YnDupjy1qGWvir9VSXQa9bKsXa4VYkVFGiF4Bv6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040268; 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=v/gCd88eKnk1GflWbfOmZsykHFKWgK0EOzMXOXuRCdk=; b=Re6WTY3C6GObeqn6hTEtopBa/GcyBHnqYemZZ6ec0t5RbB1tmYDoNIymJ0WI9GJ+yUAyyA myFUprJ0aQ6RMkq+D6uB+5JpW1Ba5vt2Y2L84Rjxq9MoaVApMQDAckVUoDv1dqIcyylncA eUowyfVwtlen9GL4ZnuPqECmYVT+d9N0SYP/EN0V2Ntd2obD0zul2AexLXiMAxwfqnHDJm OJuruwxZUF4AlVEtwbANEqEYULb/Z8z4ho/HMsfN/ehCoCzx0FZu8srDJfZTqMI5z1yvfw l6tjCJCoaPvFWqdgPbz1Zwzn98S/t5io13AOvzeO23scv1OsdW5HXfexy57Cog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040268; a=rsa-sha256; cv=none; b=F0eCuOFNu++ElpbNZLs4mu3DNi1xlpNc8YI3jNc5LJC9bWgDOkjeawpmE6uUSROwDer/eS 6d67yvxV8L3CCRK6CgsAJArya1X7dnyclWIYEE1i2J/KDvM8+rMzp/saWqgvOjBFRksvWk uXRPotZPwjKVFR8wpfTBwQVuAu4DaAcwnWLAx2JrhbGLXcGjt5Ifx3lQaT6hi5zc1zW+to UTkL496AySb5MQyX1lZTCRaN8HHskBBSq8T9XT4sOyTpVV13z7QoIeTkgvZQFcV7tRFfRU iV/pVSXBi6o68Q1fsKYpFEQ37vGoiuYO0ohJAg79CwhA32ss8te1Mcw1O7CwLQ== 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 4cR6ph4nwRzpMG; Tue, 16 Sep 2025 16:31:08 +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 58GGV880058684; Tue, 16 Sep 2025 16:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGV8kj058681; Tue, 16 Sep 2025 16:31:08 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:08 GMT Message-Id: <202509161631.58GGV8kj058681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: c07b1838f9c9 - releng/14.3 - bnxt: Fix BASE-T, 40G AOC, 1G-CX, autoneg and unknown media lists 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: c07b1838f9c9e31696716b188a832ec35003ec2d Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=c07b1838f9c9e31696716b188a832ec35003ec2d commit c07b1838f9c9e31696716b188a832ec35003ec2d Author: Kevin Bowling AuthorDate: 2025-06-14 23:46:05 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:24:43 +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 Approved by: so Security: FreeBSD-EN-25:17.bnxt (cherry picked from commit 5e6e4f752833acc96f1efc893318d3f6b74b9689) (cherry picked from commit 33f65f12eba10588827a13d232337616f6f4facf) --- 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 eea956759e9e..169255c9433e 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -4609,34 +4609,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) {