Fix intermittent suspend hang on T2 MacBooks (force synchronous device suspend) #6149
+35
−0
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,30 @@ | ||
| # 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 | ||
|
|
||
| [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,11 @@ | ||
| # Omarchy migration — apply the T2 synchronous device-suspend fix to existing | ||
| # installs. At submission time, RENAME this file to a fresh unix timestamp that | ||
| # is greater than the newest existing migration, e.g.: | ||
| # | ||
| # mv migration.sh "migrations/$(date +%s).sh" | ||
| # | ||
| # (Verify it sorts after the current latest in migrations/.) | ||
|
|
||
| echo "Fix intermittent suspend hang on T2 MacBooks (force synchronous device suspend)" | ||
|
|
||
| source $OMARCHY_PATH/install/config/hardware/apple/fix-suspend-async.sh | ||
|
Author
There was a problem hiding this comment. Done in 0fe6d3f — migration now leads with the echo like the others |
||
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.
Added ConditionPathExists=/sys/power/pm_async in 0fe6d3f, thanks.