Repository navigation
Install missing BCM43602 board NVRAM on MacBookPro13,3 - #11017
justin-schroeder wants to merge 3 commits into
Conversation
run_logged returns the leaf's exit status and omarchy-apply-hardware runs under set -e, so a failed download or checksum stopped every hardware leaf after this one and failed omarchy-apply-system. An offline install on a MacBookPro13,3, the machine whose Wi-Fi this is fixing, never finished hardware setup. Skip the board file instead and leave the stock firmware in place. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
brcmfmac requests the model-specific board file before the generic one, so a generic brcmfmac43602-pcie.txt an administrator placed in /usr/lib/firmware/updates/brcm would be overridden by the file this leaf installs. Look for both names there as well as in brcm/. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
|
Thanks for the careful write-up, @justin-schroeder. I reviewed this at Pushed:
Checked: on a disposable Omarchy worker, What it waits on: a test of this head on a real MacBookPro13,3, on both bands. Your own result covers 5 GHz. 2.4 GHz is the open question, because the #7487 thread has a 13,3 ( git clone -b fix/apple-bcm43602-board-nvram https://github.com/justin-schroeder/omarchy.git /tmp/omarchy-11017
git -C /tmp/omarchy-11017 checkout 7582832940781f316284a55dc16ec99387e600ba
sudo bash -e -c 'source /tmp/omarchy-11017/install/hardware/apple/fix-bcm43602-nvram.sh'
sudo rebootThe leaf stops without changing anything if any For the maintainer, not the author:
|
|
| ! echo "b109f3e6663b0e888c2559e36f7e0109f2a3a6b9765786d11f849f16d4b32d06 $scratch/nvram" | sha256sum --check --status; then | ||
| echo "Could not fetch verified MacBookPro13,3 BCM43602 board NVRAM; skipping" | ||
| return 0 | ||
| fi |
There was a problem hiding this comment.
Offline installs skip the fix If a matching Mac is installed without access to the pinned download, this branch reports success without installing the board NVRAM. Hardware setup is not automatically retried, so the machine boots without the Wi-Fi fix. The installer supports offline package installation; this leaf needs a way to complete the fix in that path or retry it later.
Knowledge Base Used: Install stages and package sets
| def invoke(): | ||
| return subprocess.run(["bash", "-e", "-c", 'source "$1"', "bash", str(script)], |
There was a problem hiding this comment.
Pinned digest goes untested The test replaces the production SHA-256 with the hash of its own fixture. It would still pass if the pinned digest were mistyped or the remote payload changed, even though installation would then fail verification and skip the board file. Check the actual pinned artifact against its digest as well.
|
A clarification on the calibration comparison in the review: there is historical 2.4 GHz association evidence for the 285753-based configuration carried by #10141. Our September 20 report records a MacBookPro13,3 / BCM43602 subsystem These were different boots and kernel versions, not a controlled same-kernel dual-band trial or validation of #10141's current installer head. We have not tested this PR's different calibration or head So "neither is proven on 2.4 GHz" should distinguish missing current-head validation from the existing association evidence above. This is a link to prior evidence only; no new radio reload, firmware change, reboot or hardware test was performed for this reply. |
|
I took another look at The competing Wi-Fi fix. @monomyth is right that I overstated it when I said neither calibration was proven on 2.4 GHz. The 285753-based file in #10141 has been seen connected at 2412 MHz on one boot and at 5600 MHz on another. Those were custom kernels, not a controlled test, but they are positive results on both bands. I was also wrong to call this PR the one to carry forward. When two fixes for the same bug compete, this project lets the older one win unless it has a specific defect. #10141's Wi-Fi part is older (opened 4 September; this one 9 September), and nobody has shown a defect in it. Its draft status and the unrelated Radeon, Touch Bar and suspend work bundled with it hold back #10141 as a whole. They are not faults in its Wi-Fi fix. Codex, asked separately, came to the same conclusion, though its independence is not guaranteed. Which 13,3 calibration lands is for the maintainer to decide. Greptile's two findings:
What it waits on: the maintainer, to choose between this PR and the Wi-Fi part of #10141 for the MacBookPro13,3. Whichever one is chosen still needs someone other than its author to test it on real 13,3 hardware on both bands. |
|
On @jandrusk's point about #7671 and #10332: I checked how the three fit together at this head (
The overlap that does need a decision is the one in my earlier comment. Draft #10141 installs a different MacBookPro13,3 calibration ( |
Install missing BCM43602 board NVRAM on MacBookPro13,3
On a MacBookPro13,3 with BCM43602 [14e4:43ba], the stock binary firmware initialized without board NVRAM but only discovered 2.4 GHz networks and reported failed WPA2 handshakes as incorrect passwords. Installing the board configuration and reloading brcmfmac restored 5 GHz discovery and a successful connection at 5240 MHz, with signal −39 dBm.
Add a hardware setup leaf after the existing brcmfmac supplicant workaround. Match Apple DMI, MacBookPro13,3, and PCI/subsystem IDs 14e4:43ba / 106b:015a; the same chip in other models is not sufficient evidence of compatible board calibration. Fetch the tested community NVRAM from an immutable URL and verify SHA-256 before writing a model-specific firmware file. Preserve existing generic/model-specific overrides, including compressed files and symlinks. Substitute the interface MAC; if absent or the shared Broadcom placeholder, generate a persistent locally administered unicast address. Do not reload the adapter during installation.
Source: Mike Ratcliffe’s BCM43602 board configuration, pinned file blob
bd7af7c6f01df3ccee1471d36cb8df15d618a6aa, SHA-256b109f3e6663b0e888c2559e36f7e0109f2a3a6b9765786d11f849f16d4b32d06. The data is downloaded rather than vendored; matching installations require network access to the pinned source. Download/checksum failures stop the leaf without installing an unverified file.Validation:
./test/all: CLI suite passed; 5 of 237 shell test files failed.config-test.sh,snapper-test.sh, andunowned-system-paths-test.shrequire the absent companion omarchy-pkgs checkout;launch-about-test.shfails its roomy-window animation assertion. These four failures reproduce on untouched upstream5ead8705.locate-test.shtried to decode ignored Python bytecode generated in bin/pycache by earlier tests; it passes after removing that generated cache. The new Wi-Fi suite passes. No unrelated test changes are included.Clean ISO installation, reboot persistence, successful 2.4 GHz authentication after the change, other Mac models and long-term stability have not been validated. This PR adds fresh-install hardware setup; it does not add a migration or change WPA settings, regulatory settings, binary firmware, or suspend behavior.