From: Chali Anis <[email protected]> efi_load_fdt() never ran barebox's fixup/overlay pipeline on the devicetree it handed to the kernel. When bootm.oftree was set, the raw file bytes were extracted straight into EFI pages and installed as-is; of_unflatten_dtb(), of_fix_tree() and of_flatten_dtb() were never called. When bootm.oftree was unset, the function just returned early, so there was no path at all for adopting (and fixing up) a devicetree already exposed by firmware. Either way, none of barebox's usual fixups - memory nodes, bootargs, state, overlays, and everything else hung off of_register_fixup() - ever reached the tree Linux booted with.
This single patch fixes both paths: efi_load_fdt() now falls back to the FDT firmware exposes via its EFI configuration table when no bootm.oftree is set, and either way runs the resulting tree through the standard bootm_set_pending_oftree_overlays()/of_fix_tree() sequence before installing it, matching what every other barebox boot path already guarantees. This is what makes fixups registered via of_register_fixup() actually reach the devicetree the EFI payload hands off to Linux. On real hardware (as opposed to QEMU, where none of this is normally present or needed) this matters concretely for two node types: the /memory node, since of_memory_fixup() (common/memory.c) is one of the fixups of_fix_tree() runs, and without this patch it never got a chance to correct the tree Linux actually booted with; and the /firmware and /reserved-memory nodes, since a devicetree supplied out-of-band (e.g. embedded in a FIT image) was flattened at build time and so can never carry the secure-world carve-outs and secure monitor call conduit firmware such as TF-A/OP-TEE only add to its own copy of the tree at runtime. This patch adds efi_of_fixup_firmware_nodes() to import exactly those two nodes from firmware's own devicetree onto the one Linux boots with, registered as another of_register_fixup() callback so it runs as part of the same pipeline. Changes since v1: none, resent as v2. Chali Anis (1): efi: payload: apply barebox fixups to the devicetree passed to Linux efi/payload/bootm.c | 60 ++++++++++++++++++++++++++++++------- efi/payload/fdt.c | 34 ++++++++++++++------- efi/payload/init.c | 69 +++++++++++++++++++++++++++++++++++++++++++ include/efi/payload.h | 10 +++++++ 4 files changed, 152 insertions(+), 21 deletions(-)
