Repository navigation
Fix WPA3 on BCM4364 T2 Macs - #9803
kazeshini178 wants to merge 2 commits into
Conversation
|
Can confirm this exact issue also affects The model check
|
|
Reviewed at What was checked. The mask is right: Where it ran. On a disposable Omarchy worker: Second opinion. Codex Medium compared this with #13024 and #7577 and, like this review, picked this one as the fix to bring forward: it is the only one whose after-state was measured on the hardware, across WPA3-only, transition-mode PSK and SAE. It also noted that Competing fixes. #13024 fixes the same issue by gating on the chip instead of the model, and goes further: it drops the quirk on every T2 Mac, including BCM4355 and BCM4377 machines nobody has measured, on the argument that Arch's What it waits on. The maintainer: the hardware result here comes from the pull request's own author, which cannot stand as independent confirmation, and choosing between a model gate and a chip or T2-wide gate is theirs to make. |
|
Thanks @thedavidweng and @omarchybot. Updated in response to both comments:
|
Gate the WPA3 exemption on BCM4364 (14e4:4464) with a T2 bridge instead of DMI product MacBookPro16,1, covering the reported MacBookPro15,2. Cleanup now removes owned blocks wherever they sit on whole-line boundaries, every copy, keeping other bytes intact. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
|
Re-reviewed at What changed and what was checked. The exemption is now gated on BCM4364 ( Where it ran. On a disposable Omarchy worker, Second opinion. Codex Medium also found the hardware gate correct and the change proportionate. Like this review, it picked this pull request over #13024 as the one to bring forward, since this is the older fix and it is scoped to the hardware that was measured. That agreement is not guaranteed to be independent. It also raised two points about the cleanup that I confirmed but do not count as defects:
Competing fixes. #13024 fixes #9802 too, but drops the quirk on every T2 Mac, on the T2-less BCM4364 iMac19,x and on Apple Silicon. This pull request is older and is the narrower option. It does not miss any case that #9802 is about. What it waits on. The maintainer. The only hardware result comes from the author of this pull request, who also opened #9802, so it cannot serve as independent confirmation. The MacBookPro15,2 report above was not tested against this head. Choosing between this scope and #13024's wider one is the maintainer's call. |
Summary
14e4:4464) T2 Macsfeature_disabledocumentation:0x80000is SAE, not FWAUTH0x82000blocks from existing BCM4364 T2 installs, wherever they sit in the file, and request a rebootFixes #9802.
Related: #7439, #7577, #6652.
Why
BCM4364 firmware on T2 Macs (B3 on the tested 2019 16-inch
MacBookPro16,1) needs its advertised SAE offload path to join WPA3-only networks. Omarchy'sfeature_disable=0x82000transition-mode workaround disables bit 19 (BRCMF_FEAT_SAE) as well as firmware supplication, so WPA3-SAE authentication is unavailable on these machines.feature_disable=0x82000never disabled FWAUTH: it disabled FWSUP and SAE. FWAUTH is bit 20 (0x100000) and was enabled both before and after this fix. The behavioral change on BCM4364 T2 Macs is restoring FWSUP and SAE, which were verified against WPA2, transition-mode, and WPA3 networks. There is no evidence that disabling FWAUTH is needed for this client-mode issue.With the quirk enabled, a WPA3-only connection timed out. Reloading the same driver and firmware with
feature_disable=0exposedSAE_OFFLOAD; the same NetworkManager profile then associated, obtained DHCP, and passed gateway and internet ping checks. The persistent configuration was verified after a second reload.Scope
The exemption was originally gated on DMI product
MacBookPro16,1. Following review, it is now gated on the chip: BCM4364 (14e4:4464) together with the T2 bridge (106b:180[12]). That covers every machine with hardware evidence: theMacBookPro16,1measured here, and theMacBookPro15,2reported in this thread and measured in #13024.It deliberately stops there. The workaround remains useful for older Broadcom firmware with broken WPA2/WPA3 transition-mode handling, and the T2 BCM4355 (
43dc) and BCM4377 (4488) Macs and the T2-less BCM4364 iMac19,x keep the quirk until someone tests them. #13024 drops the quirk on all T2 Macs. If the maintainer prefers that wider scope, this PR is the narrower option.Test plan
bash test/shell.d/brcmfmac-supplicant-test.shbash test/shell.d/brcmfmac-wpa3-cleanup-test.sh, including blocks with lines after them, blocks between user lines, repeated blocks, byte-for-byte preservation of surrounding lines, reworded blocks left alone, and non-exempt hardware left alone./test/clibash -non all changed shell filesgit diff --check./test/allwas also run. The changed Wi-Fi tests passed; five unrelated environment/baseline tests failed. Three require a separateomarchy-pkgscheckout, whilelaunch-about-test.shandnetwork-qr-test.shfail in this non-Wayland test environment. No failure references a changed file.A separate WPA2-only AP was not available. The WPA2 authentication path itself was verified by pinning the transition AP profile to WPA-PSK; NetworkManager logged
WPA-PSK WPA-PSK-SHA256 FT-PSK, and the connection passed association, DHCP, reconnect, and traffic tests.