rpi5_dtb.c: wire fdt.c's node-scoped lookup into the Pi 5 UART/mailbox addresses
New include/starkernel/rpi5_dtb.h / src/starkernel/arch/aarch64/rpi5_dtb.c:
rpi5_uart_base()/rpi5_mailbox_base(), each finding their peripheral by
compatible string ("arm,pl011" / "brcm,bcm2835-mbox") via fdt_find_node_by_
compatible() then reading its "reg" via fdt_find_prop_in_node().
Found and fixed a real translation gap before it could have silently
produced a wrong address: confirmed directly against bcm2712.dtsi
(raspberrypi/linux) that both peripherals live under one "soc"
simple-bus node whose ranges property adds a fixed 0x10_0000_0000
offset to every child reg value. fdt.c's reader deliberately doesn't
apply ranges translation generally (not a general devicetree
library); this file applies that one, fixed, SoC-wide offset
explicitly, documented with the exact devicetree excerpt that
confirmed it.
Compile-only verification -- no caller wired in yet, these two
functions are what the still-open entry-stub and mailbox-framebuffer-
driver punch-list items will call. Verified 3-arch boot to ok>
(amd64/aarch64/riscv64, each in the foreground; rpi5_dtb.o confirmed
built on aarch64, the only arch that compiles this file).
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019YcT3H2PQeyujrzjqS3Var
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
5e46f18fd9
commit
ca52ce8243
+18
-4
@@ -318,15 +318,29 @@ blocker for free.
|
|||||||
the crux of why most of M1–M9 stays shared.
|
the crux of why most of M1–M9 stays shared.
|
||||||
3. **Mailbox-property-interface framebuffer driver** — genuinely new code (§IV.1's own
|
3. **Mailbox-property-interface framebuffer driver** — genuinely new code (§IV.1's own
|
||||||
assessment), populating `BootInfo.framebuffer` the same shape UEFI GOP currently does, so
|
assessment), populating `BootInfo.framebuffer` the same shape UEFI GOP currently does, so
|
||||||
`console.c`/`vt100.c`/`framebuffer.c` need no changes at all downstream.
|
`console.c`/`vt100.c`/`framebuffer.c` need no changes at all downstream. **The address
|
||||||
|
lookup half is now done** — see item 4a below; the mailbox message-protocol half (framing
|
||||||
|
a real property-tag request/response over the discovered base address) is still open.
|
||||||
4. **`fdt.c`/`fdt.h` extension — DONE 2026-09-04.** Added `fdt_find_node_by_compatible()`
|
4. **`fdt.c`/`fdt.h` extension — DONE 2026-09-04.** Added `fdt_find_node_by_compatible()`
|
||||||
(matches any entry in a node's NUL-separated `compatible` list, first match in document
|
(matches any entry in a node's NUL-separated `compatible` list, first match in document
|
||||||
order) and `fdt_find_prop_in_node()` (scoped to that one node's own direct properties only
|
order) and `fdt_find_prop_in_node()` (scoped to that one node's own direct properties only
|
||||||
— stops at the first child node or the node's own end, never descends or continues into a
|
— stops at the first child node or the node's own end, never descends or continues into a
|
||||||
sibling). Same minimal, non-tree-building style as the existing reader — no new state, no
|
sibling). Same minimal, non-tree-building style as the existing reader — no new state, no
|
||||||
allocation, one linear scan per call. Verified 3-arch boot to `ok>` (compile-only — no
|
allocation, one linear scan per call. Verified 3-arch boot to `ok>`.
|
||||||
caller wired in yet; this is the shared primitive items 1/3 above and §V.3 item 3 below
|
|
||||||
will each call once built).
|
**4a. UART + mailbox address lookup — DONE 2026-09-04.** New
|
||||||
|
`include/starkernel/rpi5_dtb.h` / `src/starkernel/arch/aarch64/rpi5_dtb.c`:
|
||||||
|
`rpi5_uart_base()`/`rpi5_mailbox_base()`, each `fdt_find_node_by_compatible()` (`"arm,pl011"`
|
||||||
|
/ `"brcm,bcm2835-mbox"`) → `fdt_find_prop_in_node(..., "reg", ...)`. **A real translation
|
||||||
|
gap found and fixed before this could have been silently wrong**: confirmed directly
|
||||||
|
against `bcm2712.dtsi` (raspberrypi/linux) that both peripherals live under one `soc`
|
||||||
|
simple-bus node whose `ranges` property adds a fixed `0x10_0000_0000` offset to every
|
||||||
|
child `reg` value — `fdt.c`'s reader deliberately does not apply `ranges` translation
|
||||||
|
generally (not a general devicetree library), so this file applies that one, fixed,
|
||||||
|
SoC-wide offset explicitly by name (`BCM2712_SOC_RANGES_OFFSET`), documented with the exact
|
||||||
|
devicetree excerpt that confirmed it. Verified 3-arch boot to `ok>` (compile-only — these
|
||||||
|
two functions have no caller yet; that's the entry-stub/framebuffer-driver items above,
|
||||||
|
still open).
|
||||||
5. **`pci_init()` DTB path**: a devicetree-based alternative for RP1 discovery, since
|
5. **`pci_init()` DTB path**: a devicetree-based alternative for RP1 discovery, since
|
||||||
`boot_info->acpi_table` will be `NULL` on this path and RP1 is PCIe-attached, not directly
|
`boot_info->acpi_table` will be `NULL` on this path and RP1 is PCIe-attached, not directly
|
||||||
memory-mapped.
|
memory-mapped.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Capsule Block Manifest — Auto-generated
|
# Capsule Block Manifest — Auto-generated
|
||||||
<!-- Generated by mkcapsule --manifest 2026-09-04T17:03:08Z -->
|
<!-- Generated by mkcapsule --manifest 2026-09-04T17:33:46Z -->
|
||||||
<!-- DO NOT EDIT — re-run mkcapsule --manifest to refresh. -->
|
<!-- DO NOT EDIT — re-run mkcapsule --manifest to refresh. -->
|
||||||
<!-- Hand-written justifications and immutability notes live -->
|
<!-- Hand-written justifications and immutability notes live -->
|
||||||
<!-- in MANIFEST.md alongside this auto-generated index. -->
|
<!-- in MANIFEST.md alongside this auto-generated index. -->
|
||||||
|
|||||||
Binary file not shown.
@@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
StarForth — Steady-State Virtual Machine Runtime
|
||||||
|
Copyright (c) 2023–2025 Robert A. James. All rights reserved.
|
||||||
|
Licensed under the StarForth License, Version 1.0.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* rpi5_dtb.h - Raspberry Pi 5 (BCM2712) devicetree-based peripheral
|
||||||
|
* discovery, for the native (non-UEFI) boot path (FABRIC-3.md §IV.3).
|
||||||
|
*
|
||||||
|
* Two lookups: the PL011 UART (early console) and the VideoCore mailbox
|
||||||
|
* property interface (framebuffer setup, §IV.3 item 3). Both peripherals
|
||||||
|
* live under BCM2712's own devicetree "soc" simple-bus node, which
|
||||||
|
* applies one fixed address translation to every child `reg` value —
|
||||||
|
* see `rpi5_dtb.c`'s own doc comment for the confirmed offset and where
|
||||||
|
* it was verified. `fdt.c`'s reader deliberately does not do general
|
||||||
|
* `ranges`-property translation (it is "not a general devicetree
|
||||||
|
* library"); this file applies the one, fixed, SoC-wide offset by name
|
||||||
|
* instead of teaching `fdt.c` a general mechanism for a single known
|
||||||
|
* hardware fact.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef STARKERNEL_RPI5_DTB_H
|
||||||
|
#define STARKERNEL_RPI5_DTB_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Find the PL011 UART's CPU-physical base address from the DTB.
|
||||||
|
*
|
||||||
|
* @param dtb Devicetree blob, as passed to the native boot entry (or
|
||||||
|
* `BootInfo->dtb`); NULL is safe.
|
||||||
|
* @return Final CPU-physical MMIO base address, or 0 if the node is
|
||||||
|
* absent, malformed, or @p dtb is invalid.
|
||||||
|
*/
|
||||||
|
uint64_t rpi5_uart_base(const void* dtb);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Find the VideoCore mailbox property interface's CPU-physical
|
||||||
|
* base address from the DTB.
|
||||||
|
*
|
||||||
|
* @param dtb Devicetree blob; NULL is safe.
|
||||||
|
* @return Final CPU-physical MMIO base address, or 0 if the node is
|
||||||
|
* absent, malformed, or @p dtb is invalid.
|
||||||
|
*/
|
||||||
|
uint64_t rpi5_mailbox_base(const void* dtb);
|
||||||
|
|
||||||
|
#endif /* STARKERNEL_RPI5_DTB_H */
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,93 @@
|
|||||||
|
/*
|
||||||
|
StarForth — Steady-State Virtual Machine Runtime
|
||||||
|
Copyright (c) 2023–2025 Robert A. James. All rights reserved.
|
||||||
|
Licensed under the StarForth License, Version 1.0.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* rpi5_dtb.c - Raspberry Pi 5 (BCM2712) devicetree-based peripheral
|
||||||
|
* discovery (FABRIC-3.md §IV.3, 2026-09-04).
|
||||||
|
*
|
||||||
|
* Confirmed directly against `bcm2712.dtsi` (raspberrypi/linux,
|
||||||
|
* rpi-6.12.y) before writing this, not assumed:
|
||||||
|
*
|
||||||
|
* soc: soc@107c000000 {
|
||||||
|
* compatible = "simple-bus";
|
||||||
|
* ranges = <0x0 0x10 0x0 0x80000000>;
|
||||||
|
* #address-cells = <1>;
|
||||||
|
* #size-cells = <1>;
|
||||||
|
* ...
|
||||||
|
* uart10: serial@7d001000 {
|
||||||
|
* compatible = "arm,pl011", "arm,primecell";
|
||||||
|
* reg = <0x7d001000 0x200>;
|
||||||
|
* };
|
||||||
|
* mailbox: mailbox@7c013880 {
|
||||||
|
* compatible = "brcm,bcm2835-mbox";
|
||||||
|
* reg = <0x7c013880 0x40>;
|
||||||
|
* };
|
||||||
|
* };
|
||||||
|
*
|
||||||
|
* Every peripheral this file cares about lives under this one "soc"
|
||||||
|
* node, which applies exactly one translation to every child `reg`
|
||||||
|
* value: child address 0 maps to parent (CPU-physical) address
|
||||||
|
* 0x10_0000_0000 (`ranges`'s own `<0x0 0x10 0x0 ...>` — child cell 0,
|
||||||
|
* parent cells `0x10 0x0`, i.e. `0x10 << 32`). The child side's own
|
||||||
|
* `#address-cells = <1>` confirms each `reg` value's first cell is the
|
||||||
|
* whole child address (32-bit, no cell-splitting needed) before adding
|
||||||
|
* the offset. `fdt.c`'s reader deliberately does not parse `ranges`
|
||||||
|
* generally (it is "not a general devicetree library," per its own
|
||||||
|
* header comment) — this one, fixed, SoC-wide offset is applied here
|
||||||
|
* by name instead, since it is a single known hardware fact, not a
|
||||||
|
* general mechanism this codebase needs elsewhere yet.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "starkernel/rpi5_dtb.h"
|
||||||
|
#include "starkernel/fdt.h"
|
||||||
|
|
||||||
|
/* soc@107c000000's own `ranges` offset -- see this file's own doc
|
||||||
|
* comment above for where it was confirmed. */
|
||||||
|
#define BCM2712_SOC_RANGES_OFFSET 0x1000000000ULL
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Read a devicetree `reg` property's first cell as big-endian.
|
||||||
|
*
|
||||||
|
* `fdt.c` keeps its own `be32()` helper file-local (freestanding, no
|
||||||
|
* shared byte-swap utility to reuse) -- duplicated here rather than
|
||||||
|
* exposing it, same "a few lines is simpler than a new shared
|
||||||
|
* dependency" precedent `tools/pkcs8_ed25519.c` already set in this
|
||||||
|
* codebase.
|
||||||
|
*/
|
||||||
|
static uint32_t reg_first_cell_be32(const unsigned char* b)
|
||||||
|
{
|
||||||
|
return ((uint32_t) b[0] << 24) | ((uint32_t) b[1] << 16) |
|
||||||
|
((uint32_t) b[2] << 8) | (uint32_t) b[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Find @p compatible's node, read its `reg` base address, and
|
||||||
|
* apply the one fixed BCM2712 `soc`-node translation offset.
|
||||||
|
*/
|
||||||
|
static uint64_t rpi5_peripheral_base(const void* dtb, const char* compatible)
|
||||||
|
{
|
||||||
|
const void* node;
|
||||||
|
const void* val;
|
||||||
|
uint32_t len;
|
||||||
|
|
||||||
|
node = fdt_find_node_by_compatible(dtb, compatible);
|
||||||
|
if (!node) return 0;
|
||||||
|
|
||||||
|
val = fdt_find_prop_in_node(dtb, node, "reg", &len);
|
||||||
|
if (!val || len < 4) return 0;
|
||||||
|
|
||||||
|
return BCM2712_SOC_RANGES_OFFSET + reg_first_cell_be32((const unsigned char*) val);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t rpi5_uart_base(const void* dtb)
|
||||||
|
{
|
||||||
|
return rpi5_peripheral_base(dtb, "arm,pl011");
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t rpi5_mailbox_base(const void* dtb)
|
||||||
|
{
|
||||||
|
return rpi5_peripheral_base(dtb, "brcm,bcm2835-mbox");
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user