Repository navigation
arm64: dts: apple: t6050: wire the PMIC RTC alarm interrupt - #2007
joshuaswarren wants to merge 5 commits into
Conversation
Generation 4 (t8142, t6050) had its interrupt refused at probe. macOS's trace (reported by Dj on the Aurora M5 Pro thread) acks peripheral sources 0..255 per bit in words from +0x600, with the controller fault source 263 at +0x620 bit 7. On K114c the PMIC RTC alarm sets +0x600 bit 2 (read-only probe, alarm armed 20 s out). Take the mask and ack bank offsets from the hw table (gen1 unchanged, shared with a host check in spmi-apple-irq.h). Generation 4 has no mask bank we could find (no word in 0x20..0x7f or 0x500..0x6ff toggles), so sources are masked in the cache only. Commands stay polled: the RX notification is not wired for gen 4. Tested: host check of the register math; compile only, not booted. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
Probe on K114c: +0x400..0x41c toggle and restore (8 words), +0x420 does not, matching the +0x600 ack bank 0x200 above (Dj, seq 713, from write offsets in a macOS trace). The alarm latches +0x600 bit 2 once the PMIC alarm mask byte 0x200e is 0 (as rtc-macsmc writes it) and a write of 4 to +0x600 clears it (measured). Whether the +0x400 bit gates the AIC line is not measured. Drop the cache-only masking for gen 4. On a firmware resume re-apply the runtime mask, since a firmware sleep entry writes the mask bank itself. Host check extended; compile only, not booted. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
|
GREEN on c373799 One commit on integration/aurora, one file (t6050-die0.dtsi), and the body matches the diff: nub-spmi0 becomes an interrupt controller on AIC 726 with the ADT interrupts[1] provenance and the inference labelled as an inference; smc_rtc takes peripheral source 2 edge-rising as a wake source with the T6030-style rtc_ctrl/rtc_alarm/rtc_alarm_mask cells (0x2000/0x2008/0x200e) added to the nvmem lists. The line counts match (+25 -3). The Validated-on section stays within what ran - dtc builds of both K114c and J714c dtbs at this head and at the base, the 354-byte growth named, no CHECK_DTBS, read-only SPMI probes only on hardware - and the reach answer is the right no: a T6050 dtsi change with nothing claimed beyond the two machines that include it. The dependency on #1743 is stated both ways (needs it to do anything at run time). Consistent with the driver half I reviewed at d18d765, where I verified this dtsi content is byte-identical to the base. Model: zai/glm-5.3 (live from lane_models.py this turn). |
|
GREEN on c373799 First review. One commit, one file ( What I ran:
Non-blocking notes:
|
c373799 to
e785c70
Compare
|
GREEN on e785c70 |
|
[Joshua's agent] Marked ready. Fresh GREEN at the current head e785c70 - the review finds the delta adds apple,always-on to the atc2/atc3 usb_aon PHY rails, a property already present in-file. The change is carried in the daily kernel tree (a3m, w88/a3m at 0748738) the 14-inch M5 Max has run since Nov 16, 21:03 CST. Never exercised: the PMIC RTC alarm path has no receipt tonight. Unvoiced; checked by hand. |
Codex Review Summary: ❌ FailedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
The account paying for this security review has reached its Codex usage limits. The payer can check the Codex usage dashboard. For personal accounts, using credits requires enabling “Use credits for security reviews” in Code review settings. If you do not manage the paying account, contact this repository's admins. |
|
GREEN on e785c70 Verified T6050 PMIC RTC alarm interrupt and SPMI interrupt-controller wiring at head e785c70:
|
|
Thanks. The device-tree content reads fine: the alarm is wired through the PMIC cells and the SPMI interrupt, with no board gating, and CI is green. Two things are missing before merge:
Also, the body's status note says the head adds |
|
Note w7H/wAK (AI assistant) responding on behalf of joshuaswarren Corrected the status note: |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Thanks. The device-tree change reads right:
nub-spmi0becomes a two-cell interrupt controller on ADTinterrupts[1](AIC 726);smc_rtctakes PMIC source 2, edge rising, as its wake source, with the T6030-layoutrtc_ctrl,rtc_alarmandrtc_alarm_maskcells;- nothing is board-gated, and the corrected status note matches the diff.
Approving on content. It can't merge yet, though, because of the order Ryan pointed out. On the current base, apple_spmi_probe() refuses a generation 4 node that has an interrupt. On its own, this PR would stop nub-spmi0 probing on every board that includes t6050-die0.dtsi, which includes our J714s. rtc_offset and the other PMU cells would go with it. So it lands after #1743 (still a draft) or together with it.
When #1743 is ready, please update this branch on top of it and ping me. Then these rows come after the merge, with a revert ready: a K114c boot with both, where nub-spmi0 probes, the clock keeps its offset, and an rtcwake alarm wakes the machine. That alarm also confirms line 726. We'll add a J714s row, since the M5 Pro's deep sleep depends on this node.
|
[Joshua's agent] Restacked onto #1743's head |
e785c70 to
36daf51
Compare
|
Thanks for restacking. 36daf51 sits on #1743's head (42f3e09), and its RTC commit is line for line the e785c70 I approved. It still waits on #1743, which is a draft. This branch carries #1743's four commits, so merging it would land them too while they're still marked not ready. One of them, a71e2cd ("spmi: apple: read the fault queue before the shared ack..."), also has no Signed-off-by. Once #1743 is out of draft, signed off and merged, please update this branch and ping me, and it merges after green CI. The post-merge rows from my review stay the same. |
|
J775c (lobata) row request — RTC offset (sheet row N) Posted by Joshua's lane (wB4) from the 2026-11-20 K114c row set. We supply no image for this; it needs a tree with the J775c DTB (the combined tree re-targeted to the J775c board DTB). Never run #2007 alone. Heads: Commands: record the Pass: |
…ask writes Both open code points from review: The controller's fault source (263, word 0x620 bit 7 on gen4) shares its ack word with the notification word the handler reads first, and the stray-source path acked it directly: queued fault records were lost. Drain the queue before the bit is acked, in both the notification-word path and the readq stray path. gen4 has no notification source, and the word at +0x420 does not behave as a mask bank, so the init and teardown loops now write only the num_irqs / 32 mask words on gen4 (the legacy controllers keep the extra notification word). The host-test file is dropped: kbuild never built it and it checked constants against themselves. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
The stray-queue loop visits ack words 0 to 3 (bytes 0 to 24), while the gen4 fault source lives in word 8 (0x620), which the chained handler already reads and drains before acking. The hunk also compared a word index against byte offsets. It could never fire; remove it. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
nub-spmi0 becomes an interrupt controller on AIC 726 (ADT interrupts[1]; inference, not booted) and smc_rtc takes peripheral source 2 as a wake source with the T6030-style rtc_ctrl/rtc_alarm/rtc_alarm_mask cells (abbey 0x2000/0x2008/0x200e). Compile only. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
36daf51 to
36ef4f8
Compare
|
Claude Opus 5.5 on @satchlj's behalf. J775c (lobata) row for sheet row N: pass. What ran.
Results.
Evidence: |
|
[Joshua's agent] Clean row, thanks - this is the first hardware proof for the alarm path. On J775c it establishes: with #1743's code and #2007's exact DT values (the standalone board file carrying them, #2102 3c72bab), nub-spmi0 probes with macsmc-rtc as rtc0 and wakeup enabled; rtc_offset survives boot (4b5b01886c35 both reads); 5/5 rtcwake freeze wakes came from the PMIC RTC alarm via SPMI source 2 (pm_wakeup_irq 151, suspend_stats 0 -> 5, fail 0). Since peripheral 2 on nub-spmi0 has AIC 726 as its only possible parent, the wake path also confirms the inferred line. Scope limits, as you stated: the dtsi hunk itself is untested (J775c doesn't include t6050-die0.dtsi), and the run used cand-10 + #2592 with #1743 as code-identical cherry-picks, not the PR heads. Remaining before merge, per the review: #1743 out of draft with a71e2cd signed off, this branch rebased on it and pinged, green CI - then the K114c row DjDeveloperr named and the J714s row. The K114c combined run stays queued on our machines. |
|
J714s (Apple M5 Pro / T6050,
Assisted-by: LLM (Gemini 4 Neon) |
|
Merge-train adversarial review (MERGETRAIN-LINUX3) at 36ef4f8: BLOCKER (process), held off the train.
Notes for #1743's review (not blockers for this PR):
|
[Joshua's agent] Ready. The build and probe evidence below does not include a runtime wake test.
Split out of #1743 (gen4 SPMI interrupts), one fix per PR. This is the T6050 device-tree half; the driver half stays in #1743 and this needs it to do anything at run time.
nub-spmi0becomes an interrupt controller on AIC 726 (ADTinterrupts[1]; an inference), andsmc_rtctakes PMIC peripheral source 2 (edge rising) as a wake source, with the T6030-stylertc_ctrl,rtc_alarmandrtc_alarm_maskcells (0x2000, 0x2008, 0x200e). One file,arch/arm64/boot/dts/apple/t6050-die0.dtsi, +25 -3.Merge order: this lands after or together with #1743, which is still a draft of ours (its own evidence is stated on that PR). On the current
integration/aurorathe SPMI driver returns -EOPNOTSUPP from probe for a generation 4 controller node that has an interrupt (Generation 4 interrupt layout is not supported), so with this change alonenub-spmi0would stop probing. #1743 teaches the driver the generation 4 interrupt layout.Open: the parent line (726 against 256) is not confirmed; it is inferred from the ADT and has not been confirmed by a boot.
Validated on, and reach
What ran where:
t6050-k114c.dtbandt6050-j714c.dtbboth build with dtc at this head and atintegration/aurora(580e9119) with no dtc output, on a depth-1 checkout. The two dtbs grow by 354 bytes each. NoCHECK_DTBSschema run.+0x600bit 2); this dtsi change was not booted there or anywhere.Applies beyond the M4: no. It is a T6050 device-tree change (the K114c and J714c both include this file). Nothing was run on an M4, an M5 Pro or any other Mac.
m tester run (omarchy-m-testing.org): feature rows Suspend and sleep (RTC alarm wake). The tester needs the hardware; no tester run is linked to this change.