Skip to content

arm64: dts: apple: t6050-k114c: boot NOR and read-only nvram partition - #2563

Merged
DjDeveloperr merged 1 commit into
aurora-silicon:integration/aurorafrom
joshuaswarren:w9c/1738-nor-nvram-dco
Nov 20, 2026
Merged

DjDeveloperr merged 1 commit into
aurora-silicon:integration/aurorafrom
joshuaswarren:w9c/1738-nor-nvram-dco

Conversation

@joshuaswarren

Copy link
Copy Markdown
Contributor

Replaces #1738 to add the missing author DCO sign-off without a force push. The parent and tree are unchanged from 6b26ff4 (tree 14444d7330eba9121f4a4565b2eeff4ecb823ab4).

Enables K114c QSPI boot NOR with a read-only nvram partition and alias for the boot-state tool. No writes are added. The original tree built the K114c DTB with the same warnings as base; CI on this signed commit is separate. Post-merge hardware evidence remains open: spi-nor identify, /proc/mtd nvram, and readback of boot target and volumes. No boot attempted for this replacement.

…partition

Enable the QSPI controller with a jedec,spi-nor flash on chip select 0 and
the 0xc0000-byte nvram partition at 0x700000, read-only, so asahi-bless can
read the boot state. The flash ID is probed by spi-nor.
Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 20, 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-20T13:57:09.990761Z 18cfec4 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.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Thanks for re-sending this with the sign-off. The diff is identical to #1738 at 6b26ff4, so our earlier review carries over: the description is fine and the nvram partition is read-only.

What is still missing is the hardware row on K114c that you list yourself: spi-nor identifies the boot NOR, /proc/mtd shows the nvram partition read-only, and the boot-state tool reads the boot target and volumes back through the alias. Once that row is here this is ready from our side.

Could you also close #1738 now that this one replaces it, so only one copy stays open?

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. 18cfec4 has the same parent (0abc2f3) and the same tree (14444d73) as #1738's 6b26ff4, the head I reviewed, and it adds the Signed-off-by that held #1738. dt-checks and host-tests are green on this head, and integration/aurora hasn't touched t6050-k114c.dts since that parent. Merging.

After the merge, from a K114c boot that carries the read-only partition, with a revert ready:

  • the spi-nor identify line;
  • /proc/mtd showing nvram;
  • the boot-state tool reading the boot target and volumes back.

@DjDeveloperr
DjDeveloperr merged commit 09425ce into aurora-silicon:integration/aurora Nov 20, 2026
2 checks passed
@DjDeveloperr

Copy link
Copy Markdown
Contributor

Merged as 09425ce. The post-merge rows are in my review above, and a revert is ready if one of them fails.

@joshuaswarren

Copy link
Copy Markdown
Contributor Author

J775c (lobata) row request — NOR and SD (sheet row M, rebuilt on #2563)

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 built M image is stale; rebuild on #2563, now merged as 09425cebdfe5). Fixture: one attended test SD card.

Heads: 4d9991273b (#2010) + c3688c88f1 (#1719) + #2563's merged content. Preflight: confirm the SD reader enumerates (lspci -nn -d 17a0:9755 or the J775c equivalent) and the SPI NOR identifies.

Commands: save uname -r, the carrier commit, lspci -nn -d 17a0:9755 and sudo journalctl -k -b. Mount the test SD card, read/write a disposable file on that card only. As root, run echo freeze > /sys/power/state three times with key wake at 90 s; after each wake record exit status, ls /sys/class/mmc_host/mmc0 and ip -br link. NOR checks on the same boot: the spi-nor identify line in sudo dmesg, cat /proc/mtd showing nvram, and the pinned boot-state tool's read-only boot-target and volume output.

Pass: card read/write works, all three wakes return the host and the mmc host, NOR shows nvram, and the boot-state tool reads target and volume read-only. About 15 min.

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.

3 participants