The branch stable/14 has been updated by kbowling:
URL:
https://cgit.FreeBSD.org/src/commit/?id=33f65f12eba10588827a13d232337616f6f4facf
commit 33f65f12eba10588827a13d232337616f6f4facf
Author: Kevin Bowling <kbowl...@freebsd.org>
AuthorDate: 2025-06-14 23:46:05 +0000
Commit: Kevin Bowling <kbowl...@freebsd.org>
CommitDate: 2025-06-22 07:18:41 +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 "cy...@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.mail...@gmail.com, cy...@mm.st
Tested by: Einar Bjarni Halldórsson <ei...@isnic.is>
(cherry picked from commit 5e6e4f752833acc96f1efc893318d3f6b74b9689)
---
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) {
