Skip to content

[Intel Mac P07] Preserve the MacBook8,1 SPI PIO workaround - #12685

Draft
andrew-boyd wants to merge 6 commits into
omacom:quattrofrom
andrew-boyd:intel-mac/p07-spi-pio
Draft

andrew-boyd wants to merge 6 commits into
omacom:quattrofrom
andrew-boyd:intel-mac/p07-spi-pio

Conversation

@andrew-boyd

@andrew-boyd andrew-boyd commented Sep 20, 2026 •

Copy link
Copy Markdown

[Intel Mac P07] Preserve the MacBook8,1 SPI PIO workaround

Consolidate the existing MacBook8,1 PIO/s2idle contribution. Follow-up software repairs preserve custom configuration, append SPI modules to the base list, require the complete shipped boot-parameter pair, and keep failed rebuilds retryable. The hardware parameters are unchanged.

Draft consolidation for source review and hardware-owner follow-up. Known defects remain; no hardware or merge-readiness certification is claimed. Part of the 14-feature Intel Mac series with three package companions.

Contribute: open follow-up PRs in andrew-boyd/omarchy with base intel-mac/p07-spi-pio. Use [Intel Mac P07] in the title and a contributor branch such as intel-mac/p07/describe-change. Link this feature in the series index. Merging a follow-up into this branch updates its roll-up.

This existing draft: #12685.

Full Intel Mac scope and current revision

The project covers all 64-bit Intel Macs: pre-T1, T1 and T2. MacBookPro13,3 is only the first available physical test machine. Each feature has its own hardware boundary; one model's success does not validate the rest.

Candidate head: 612908e346bfdacd31bd0d70d27955d73803f52e; reconciled upstream: 8f324c90b82790d31ab33565441e07cbdb8d2308. Published contribution commits and author/co-author metadata remain in the history.

Ready for attended physical testing; Mac hardware remains untested by this effort. The reconciled combined ISO passed fresh unencrypted/encrypted VM installations, desktop/password-lock checks, strict Neovim startup/theme checks, synthetic Apple EFI preservation through a disk wipe, and affected package/DKMS/migration checks. ISO SHA-256: 9e6288ef5cc1eadce519cdd7384c8030286eb938a6288eb218f025a61b433252.

Exact sources, results, retained failures and reproduction. These results cover the pinned combined image; standalone-versus-combined differences remain explicit. Full inventory and retained work tracks.

Scope and dependencies

Preserve the source MacBook8,1 SPI-PIO parameters and administrator configuration. Coordinate package ownership with P06; no new timing or electrical workaround is invented.

The inventory now records 188 source/context PRs: 101 have dispositions in feature tables and 87 remain only in separate work tracks. This is not 188 implemented PRs or 188-to-14 compression. The 14 feature PRs and three package companions remain the published coordination targets; retained backlog is not claimed complete.

Every affected source PR and recommended action

Current open/closed/merged state is administrative history, not proof that two patches preserve identical behavior. Included/partial identifies selected contributions; alternatives, deferred work and context are not automatically ISO content.

Source and author State Treatment and rationale Recommended action
omacom/omarchy#10141 — @monomyth open context: Existing MacBookPro13,3 bundle combines separate calibration, legacy T1/SPI, NVMe and experimental Radeon work. Retain relevant device reports and model boundaries; this roll-up does not cover or endorse the full bundle. Keep the original as its review/test target; no closure recommendation here.
omacom/omarchy#9735 — @jeissonneira open included: Selected MacBook8,1 SPI-PIO workaround with later custom-file preservation, additive MODULES handling and interrupted-initramfs retry. Existing hardware parameters are retained, not retuned. Consider closure only after maintainers accept preserved behavior and hardware coverage.

Validation and attribution

Required fresh-image checks are satisfied, with qualified reruns. The full source suite passed 273 files with two disclosed skips, but repeated NetworkManager Polkit failures during that suite temporarily locked its test account. The following password/desktop/recovery checks failed there and passed separately in a clean overlay of the same ISO; the original aggregate remains failed. The first build attempt also failed one libfprint USB-emulation test; unchanged-source isolated repeats, two complete suites and normal package checks passed afterward. That intermittent build-test failure remains documented, and its cause is not established. VM fixtures and DKMS builds do not establish physical device behavior. Physical Wi-Fi, audio, camera, Touch Bar, fingerprint, graphics and suspend behavior remain unverified by this effort.

Original source histories remain linked above. Source-authored commits already included in the roll-ups remain ancestors of this revision; additional copied contributions receive native attribution. Original attribution mapping. No original PR is edited or closed by this effort.

Consolidate existing source contributions for draft review.
Original implementation authors are retained as author/co-authors; the committer assembled and reconciled the candidate. No contributor approval or sign-off is implied.
Known defects and excluded alternatives remain documented in the PR body.

Source-PR: omacom#9735
Source-Commit: omacom#9735abba2c4
@macintog

Copy link
Copy Markdown

I confirmed three configuration-handling cases in migrations/1788318101.sh at eb1b6090 using temporary files and stubbed rebuild commands:

  • A custom drop-in without the PIO substring is replaced wholesale, losing unrelated KERNEL_CMDLINE parameters.
  • A comment containing initcall_blacklist=dw_pci_driver_init satisfies the grep check even when no active setting exists.
  • An active PIO setting without mem_sleep_default=s2idle is also treated as complete.

The latter two cases can receive the completion marker after rebuilding without establishing the intended configuration. These limitations are already disclosed in the draft; the fixtures confirm them.

Before automatic rollout, the migration should preserve unrelated parameters and verify both required settings in the effective configuration before marking completion. The existing tests cover idempotence and rebuild retry, but not these three cases.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working compatibility Make Omarchy work better on everything!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants