Repository navigation
Conversation
[Medium impact] The changes since the previous review appear safe to merge. SummaryThis PR adds a suspend workaround for MacBookPro14,1 and keeps Apple's S3X storage controller out of D3cold on selected MacBooks.
Both numbered findings from the previous review are addressed. No new actionable issues were found. Reviews (9) · Last reviewed commit: "Cover the MacBook suspend leaf in the ha..." · Reviewed by Greptile |
|
Thanks for testing this on real hardware. One blocker before review: BLOCKING: this targets
Nit: under if (( needs_rebuild )) && omarchy-cmd-present limine-mkinitcpio; then
sudo limine-mkinitcpio
omarchy-state set reboot-required
fiAlso related: #11624 scopes the same script's D3cold fix to Apple's NVMe controller (your |
d0d5b1a to
47adc16
Compare
|
Moved onto
The udev rule matches The pull request base is now |
|
Thanks for moving this onto The one open question is the maintainers' call: whether |
|
Heads-up from a MacBookPro14,3 (15-inch, 2017). It is in this script's model list, but its NVMe is a Samsung On the 14,3 that would be a regression:
Suggestion: write the drop-in only when Happy to test a revised version on the 14,3 if useful. |
|
The three boot parameters are now installed only on the MacBookPro14,1, in 98a8df5. That is the only machine where this combination was tested. A 60-second suspend and a real lid close both resumed there. Applying the same settings from the SSD id alone would still change the MacBookPro14,2, which has The udev rule is unchanged and still matches only |
|
A data point for the 14,3 end of this gate. MacBookPro14,3 with a Samsung SM961 NVMe (
|
|
Reviewed by Claude Opus 5.5, with Codex Medium as a second opinion over three rounds. Both read the change against What was checked. The leaf writes the udev rule on every model in its match and the Limine drop-in only on the MacBookPro14,1. Fixed on your branch, in 88d7956. Codex found this and I confirmed it. The migration sourced the whole leaf, which also rewrote and re-enabled the older What it waits on: a test on a MacBookPro14,1. It needs to come from someone other than the author, or a maintainer. @orospakr, you reported the 14,1's suspend failures in #10593. If you can, please try commit git clone https://github.com/omacom/omarchy.git /tmp/omarchy-14409
git -C /tmp/omarchy-14409 fetch origin pull/14409/head
git -C /tmp/omarchy-14409 checkout 88d79567c8c59489bac284427357fcd7351ba4a6
OMARCHY_PATH=/tmp/omarchy-14409 bash -euo pipefail /tmp/omarchy-14409/migrations/1791387391.sh
# reboot, then:
cat /proc/cmdline /sys/power/mem_sleep
sudo rtcwake -m mem -s 60
journalctl -b | grep -E 'PM: suspend (entry|exit)'Then reply with that commit, the output, and whether a real lid close of a few minutes also resumed. Take out For the maintainer. |
|
One more fix on your branch, in d58c00a. Greptile's review of 88d7956 was right: It still waits on a test on a MacBookPro14,1, now at the new head. @orospakr, if you can try it, please use commit |
Disabling D3cold does not wake a MacBookPro14,1. Force s2idle and keep the 106b:2003 controller out of the power states it cannot leave. The migration aborts if the boot image rebuild fails, then asks for a reboot.
That is the only model where this sleep combo was tested. Other models keep their current sleep mode.
Sourcing the whole leaf also rewrote and re-enabled the older D3cold service on every model in its match. On the 15-inch MacBookPro13,3 and 14,3 that service writes to the GPU at 0000:01:00.0 (omacom#10826), so a user who had disabled it got it back. The migration now writes just the udev rule and, on the MacBookPro14,1, the Limine drop-in, each only when the file does not already hold its setting, so a second user's run changes nothing and a file an interrupted run left empty or cut short is rewritten. The UKI rebuild is recorded in a machine-wide marker so a second user's run before the reboot does not rebuild again. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
omarchy-state keeps reboot-required under the user's home, so skipping it along with the machine-wide rebuild left a second user who updated before the reboot without the notice. The rebuild still runs once per machine; the notice is set on every run that finds the booted command line without the parameters. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The MacBook8,1 and the 15-inch 13,3 and 14,3 no longer get the service that writes d3cold_allowed at 0000:01:00.0. The unit no longer escapes colons. The udev rule and the MacBookPro14,1 boot parameters stay.
|
@dhh Rebased onto current quattro and reconciled A month has passed since the request for a second MacBookPro14,1 test, and nobody has run one. Those three parameters were tested here: a 60-second rtcwake and a lid close of about two and a half minutes both resumed. Could a maintainer decide on that evidence? The open call is whether |
d58c00a to
ae181ce
Compare
|
I read the revised hardware script, migration and review discussion against My classification is a hardware compatibility fix, but the configured second classifier, |
limine-mkinitcpio can report a kernel it failed to rebuild and still exit 0. The migration now notices that and stays pending. Model checks go through omarchy-hw-match, anchored so a longer product name does not match.
A migration gets no suite test: it runs once and is frozen once it ships. The installer script is checked by the existing quirk harness, whose sudo stub logs systemctl instead of running it.
|
I read the revised diff at My classification remains a hardware compatibility fix. The configured second classifier, |
Problem
On a MacBookPro14,1 (2017, Apple S3X NVMe
106b:2003), closing the lid suspends and never resumes. The machine has to be forced off and cold-booted. It looks like the laptop shut down.Omarchy already installs
fix-suspend-nvme.shfor this model class. That script only setsd3cold_allowed=0on0000:01:00.0. The service was already installed and active on the test machine, and suspend still never woke.Before this change the journal had five suspend entries (two
deep, thens2idle) and noPM: suspend exit. After the kernel parameters below, the same boot woke from a 60-secondrtcwakeand from a real lid close.suspend_statswent to success 2, fail 0. The root filesystem stayed writable, and the kernel log had no NVMe identify or timeout errors.Change
For the models this script already matches (MacBook 8,1 / 9,1 / 10,1 and MacBookPro 13,1–13,3 and 14,1–14,3):
106b:2003, so D3cold stays off when the controller is not at0000:01:00.0.mem_sleep_default=s2idle nvme_core.default_ps_max_latency_us=0 intel_idle.max_cstate=1.1790589912.shapplies the same script on existing installs and rebuilds the UKI only when the running command line does not already contain those parameters.Fresh installs write the drop-in before
limine-snapper.shbuilds the boot image, so the parameters are picked up with the other hardware drop-ins.Limits
intel_idle.max_cstate=1raises idle power and heat the whole time the machine is on, and it was not tested by itself.106b:1801/106b:1802). Async suspend was left on, and these short cycles still resumed.