-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Fix intermittent suspend hang on T2 MacBooks (force synchronous device suspend) #6149
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
andyhoops
wants to merge
2
commits into
basecamp:dev
Choose a base branch
from
andyhoops:fix-t2-suspend-async
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+35
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Fix intermittent suspend hang on T2 MacBooks caused by async device suspend. | ||
| # | ||
| # On T2 Macs the kernel default of asynchronous (parallel) device suspend | ||
| # (/sys/power/pm_async=1) intermittently HARD-HANGS the machine the instant it | ||
| # enters suspend: black screen, dead keyboard/trackpad/Touch Bar, no wake, only | ||
| # a forced power-off recovers. pm_trace fingerprints the hang in the async | ||
| # device-suspend core (drivers/base/power/main.c), not in any single driver. | ||
| # Forcing synchronous device suspend serialises it and resolves the hang. | ||
| # | ||
| # Confirmed on MacBookPro16,2 (5/5 clean suspend cycles with the fix vs 5/5 | ||
| # hangs without). Independent of suspend mode (deep or s2idle). See | ||
| # basecamp/omarchy#1840 for the broader set of affected T2 models. | ||
| if lspci -nn | grep -q "106b:180[12]"; then | ||
| echo "Detected MacBook with T2 chip. Applying synchronous device-suspend fix..." | ||
|
|
||
| cat <<EOF | sudo tee /etc/systemd/system/omarchy-pm-async-suspend-fix.service >/dev/null | ||
| [Unit] | ||
| Description=Omarchy synchronous device-suspend fix for T2 MacBook | ||
| ConditionPathExists=/sys/power/pm_async | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecStart=/bin/bash -c 'echo 0 > /sys/power/pm_async' | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target | ||
| EOF | ||
|
|
||
| chrootable_systemctl_enable omarchy-pm-async-suspend-fix.service | ||
| sudo systemctl daemon-reload | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| echo "Fix intermittent suspend hang on T2 MacBooks (force synchronous device suspend)" | ||
|
|
||
| source $OMARCHY_PATH/install/config/hardware/apple/fix-suspend-async.sh |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This script is also sourced by the migration, but
chrootable_systemctl_enableis only defined when the installer loadsinstall/helpers/all.sh.omarchy-migrateruns each migration in a fresh shell, so the function is unavailable on existing installations.On a T2 Mac, this produces
chrootable_systemctl_enable: command not found. The followingsystemctl daemon-reloadcan still succeed, causing the migration to exit successfully and be marked complete even though the service was never enabled or started.Could you make this script self-contained for the migration path, or explicitly load the helper and ensure an enable failure propagates as a non-zero exit?