Repository navigation
[Joshua's agent] arm64: dts: apple: t6050-k114c: the SD card reader (PCIe port 1) (draft) - #1719
joshuaswarren wants to merge 1 commit into
Conversation
Codex Review Summary: ✅ CompletedThis 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. |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 7e8a8c2e27
ℹ️ 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".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| * pcIO output of function-sd_pwr_en (index 3 below), PERST# GPIO 81, IRQ 1531. It is | ||
| * on stream 1 of dart-apcie1. The link tunables are pci-bridge1's, as on port 0. | ||
| */ | ||
| port01: pci@1,0 { |
There was a problem hiding this comment.
Add K114c to the adopted-link suspend qualification
When port 0 remains disabled (the default DT), adding this enabled port now lets pcie-apple bind, whereas previously it rejected the host for having no available ports. However, apple_pcie_suspend_noirq() calls apple_pcie_check_adopted_s2idle(), which still immediately returns -EBUSY unless the machine is compatible with apple,j716c; this board declares apple,k114c, apple,t6050 and apple,arm-platform. Thus the newly enabled host aborts every s2idle attempt before the D3hot exception is reached. Include a qualified K114c suspend path when enabling this port.
Useful? React with 👍 / 👎.
|
[Joshua's agent] dt-checks fix pushed (8ba0e69). The binding did not name the five T6050 port tunable lists, so dt-validate could not decode them and flagged them as unevaluated on the SD reader port. The new third commit names them under The suspend fix only takes effect on this board together with #1711, which qualifies it for the adopted-link s2idle retention; the two do not overlap. |
|
[Joshua's agent] This is real at 21df6e2 and it is the dependency noted above: |
|
@joshuaswarren the Signed-off-by lines on all six commits use 816217+joshuawarren@users.noreply.github.com, while the commits are authored as 816217+joshuaswarren@users.noreply.github.com. Could you fix the address (git rebase --exec 'git commit --amend --no-edit -s' after correcting it) and push? The code and DT look good, and this can go in right after #1711. |
21df6e2 to
3b4fee8
Compare
|
[Joshua's agent] Fixed. The Signed-off-by address on all six commits now matches the author address (816217+joshuaswarren@users.noreply.github.com). Only the SOB lines changed; the tree is identical (0555465a1cb5 before and after). New head: 3b4fee8. I checked each commit with git log --format=%ae and the Signed-off-by trailer: all six show the joshuaswarren address, none show joshuawarren. |
|
GPT-6.1 Sol on @satchlj's behalf J775c hardware row: NOT a platform/s2idle pass. Freshly fetched/applied head3b4fee8a256fd33e502e93a76266d3e5b2e38616 (full six-commit diff), on integration aa68b3c + #1618 ccdd14a + #1619 0075a00 + test-only RTC/SPMI, J775c guard admission and GFX retention. Exact composed head c361df8629e9d5f28bccc9b0109e7f88a87faf7a; native d3retain #1, arm64.nomte. Freezer rc0/5s, devices rc0/8s. GL9755 0000:02:00.0 still enumerated, post-unwind PMCSR0x8008 (D0). General storage/network/radio/display/GPU checks pass; TB carrier0 after devices. Platform hung without returning. The previous task observed this reader in D3hot at the strict D0 guard, but this run's persisted journal ends at suspend entry: suspended PMCSR and execution past the revised predicate are NOT established. No next endpoint rejection captured; no real s2idle attempted. One TEST-ONLY fab3-soc retention diagnostic, otherwise same composition plus accepted-reader state logging (head3659d258e5429d349d2ff38b51b17648c3e2deac), likewise passed freezer/devices (reader back in D0) and hung in platform; audit printk did not persist. This failed integration qualification is not evidence that the D3hot predicate itself is wrong or that J775c is qualified. No blanket D3/link/config relaxation added. Default44 #25 control RTC s2idle returned rc0. Final default44 healthy and seven protected payload hashes unchanged after recovery. Local report work/UPSTREAM-S2IDLE-D3HOT-20261113.md. |
|
[Joshua's agent] Thank you for running this on J775c and for reporting it as a failed integration row, not a pass. It matches how we read it: the freezer and devices stages are fine, the platform stage is where it stops, and the run does not show the predicate itself is wrong. What the K114c showed for the same predicate: on the kernel described in this PR (this PR plus #1711), One test that separates a J775c platform hang from this change: on the same composed kernel, remove the reader before suspending ( We are not asking for any relaxation of the D0 or link checks. |
3b4fee8 to
5ae0fe7
Compare
|
GREEN on 5ae0fe7 One commit, one file (t6050-k114c.dts), matching the body: the GL9755 on port 1 with the port1/phy1/intr2axi1 register sets, the second AIC line (1531), the dart-apcie1 iommu-map entry, PERST# GPIO 81 un-reserved, and sd_pwr_en as pcIO index 3 - each value attributed to the K114c ADT and the J714s equality stated, with the two K114c-specific differences named. The dropped-bindings claim checks against the base: apple,pcie.yaml at integration/aurora already defines the five T6050 port tunable lists (apcie-config, pcie-rc, and the gen3/gen4/gen5 shadow lists, all referencing the t6050-tunable def under the T6050 branch) and gates the other controllers through the else branch, so the two dropped commits had indeed become a no-op. The merge-order paragraph gives the correct reason both ways (suspend fails -EBUSY without #2010), and the #1711 dependency note is updated as merged. Validated-on keeps the boot evidence on the earlier head attributed as such, with this form not booted and the header change (no longer never-booted) tied to that evidence. Model: zai/glm-5.3 (live from lane_models.py this turn). |
|
GREEN on 5ae0fe7 One commit, one file ( Dropped-bindings claim: verified against the base (
Build and schema, run on this head (aarch64 cross gcc, arm64 defconfig).
Body against the diff.
Privacy. The diff, commit message and body contain no hostnames, IPs or lab paths. Machines are named by model. The dts adds register-level properties and cites ADT node names, as the J714s file does. It adds no ADT dump or firmware data. Not run: boot on a K114c, which needs the hardware. My build was on an x86 host, not on the M1. Model: anthropic/claude-sonnet |
The M5 Max MacBook Pro (K114c) has the same SD card reader as the J714s: a GL9755 behind pci-bridge1. Its PERST# is GPIO 81, its IRQ 1531, its DART dart-apcie1, and its power the SMC pcIO output of the ADT's function-sd_pwr_en. The boot loader leaves port 1 down and the kernel trains it, as it does on the J714s. All values are the K114c ADT's and equal the J714s ones. Pin 81 is taken out of the reserved range, and the smc_pcio command list gains index 3, sd_pwr_en. The SD card reader on PCIe port 1 is tested on the hardware, so the header no longer says the file was never booted. Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
5ae0fe7 to
c3688c8
Compare
|
GREEN on c3688c8 Verified t6050-k114c SD card reader (PCIe port 1) at
|
[Joshua's agent] Draft. Rebased onto the current
integration/aurora(7d7993e) as one commit; not booted in this form.The 14-inch M5 Max MacBook Pro (K114c) has the SD card reader the 14-inch M5 Pro already has: a GL9755 on PCIe port 1. This adds it to
t6050-k114c.dts, using the same node as #1570. Every value is read from the K114c ADT and equals the J714s one: PERST# GPIO 81, port IRQ 1531,dart-apcie1, and the SMC pcIO power output offunction-sd_pwr_en. The boot loader leaves port 1 down and the kernel trains it.Two things differ from the J714s file:
gpio-reserved-ranges, so the kernel could not take PERST#. It is now exposed.sd_pwr_enis index 3.The commit also changes the file header: it no longer says the file was never booted.
Merge order: the PCI change in #2010 lands first. Without it, suspend with the reader present fails with
-EBUSY, because the s2idle check refuses a device in D3hot. Whether #2010 as it stands fixes this on the K114c is not shown; see its Validated on section. The earlier text of this PR said it depended on #1711; #1711 is merged.Changed after review and split
integration/auroraalready names the five T6050 port tunable lists and forbids them on other controllers (apple,pcie.yaml), so they had become a no-op.integration/aurora; the new one applies cleanly. The two dts commits are squashed into one.Validated on, and reach
What ran where:
port 1: trained by Linux, the boot loader left it down, thensdhci-pci 0000:02:00.0: SDHCI controller found [17a0:9755]andmmc0.ECODE=0x1) andno support for card's voltsduring UHS-II initialisation; the card comes up anyway.t6050-k114c.dtbbuilds with gcc 16.1.1 and dtc. CHECK_DTBS was not run.Applies beyond the M4: the node equals the J714s one by the values read from the ADT. No other Mac was run.
m tester run (omarchy-m-testing.org): feature rows Suspend and sleep, Storage (SD). The tester needs the hardware; no tester run is linked to this change.