Repository navigation
Conversation
|
Tested this on a MacBookPro14,1 (Omarchy 4.0.2, systemd 261.2, kernel 7.1.9-arch1-2). The diagnosis matches what I see here, and with the hook actually running the xHCI backoff and the Worth noting this is not covered by Three notes on the patch as written — the first prevented it from running on my system. 1. The hook directory isn't scanned on systemd 261
$ strings /usr/lib/systemd/systemd-sleep /usr/lib/systemd/libsystemd-shared-261.2-1.so \
| grep -o '[/A-Za-z0-9._-]*system-sleep[/A-Za-z0-9._-]*' | sort -u
/usr/lib/systemd/system-sleepWith the script in Moving the identical script to 2. The
|
|
Hi @tcholewa, @ari-ahm — I've been chasing exactly this failure on a MacBookPro14,1 for the last two weeks and I think it's worth cross-linking, because we ended up at a different diagnosis and a different fix. The log signature you both posted ( Write-up: #10593. Patches: omacom/omarchy-pkgs#349 ( Root cause is a PCI save-ordering hazard, not a firmware power cutInstrumented on the machine (config-space reads from a shim module at each PM phase):
For S3, saving the bridge and its subtree in A supporting data point: hibernate works on the stock kernel. The thunderbolt driver's Why this hook works, and what it costs
The second failure mode this hook does not reachThere is a separate, worse failure that only happens when something is physically present on a Thunderbolt port at S3 entry: the Mac's EFI S3 resume boot script function-disables the PCH root port Since s2idle never executes the EFI S3 boot script, that firmware behaviour cannot fire at all — which is why #10758 defaults these models to Scope notes
Happy to compare notes or logs — the full account, including the experiments that ruled things out, is in the issue. If the project would rather ship a hook-based workaround in the short term, the one-line takeaway from the above is that unloading 🤖 Generated with Claude Code |
|
Reviewed at 0fc6f98 by Claude Opus 5.5, with Codex Medium as a second opinion. Both read this diff against Why #11570 rather than this one. Each of the following was checked against
#11570 has open findings of its own, raised on that pull request. #10758 is the deeper kernel-side approach, but it depends on omacom/omarchy-pkgs#349, which is still open, and it covers only the 14,1. Which approach Omarchy takes for these Macs is the maintainer's decision, so this pull request stays open for them. The reports here from @ari-ahm and @orospakr were part of that comparison. |
|
Closing this older hook-based proposal in favor of the proposed I independently tested the unchanged module on my MacBookPro14,1 with s2idle, including module autoloading and the first suspend after a complete shutdown and power-on. That first post-boot device resume measured 0.5322 s, and the wired download test after wake reported roughly 925–934 Mbps. The normal Thunderbolt driver stayed loaded, without this proposal's controller-removal hook, blacklist or my intermediate D3cold override. The full report includes three module cycles, the comparison method and explicit limits: Thunderbolt peripherals, overnight battery drain, hibernation and other models remain untested.
Thank you to the reviewers for the hook-location, frozen-session and device-removal findings. The original installer here should not be used as the implementation of the validated module configuration. I am preserving the local workaround as a rollback and contributing the measurements to the existing module effort instead. |
Summary
Fixes a ~130-second system freeze on wake from ACPI S3 (
deep) sleep on MacBook Pro 2016–2017 models (MacBookPro13,x and MacBookPro14,x).Root Cause
On MacBook Pro 2016–2017 models equipped with Intel Alpine Ridge Thunderbolt 3 controllers (
8086:15d2NHI /8086:15d4integrated xHCI), Apple firmware cuts power to the controller during S3 sleep. On wake,xhci_hcdpolls the unpowered PCIe device (0000:07:00.0), hitting exponential backoff timeouts (1023ms->2047ms-> ... ->65535ms) totalling ~130 seconds beforepciehpdrops the dead device.Solution
install/hardware/apple/fix-suspend-thunderbolt.shto remove unpowered8086:15d4PCIe devices prior to S3 sleep.thunderboltandfacetimehdbefore sleep to prevent kernel call traces and unneeded sensor power-on.hl.dsp.dpms({ action = "enable" })upon resume across active Hyprland user sessions so the display backlight lights up immediately.0000:00:1c.4) after resume.manual/44-mac-support.mdwith documentation.