Repository navigation
Conversation
|
Large opt-in MacBookPro13,3 sleep/Touch Bar suite (still draft). Related hardware PRs: #7196, #11570, #10758, #12211, #12119 (IOMMU). Please keep draft until install/DKMS/Touch Bar recovery have been exercised on real 13,3 hardware, and until it is clear this shouldn’t conflict with the other T1 sleep PRs. Happy to do a deeper pass when it is unmarked draft. |
|
Yup, got it - thanks for the review and pointers. I’ve been testing the current fixes on my own MacBookPro13,3. Touch Bar recovery and Fn switching have worked through four lid cycles, including after a full reboot. Wake still takes approximately 13 seconds, and battery drain during sleep remains unresolved. I think that this needs to become smaller, atomic PRs. I’ve also reviewed #7196, #11570, #10758, #12211, and the IOMMU issue #12119. They cover different models, sleep modes, and policies, so I’ll check compatibility explicitly. I haven’t tested those combinations on this machine yet. After reviewing #10825 and standardagents/t1bridge#47 and standardagents/t1bridge#49, my next step is an attended test of standardagents/t1bridge#47, with my userspace Touch Bar unpark hook disabled so it cannot mask the result. I’ll retain the existing sleep recovery sequence for that test. If the driver fix handles Touch Bar recovery reliably, I’ll contribute the 13,3 results upstream and retire the separate userspace hook. I’ve already prepared smaller local changes for keyboard classification/packaging and sleep recovery. Separately, omacom/omarchy-pkgs#544 looks relevant to the slow wake and warrants investigation on this model. I’ll keep this PR in draft while the packaged installer, DKMS, and recovery paths are validated on the hardware. Replacement PRs will wait until all applicable tests pass. I’ll report the hardware results and compatibility findings here before marking anything ready for review. |
|
Progress update, October 20: the attended driver/kernel tests have moved this forward, while the replacement Omarchy code PRs remain gated.
The EC lid-wake and guarded Thunderbolt cleanup remain in use, undocked only. Returned controller bindings do not establish working external ports. These results do not validate the combined or split Omarchy installers. The atomic plan remains: separate keyboard classification and companion package ownership, then opt-in sleep recovery after its own checks and attended installer/removal tests. Resume latency and Touch Bar evidence are going to their existing upstream PRs rather than duplicating those changes. Battery retention/critical-power handling now has its own investigation. This PR stays a draft. The last complete baseline used Omarchy I've published the current roadmap and detailed evidence. The earlier combined proposal is retained here for context, not presented as the tested new installation. |
Original combined proposal (historical scope and validation)
On MacBookPro13,3 (2016 15-inch T1), the Touch Bar worked at startup but remained dark after sleep while touch input still worked. Lid wake also needed EC wake handling and a guarded Thunderbolt lifecycle. This contribution brings that tested combination into an opt-in Omarchy setup, alongside the SPI keyboard classification fix and a guide covering the complete Wi-Fi/audio/NVMe/T1 setup.
What this includes
pm_asyncrestorationOnly the keyboard classification is installed through the normal hardware/migration path. The suspend and Touch Bar workaround requires explicit opt-in. The guide retains third-party packages and firmware recovery as prerequisites; no third-party installer is downloaded/executed by the setup command and no firmware is redistributed. Personal
follow_mousepolicy and PAM remain user-controlled.The combined installer replaces two separate installers (119 lines versus 159), includes the sleep policy in installation/removal, refuses existing community installations or competing hooks, and verifies effective recovery order and sleep settings. Existing working installations are not automatically converted. The recovery payload retains GPL-2.0-only in a separately licensed directory, including its LICENSE and provenance; maintainer review of that packaging boundary is needed.
Evidence and limits
AttrKeyboardIntegration=internal. Extended typing validation remains pending; physical clicks are a separate issue.Software validation
W=1against 7.2.5-3-omarchy. No module installation/loading or live suspend was performed for these checks../test/allrun at the keyboard-only commit2f600b0passed CLI but reported 19 failures among 370 shell files, plus headless skips. Missing companion package sources and sandbox/UI restrictions affected that run; one socket-related test passed outside the sandbox. The expanded revision has the focused/CLI checks above; a green full aggregate is not claimed.The repair repository contains the evidence, limitations and original provenance. Related upstream work includes NVMe #11624, NVMe #12687, S3 Thunderbolt #11570, Wi-Fi #7671, T1Bridge integration #12690 and T1Bridge resume issue #18. These overlap in parts; this PR does not claim to supersede their different model/sleep-state coverage. The firmware recovery, runtime, audio and board-template authors are credited in the guide.