Skip to content

r3b.c2: carry the battery manufacture-date fix (#1615) on r3b.c1 - #150

Merged
chrisohearn merged 1 commit into
mainfrom
r3/r3b-c2
Nov 16, 2026
Merged

chrisohearn merged 1 commit into
mainfrom
r3/r3b-c2

Conversation

@chrisohearn

Copy link
Copy Markdown
Owner

What

  • patches/linux/r3b-c2.series: r3b.c1 plus sleep-lid/0007, the same file r3a carries (power: supply: macsmc: skip an unreadable manufacture date quietly aurora-silicon/linux#1615).
  • packaging/linux-k114s/PKGBUILD:
    • Adds the r3b-c2 candidate, version 7.3.0.r3b.c2-1, with the same package name and release as r3b.c1, so it upgrades in place.
    • The brightness and HDR guards now cover c2 as well.
    • A new guard refuses a tree without the fix.
  • patches/linux/r3b.series: corrects the note that called the patch "not needed".
  • Docs: docs/r3b-kernel.md section 10, and the battery row of docs/matrix.md.

Why

Seen on this Mac on 2026-11-16:

  • The owner saved an 80% charge limit: the SMC took it, and /etc/udev/macsmc-battery.conf holds 80.
  • After a reboot into r3b.c1, charge_control_end_threshold read 100.
  • That boot logged manufacture_year ... -95, and udev had no record of macsmc-battery beyond its path. So neither the asahi-scripts nor the Omarchy restore rule ran.

r3a has the fix, but since the D9 promotion r3b is the default kernel.

Proof (agent-run)

  • git am of the patch on r3b.c1 08ddebb521 gives head ecbecd26ad, tree e078a06e67c5.
  • The full build (K114S_LABEL=K114S-R3B-C2) exits 0 with no warning in drivers/power/supply or drivers/gpu/drm/apple.
  • k114s-cmp-modules against the installed r3b.c1: 1972 of 1972 modules are the same (macsmc-power is built in).
  • makepkg, then check-package.sh against linux-aurora and linux-k114s: all passed.
  • Package sha256: 57dfac86c2a51d73847a7e3e114fc1eb7b378282a73ca4b4c94ab5b6be8ed20f.
  • tests/linux/run-r3.sh: every suite passes.

Not booted yet. The owner-watched install and reboot, with the charge-limit read-back, come next.

🤖 Generated with Claude Code

r3b to r3b.c1 left out sleep-lid/0007. On this Mac every r3b boot then
logs manufacture_year -95, the battery's uevent fails, udev never handles
macsmc-battery, and a saved charge limit is not restored: an 80% limit
read 100 after a reboot into r3b.c1 (2026-11-16). r3a carries the fix,
but since the D9 promotion r3b is the default kernel.

r3b.c2 is r3b.c1 plus that patch, unchanged. PKGBUILD gets the r3b-c2
candidate and refuses a tree without the fix. The r3b.series note that
called the patch unneeded is corrected.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-16T19:52:49.165631Z 3e6e375 PR opened
🔒 Security Review ✅ Completed 2026-11-16T19:50:04.117573Z 3e6e375 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant