passage: Define a standard for firmware data flow
Subsystems (12)
v2 cover passage: Define a standard for firmware data flow
This series adds a standard way of passing information between different firmware phases. This already exists in U-Boot at a very basic level, in the form of a bloblist containing an spl_handoff structure, but the intent here is to define something useful across projects.
The need for this is growing as firmware fragments into multiple binaries each with its own purpose. Without any run-time connection, we must rely on build-time settings which are brittle and painful to keep in sync.
This feature is named 'standard passage' since the name is more unique than many others that could be chosen, it is a passage in the sense that information is flowing from one place to another and it is standard, because that is what we want to create.
The implementation is simply a pointer to a bloblist in a register, with an extra register to point to a devicetree, for more complex data. This should cover all cases (small memory footprint as well as complex data flow) and be easy enough to implement on all architectures.
The emphasis is on enabling open communcation between binaries, not enabling passage of secret, undocumented data, although this is possible in a private environment.
This series is available at u-boot-dm/pass-working
Changes in v2:
- Add a devicetree for qemu-arm so that qemu_arm_spl can work
- Add comments about how to pass standard passage to EFI
- Add comments about passing a bloblist to Linux
- Add detailed arch-specific information
- Add new patch with the arm-specific standard passage implementation
- Incorporate devicetree source
- Make the stdpass calling standard arch-specific
- Rebase to master
- Rebase to master (dropping bloblist patches already applied)
- Rework global_data for new stdpass convention
- Split the jump_to_image_no_args() change into its own patch
- Use three registers instead of two for the entry
Simon Glass (16):
spl: Tidy up the header includes
arm: qemu: Add an SPL build
spl: Rename jump_to_image_no_args()
passage: Support an incoming passage
passage: Support a control devicetree
passage: arm: Accept a passage from the previous phase
passage: spl: Support adding the dtb to the passage bloblist
passage: spl: Support passing the passage to U-Boot
passage: arm: Add the arch-specific standard passage impl
passage: Add a qemu test for ARM
sandbox: Add a way of checking structs for standard passage
passage: Add documentation
passage: Add docs for spl_handoff
x86: Move Intel GNVS file into the common include directory
passage: Add checks for pre-existing blobs
WIP: RFC: Add a gitlab test
.gitlab-ci.yml | 6 +
MAINTAINERS | 10 +
arch/arm/Kconfig | 2 +-
arch/arm/cpu/armv7/cpu.c | 28 ++
arch/arm/cpu/armv7/start.S | 7 +-
arch/arm/cpu/armv8/cpu.c | 20 +
arch/arm/dts/qemu-arm-u-boot.dtsi | 22 +
arch/arm/dts/qemu-arm.dts | 393 ++++++++++++++++-
arch/arm/lib/crt0.S | 5 +
arch/arm/mach-imx/imx8ulp/soc.c | 2 +-
arch/arm/mach-imx/spl.c | 2 +-
arch/arm/mach-k3/common.c | 2 +-
arch/arm/mach-omap2/boot-common.c | 2 +-
arch/arm/mach-qemu/Kconfig | 9 +
arch/arm/mach-tegra/spl.c | 2 +-
arch/mips/lib/spl.c | 2 +-
arch/riscv/lib/spl.c | 2 +-
arch/sandbox/cpu/spl.c | 4 +-
arch/x86/cpu/apollolake/acpi.c | 2 +-
arch/x86/cpu/intel_common/acpi.c | 2 +-
.../include/asm/arch-apollolake/global_nvs.h | 2 +-
arch/x86/lib/spl.c | 2 +-
arch/x86/lib/tpl.c | 2 +-
board/emulation/qemu-arm/Kconfig | 23 +-
board/emulation/qemu-arm/MAINTAINERS | 1 +
board/emulation/qemu-arm/Makefile | 1 +
board/emulation/qemu-arm/spl.c | 27 ++
board/freescale/common/fsl_chain_of_trust.c | 2 +-
board/google/chromebook_coral/coral.c | 2 +-
board/renesas/rcar-common/gen3-spl.c | 2 +-
board/sandbox/Makefile | 3 +-
board/sandbox/stdpass_check.c | 107 +++++
common/Kconfig | 51 +++
common/bloblist.c | 8 +-
common/board_f.c | 48 ++-
common/spl/spl.c | 95 ++++-
configs/qemu_arm_spl_defconfig | 78 ++++
doc/board/emulation/qemu-arm.rst | 37 ++
doc/develop/bloblist.rst | 4 +-
doc/develop/index.rst | 1 +
doc/develop/std_passage.rst | 396 ++++++++++++++++++
drivers/usb/gadget/f_sdp.c | 2 +-
dts/Kconfig | 12 +
include/asm-generic/global_data.h | 38 ++
include/bloblist.h | 1 +
include/fdtdec.h | 4 +
include/handoff.h | 8 +-
.../x86/include/asm => include}/intel_gnvs.h | 0
include/passage.h | 28 ++
include/spl.h | 4 +-
include/stdpass/README | 4 +
include/stdpass/tpm2_eventlog.h | 42 ++
include/stdpass/vboot_ctx.h | 267 ++++++++++++
lib/asm-offsets.c | 6 +
lib/fdtdec.c | 33 ++
test/py/tests/test_passage.py | 11 +
56 files changed, 1804 insertions(+), 72 deletions(-)
create mode 100644 arch/arm/dts/qemu-arm-u-boot.dtsi
create mode 100644 board/emulation/qemu-arm/spl.c
create mode 100644 board/sandbox/stdpass_check.c
create mode 100644 configs/qemu_arm_spl_defconfig
create mode 100644 doc/develop/std_passage.rst
rename {arch/x86/include/asm => include}/intel_gnvs.h (100%)
create mode 100644 include/passage.h
create mode 100644 include/stdpass/README
create mode 100644 include/stdpass/tpm2_eventlog.h
create mode 100644 include/stdpass/vboot_ctx.h
create mode 100644 test/py/tests/test_passage.pySignature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 1/16 spl: Tidy up the header includes
These are out of order. Fix them.
---
(no changes since v1)
common/spl/spl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
common/spl/spl.c +9 -11
@@ -9,33 +9,31 @@#include <common.h> #include <bloblist.h> #include <binman_sym.h> +#include <bootcount.h> #include <bootstage.h> #include <dm.h> +#include <fdt_support.h> #include <handoff.h> #include <hang.h> +#include <image.h> #include <init.h> #include <irq_func.h> #include <log.h> +#include <malloc.h> #include <mapmem.h> +#include <nand.h> #include <serial.h> #include <spl.h> -#include <asm/global_data.h> -#include <asm/u-boot.h> -#include <nand.h> -#include <fat.h> -#include <u-boot/crc.h> #if CONFIG_IS_ENABLED (BANNER_PRINT )#include <timestamp.h> #endif #include <version.h> -#include <image.h> -#include <malloc.h> -#include <mapmem.h> +#include <wdt.h> +#include <asm/global_data.h> +#include <asm/u-boot.h> #include <dm/root.h> #include <linux/compiler.h> -#include <fdt_support.h> -#include <bootcount.h> -#include <wdt.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 2/16 arm: qemu: Add an SPL build
In reply to Simon GlassAdd an SPL build for qemu so we can test the standard passage feature.
Include a binman definition so that SPL and U-Boot are in the same image. This requires adding a proper devicetree file for qemu_arm. It is only used for the SPL build.
For now this just boots to a prompt.
---
(no changes since v1)
arch/arm/dts/qemu-arm-u-boot.dtsi | 22 ++ arch/arm/dts/qemu-arm.dts | 393 ++++++++++++++++++++++++++- arch/arm/mach-qemu/Kconfig | 9 + board/emulation/qemu-arm/Kconfig | 23 +- board/emulation/qemu-arm/MAINTAINERS | 1 + board/emulation/qemu-arm/Makefile | 1 + board/emulation/qemu-arm/spl.c | 27 ++ configs/qemu_arm_spl_defconfig | 72 +++++ doc/board/emulation/qemu-arm.rst | 37 +++ 9 files changed, 580 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/qemu-arm-u-boot.dtsi create mode 100644 board/emulation/qemu-arm/spl.c create mode 100644 configs/qemu_arm_spl_defconfig
arch/arm/dts/qemu-arm-u-boot.dtsi new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Sample device tree for qemu_arm + + * Copyright 2021 Google LLC + */ + +/ { + binman { + u-boot-spl { + size = <0x10000>; + }; + + u-boot { + }; + }; + + pl011@9000000 { + u-boot,dm-spl; + }; + +};
arch/arm/dts/qemu-arm.dts +392 -1
402 lines not on this page · raw message
arch/arm/mach-qemu/Kconfig +9 -0
@@ -20,6 +20,15 @@ config TARGET_QEMU_ARM_32BIT select CPU_V7A select SYS_ARCH_TIMER +config TARGET_QEMU_ARM_32BIT_SPL + bool "ARMv7-A, 32bit with SPL" + select ARCH_SUPPORT_PSCI + select BOARD_LATE_INIT + select CPU_V7A + select SYS_ARCH_TIMER + select SPL + select BINMAN + config TARGET_QEMU_ARM_64BIT bool "ARMv8, 64bit" select ARM64
board/emulation/qemu-arm/Kconfig +19 -4
@@ -1,12 +1,10 @@ -if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT - -config SYS_TEXT_BASE - default 0x00000000 +if ARCH_QEMU config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CMD_QFW select QFW_MMIO + select SUPPORT_SPL imply VIRTIO_MMIO imply VIRTIO_PCI imply VIRTIO_NET
@@ -14,6 +12,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy endif +if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT + +config SYS_TEXT_BASE + default 0x00000000 + +endif + if TARGET_QEMU_ARM_64BIT && !TFABOOT config BOARD_SPECIFIC_OPTIONS imply SYS_MTDPARTS_RUNTIME
@@ -21,3 +26,13 @@ config BOARD_SPECIFIC_OPTIONS source "board/emulation/common/Kconfig" endif + +if TARGET_QEMU_ARM_32BIT_SPL + +config SPL_TEXT_BASE + default 0x00000000 + +config SYS_TEXT_BASE + default 0x00010000 + +endif
board/emulation/qemu-arm/MAINTAINERS +1 -0
@@ -4,4 +4,5 @@ S: Maintained F: board/emulation/qemu-arm/ F: include/configs/qemu-arm.h F: configs/qemu_arm_defconfig +F: configs/qemu_arm_spl_defconfig F: configs/qemu_arm64_defconfig
board/emulation/qemu-arm/Makefile +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += qemu-arm.o +obj-$(CONFIG_SPL_BUILD) += spl.o
board/emulation/qemu-arm/spl.c new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021 Google LLC +* Written by Simon Glass <[email protected]> +*/ + +#include <common.h> +#include <cpu_func.h> +#include <spl.h> +#include <asm/spl.h> + +u32 spl_boot_device (void ) +{ +return BOOT_DEVICE_BOARD ; +} + +static int spl_qemu_load_image (struct spl_image_info *spl_image, +struct spl_boot_device *bootdev) +{ + spl_image->name ="U-Boot" ; + spl_image->load_addr =spl_get_image_pos (); + spl_image->entry_point =spl_get_image_pos (); +flush_cache (spl_image->load_addr,spl_get_image_size ()); + +return 0 ; +} +SPL_LOAD_IMAGE_METHOD ("QEMU" ,0 ,BOOT_DEVICE_BOARD , spl_qemu_load_image);
configs/qemu_arm_spl_defconfig new file +72 -0
72 lines not on this page · raw message
doc/board/emulation/qemu-arm.rst +37 -0
@@ -38,6 +38,11 @@ Set the CROSS_COMPILE environment variable as usual, and run: make qemu_arm64_defconfig make +- for ARM with SPL:: + + make qemu_arm_spl_defconfig + make + Running U-Boot -------------- The minimal QEMU command line to get U-Boot up and running is:
@@ -50,6 +55,10 @@ The minimal QEMU command line to get U-Boot up and running is: qemu-system-aarch64 -machine virt -nographic -cpu cortex-a57 -bios u-boot.bin +- For ARM with SPL:: + + qemu-system-arm -machine virt -nographic -bios image.bin + Note that for some odd reason qemu-system-aarch64 needs to be explicitly told to use a 64-bit CPU or it will boot in 32-bit mode. The -nographic argument ensures that output appears on the terminal. Use Ctrl-A X to quit.
@@ -115,6 +124,34 @@ Enable the TPM on U-Boot's command line with:: tpm2 startup TPM2_SU_CLEAR +SPL Description +--------------- + +As you see above, running the SPL build is a little different, since there are +two binaries to load into memory: SPL and U-Boot proper. Binman is used to +produce the combined `image.bin` containing these. See +`arch/arm/dts/qemu-arm-u-boot.dtsi` for the definition. A custom loader called +`spl_qemu_load_image()` is used to access the U-Boot binary from within SPL. + +A sample run is shown below:: + + U-Boot SPL 2021.10 (Oct 28 2021 - 20:57:27 -0600) + Trying to boot from QEMU + + + U-Boot 2021.10 (Oct 28 2021 - 20:57:27 -0600) + + DRAM: 128 MiB + Flash: 64 MiB + Loading Environment from Flash... *** Warning - bad CRC, using default environment + + In: pl011@9000000 + Out: pl011@9000000 + Err: pl011@9000000 + Net: eth0: virtio-net#32 + Hit any key to stop autoboot: 0 + => + Debug UART ----------
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 3/16 spl: Rename jump_to_image_no_args()
In reply to Simon GlassThis is about to become a misnomer since with standard passage we need to pass arguments to U-Boot. Rename the function.
---
Changes in v2:
- Split the jump_to_image_no_args() change into its own patch
arch/arm/mach-imx/imx8ulp/soc.c | 2 +- arch/arm/mach-imx/spl.c | 2 +- arch/arm/mach-k3/common.c | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- arch/arm/mach-tegra/spl.c | 2 +- arch/mips/lib/spl.c | 2 +- arch/riscv/lib/spl.c | 2 +- arch/sandbox/cpu/spl.c | 4 ++-- arch/x86/lib/spl.c | 2 +- arch/x86/lib/tpl.c | 2 +- board/freescale/common/fsl_chain_of_trust.c | 2 +- board/renesas/rcar-common/gen3-spl.c | 2 +- common/spl/spl.c | 4 ++-- drivers/usb/gadget/f_sdp.c | 2 +- include/spl.h | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-)
arch/arm/mach-imx/imx8ulp/soc.c +1 -1
@@ -512,7 +512,7 @@ int arch_cpu_init_dm(void) }#if defined(CONFIG_SPL_BUILD ) -__weak void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +__weak void __noreturn jump_to_image (struct spl_image_info *spl_image) {debug ("image entry point: 0x%lx\n" , spl_image->entry_point);
arch/arm/mach-imx/spl.c +1 -1
@@ -279,7 +279,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)* +------------+ + CSF_PAD_SIZE */ -__weak void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +__weak void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(void );uint32_t offset;
arch/arm/mach-k3/common.c +1 -1
@@ -198,7 +198,7 @@ __weak void release_resources_for_core_shutdown(void)debug ("%s not implemented...\n" , __func__); } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(void );struct ti_sci_handle *ti_sci =get_ti_sci_handle ();
arch/arm/mach-omap2/boot-common.c +1 -1
@@ -216,7 +216,7 @@ void spl_board_init(void)#endif } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(u32 *); image_entry_noargs_t image_entry =
arch/arm/mach-tegra/spl.c +1 -1
@@ -44,7 +44,7 @@ u32 spl_boot_device(void)return BOOT_DEVICE_RAM ; } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {debug ("image entry point: 0x%lX\n" , spl_image->entry_point);
arch/mips/lib/spl.c +1 -1
@@ -8,7 +8,7 @@#include <log.h> #include <spl.h> -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(void ); image_entry_noargs_t image_entry =
arch/riscv/lib/spl.c +1 -1
@@ -36,7 +36,7 @@ __weak void board_init_f(ulong dummy)panic ("spl_board_init_f() failed: %d\n" , ret); } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_riscv_t )(ulong hart,void *dtb);void *fdt_blob;
arch/sandbox/cpu/spl.c +2 -2
@@ -58,7 +58,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image, }/* -* Set up spl_image to boot from jump_to_image_no_args(). Allocate this +* Set up spl_image to boot from jump_to_image(). Allocate this * outsdide the RAM buffer (i.e. don't use strdup()). */ spl_image->arg =os_malloc (strlen (fname) +1 );
@@ -87,7 +87,7 @@ void spl_board_init(void) } } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {const char *fname = spl_image->arg;
arch/x86/lib/spl.c +1 -1
@@ -238,7 +238,7 @@ int spl_spi_load_image(void) }#ifdef CONFIG_X86_RUN_64BIT -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {int ret;
arch/x86/lib/tpl.c +1 -1
@@ -110,7 +110,7 @@ int spl_spi_load_image(void)return -EPERM ; } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {debug ("Jumping to %s at %lx\n" ,spl_phase_name (spl_next_phase ()), (ulong )spl_image->entry_point);
board/freescale/common/fsl_chain_of_trust.c +1 -1
@@ -140,7 +140,7 @@ void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr)/* Override weak funtion defined in SPL framework to enable validation * of main u-boot image before jumping to u-boot image. */ -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(void );uint32_t hdr_addr;
board/renesas/rcar-common/gen3-spl.c +1 -1
@@ -34,7 +34,7 @@ u32 spl_boot_device(void)return BOOT_DEVICE_UART ; } -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +void __noreturn jump_to_image (struct spl_image_info *spl_image) {debug ("image entry point: 0x%lx\n" , spl_image->entry_point);if (spl_image->os ==IH_OS_ARM_TRUSTED_FIRMWARE ) {
common/spl/spl.c +2 -2
@@ -385,7 +385,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image,return 0 ; } -__weak void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) +__weak void __noreturn jump_to_image (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(void );
@@ -820,7 +820,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)#endif spl_board_prepare_for_boot (); -jump_to_image_no_args (&spl_image); +jump_to_image (&spl_image); }/*
drivers/usb/gadget/f_sdp.c +1 -1
@@ -863,7 +863,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image)/* In SPL, allow jumps to U-Boot images */ struct spl_image_info spl_image = {};spl_parse_image_header (&spl_image, header); -jump_to_image_no_args (&spl_image); +jump_to_image (&spl_image);#else /* In U-Boot, allow jumps to scripts */ image_source_script (sdp_func->jmp_address,"script@1" );
include/spl.h +1 -1
@@ -579,7 +579,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image,int spl_load_image_fat_os (struct spl_image_info *spl_image,struct blk_desc *block_dev,int partition); -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image); +void __noreturn jump_to_image (struct spl_image_info *spl_image);/* SPL EXT image functions */ int spl_load_image_ext(struct spl_image_info *spl_image,
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 4/16 passage: Support an incoming passage
In reply to Simon GlassPlumb in the ability for U-Boot proper to accept an incoming standard passage from a previous phase, such as SPL or TF-A. This allows data to be passed from binary to binary when firmware is booting.
---
Changes in v2:
- Rebase to master
- Rework global_data for new stdpass convention
common/Kconfig | 31 ++++++++++++++++++++++++++++++ common/bloblist.c | 7 ++++++- common/board_f.c | 32 ++++++++++++++++--------------- include/asm-generic/global_data.h | 28 +++++++++++++++++++++++++++ lib/asm-offsets.c | 6 ++++++ 5 files changed, 88 insertions(+), 16 deletions(-)
common/Kconfig +31 -0
@@ -757,6 +757,14 @@ config BLOBLIST_ALLOC specify a fixed address on systems where this is unknown or can change at runtime. +config BLOBLIST_PASSAGE + bool "Obtain bloblist from standard passage information" + help + Rather than allocating the bloblist, get it from the standard + passage provided by an earlier phase, e.g. SPL. The bloblist address + and size are used as is, except that the bloblist is of course + relocated when U-Boot relocates. + endchoice config BLOBLIST_ADDR
@@ -815,6 +823,13 @@ config SPL_BLOBLIST_ALLOC specify a fixed address on systems where this is unknown or can change at runtime. +config SPL_BLOBLIST_PASSAGE + bool "Obtain bloblist from standard passage information" + help + Rather than allocating the bloblist, get it from the standard + passage provided by an earlier phase, e.g. TPL. The bloblist address + and size are used as is within SPL, then passed on to U-Boot. + endchoice endif # SPL_BLOBLIST
@@ -850,6 +865,22 @@ endif # TPL_BLOBLIST endmenu +config PASSAGE_IN + bool "Support the standard-passage protocol (in)" + help + This enables a standard protocol for entering U-Boot, providing + parameters in a bloblist with a devicetree. It allows the various + firmware phases to communicate state and settings to following + phases. + +config SPL_PASSAGE_IN + bool "Support the standard-passage protocol in SPL (in)" + help + This enables a standard protocol for entering SPL, providing + parameters in a bloblist and a devicetree. It allows the various + firmware phases to communicate state and settings to following + phases. + source "common/spl/Kconfig" config IMAGE_SIGN_INFO
common/bloblist.c +6 -1
@@ -441,7 +441,8 @@ int bloblist_init(void)* allocated bloblist from a previous stage, so it must be at a fixed * address. */ - expected = fixed && !u_boot_first_phase (); + expected = (fixed ||CONFIG_IS_ENABLED (BLOBLIST_PASSAGE )) && + !u_boot_first_phase ();if (spl_prev_phase () ==PHASE_TPL && !IS_ENABLED (CONFIG_TPL_BLOBLIST )) expected = false;if (fixed)
@@ -449,6 +450,10 @@ int bloblist_init(void) CONFIG_BLOBLIST_ADDR); size =CONFIG_BLOBLIST_SIZE ;if (expected) { +if (CONFIG_IS_ENABLED (BLOBLIST_PASSAGE )) { + addr = gd->passage_bloblist; + size =0 ; + } ret =bloblist_check (addr, size);if (ret) { log_warning("Expected bloblist at %lx not found (err=%d)\n",
common/board_f.c +17 -15
@@ -570,11 +570,13 @@ static int reserve_stacks(void)static int reserve_bloblist (void ) {#ifdef CONFIG_BLOBLIST +int new_size =CONFIG_BLOBLIST_SIZE_RELOC ; + +if (!new_size) + new_size =bloblist_get_size ();/* Align to a 4KB boundary for easier reading of addresses */ - gd->start_addr_sp =ALIGN_DOWN (gd->start_addr_sp - -CONFIG_BLOBLIST_SIZE_RELOC ,0x1000 ); - gd->new_bloblist =map_sysmem (gd->start_addr_sp, -CONFIG_BLOBLIST_SIZE_RELOC ); + gd->start_addr_sp =ALIGN_DOWN (gd->start_addr_sp - new_size,0x1000 ); + gd->new_bloblist =map_sysmem (gd->start_addr_sp, new_size);#endif return 0 ;
@@ -655,21 +657,21 @@ static int reloc_bootstage(void)static int reloc_bloblist (void ) {#ifdef CONFIG_BLOBLIST -/* -* Relocate only if we are supposed to send it -*/ -if ((gd->flags &GD_FLG_SKIP_RELOC ) && -CONFIG_BLOBLIST_SIZE ==CONFIG_BLOBLIST_SIZE_RELOC ) { +int size =bloblist_get_size (); +int new_size =CONFIG_BLOBLIST_SIZE_RELOC ; + +if (!new_size) + new_size = size; + +/* Relocate only if we are supposed to send it */ +if ((gd->flags &GD_FLG_SKIP_RELOC ) && size == new_size) {debug ("Not relocating bloblist\n" );return 0 ; }if (gd->new_bloblist) { -int size =CONFIG_BLOBLIST_SIZE ; - -debug ("Copying bloblist from %p to %p, size %x\n" , - gd->bloblist, gd->new_bloblist, size); -bloblist_reloc (gd->new_bloblist,CONFIG_BLOBLIST_SIZE_RELOC , - gd->bloblist, size); +debug ("Copying bloblist from %p size %x to %p, size %x\n" , + gd->bloblist, size, gd->new_bloblist, new_size); +bloblist_reloc (gd->new_bloblist, new_size, gd->bloblist, size); gd->bloblist = gd->new_bloblist; }#endif
include/asm-generic/global_data.h +28 -0
@@ -119,6 +119,34 @@ struct global_data {*/ unsigned long precon_buf_idx;#endif +/** +* @passage_mach: Incoming machine information from standard passage +* +* Provides a value which indicates whether passage is used, e.g. +* PASSAGE_ABI_MACH +*/ +ulong passage_mach; +/** +* @passage_bloblist: Incoming bloblist from standard passage +* +* Provides the address of the bloblist passed in by the previous stage +* or phase. If this is zero, there is none. +*/ +ulong passage_bloblist; + +/** +* @passage_dtb: Incoming control devicetree within standard passage +* +* Provides the address (typically within the bloblist) where the +* control DTB is stored. If this is zero, there is none. +* +* Note: This must be set to the correct value if the control DTB exists +* since SPL may use this and ignore the bloblist, e.g. if bloblist +* support is not enabled for code-size reasons. If this value is not +* valid, any devicetree passed in the passage_bloblist is ignored. +*/ +ulong passage_dtb; +/** * @env_addr: address of environment structure *
lib/asm-offsets.c +6 -0
@@ -46,5 +46,11 @@ int main(void)DEFINE (GD_ENV_ADDR , offsetof(struct global_data , env_addr)); +DEFINE (GD_PASSAGE_MACH , offsetof(struct global_data , passage_mach)); +DEFINE (GD_PASSAGE_BLOBLIST , + offsetof(struct global_data , passage_bloblist)); +DEFINE (GD_PASSAGE_DTB , + offsetof(struct global_data , passage_dtb)); +return 0 ; }
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 5/16 passage: Support a control devicetree
In reply to Simon GlassAdd support for accepting a control devicetree from the incoming passage. This allows SPL (or some other program) to pass a devicetree to U-Boot proper in a standard way.
Pass the devicetree through the early parts of U-Boot needs a list care. If it is in the bloblist, there is no need to reserve a separate space for it to relocate into, since it will be relocated as part of the bloblist.
Also we must init the bloblist before calling fdtdec_setup(), so the devicetree can be read from the bloblist*. This is not normally safe, since malloc() is be called by bloblist_init() if CONFIG_BLOBLIST_ALLOC is enabled. But in the case of a devicetree in the incoming passage, we know we won't need to allocate the bloblist, since the previous phase has set it up for us.
Finally, move the reloc_fdt() call after the reloc_bloblist() since, as mentioned above, when the passage is used there is no need to relocate the devicetree.
There is one subtlety here. If bloblist support is not enabled in U-Boot, it can still receive a control devicetree, using the passage_dtb_off value added to passage_bloblist. This allows the devicetree passing to work even if the bloblist itself is ignored. In that case we do need to relocate the devicetree. Use a global_data flag for this case.
* Actually we could init the bloblist later, since we have the offset of the devicetree in a register, but that seems like an extreme measure, bypassing U-Boot's own bloblist implementation to get at the data.
---
Changes in v2:
- Incorporate devicetree source
- Rebase to master
common/bloblist.c | 1 + common/board_f.c | 16 +++++++++++---- dts/Kconfig | 12 +++++++++++ include/asm-generic/global_data.h | 4 ++++ include/bloblist.h | 1 + include/fdtdec.h | 4 ++++ lib/fdtdec.c | 33 +++++++++++++++++++++++++++++++ 7 files changed, 67 insertions(+), 4 deletions(-)
common/bloblist.c +1 -0
@@ -39,6 +39,7 @@ static struct tag_name { { BLOBLISTT_NONE, "(none)" },/* BLOBLISTT_AREA_FIRMWARE_TOP */ + { BLOBLISTT_CONTROL_DTB, "Control DTB" },/* BLOBLISTT_AREA_FIRMWARE */ { BLOBLISTT_ACPI_GNVS, "ACPI GNVS" },
common/board_f.c +12 -4
@@ -517,7 +517,7 @@ static int reserve_global_data(void)static int reserve_fdt (void ) { -if (!IS_ENABLED (CONFIG_OF_EMBED )) { +if (!IS_ENABLED (CONFIG_OF_EMBED ) && !(gd->flags &GD_FLG_OF_PASSAGE )) {/* * If the device tree is sitting immediately above our image * then we must relocate it. If it is embedded in the data
@@ -622,7 +622,12 @@ static int init_post(void)static int reloc_fdt (void ) { -if (!IS_ENABLED (CONFIG_OF_EMBED )) { +if (IS_ENABLED (CONFIG_OF_PASSAGE ) && (gd->flags &GD_FLG_OF_PASSAGE )) { +void *blob =bloblist_find (BLOBLISTT_CONTROL_DTB ,0 ); + +log_info ("passage: Control dtb relocated to %p\n" , blob); + gd->fdt_blob = blob; + }else if (!IS_ENABLED (CONFIG_OF_EMBED )) {if (gd->flags &GD_FLG_SKIP_RELOC )return 0 ;if (gd->new_fdt) {
@@ -821,6 +826,9 @@ __weak int clear_bss(void)static const init_fnc_t init_sequence_f[] = { setup_mon_len, +#ifdef CONFIG_OF_PASSAGE + bloblist_init, +#endif #ifdef CONFIG_OF_CONTROL fdtdec_setup, #endif
@@ -830,7 +838,7 @@ static const init_fnc_t init_sequence_f[] = { initf_malloc, log_init, initf_bootstage,/* uses its own timer, so does not need DM */ -#ifdef CONFIG_BLOBLIST +#if !defined(CONFIG_OF_PASSAGE) && defined(CONFIG_BLOBLIST) bloblist_init, #endif setup_spl_handoff,
@@ -940,9 +948,9 @@ static const init_fnc_t init_sequence_f[] = { setup_bdinfo, display_new_sp, INIT_FUNC_WATCHDOG_RESET - reloc_fdt, reloc_bootstage, reloc_bloblist, + reloc_fdt, setup_reloc, #if defined(CONFIG_X86) || defined(CONFIG_ARC) copy_uboot_to_ram,
dts/Kconfig +12 -0
@@ -96,6 +96,18 @@ config OF_EMBED endchoice +config OF_PASSAGE + bool "Devicetree provided by the standard passage protocol" + help + If this option is enabled, the device tree may be provided by the + standard passage, meaning that a previous phase/stage passes a + bloblist containing this. This is the standard way to pass a + devicetree between firmware components at runtime. The device tree + bundled with the image (if any) will be overridden / ignored. + + Note: If BLOBLIST is not enabled, this does not decode the + bloblist, but just picks up the devicetree by itself. + config OF_BOARD bool "Provided by the board (e.g a previous loader) at runtime" default y if SANDBOX || OF_HAS_PRIOR_STAGE
include/asm-generic/global_data.h +4 -0
@@ -638,6 +638,10 @@ enum gd_flags {* @GD_FLG_SMP_READY: SMP initialization is complete */ GD_FLG_SMP_READY =0x80000 , +/** +* @GD_FLG_OF_PASSAGE: Using devicetree from standard passage protocol +*/ + GD_FLG_OF_PASSAGE = 0x80000, };#endif /* __ASSEMBLY__ */
include/bloblist.h +1 -0
@@ -31,6 +31,7 @@ enum bloblist_tag_t {* projects. */ BLOBLISTT_AREA_FIRMWARE_TOP =0x1 , +BLOBLISTT_CONTROL_DTB =1 ,/* Devicetree used for control */ /* Standard area to allocate blobs used across firmware components */ BLOBLISTT_AREA_FIRMWARE = 0x100,
include/fdtdec.h +4 -0
@@ -56,6 +56,9 @@ struct bd_info;* * @FDTSRC_SEPARATE: Appended to U-Boot. This is the normal approach if U-Boot * is the only firmware being booted +* @FDTSRC_PASSAGE: From the standard passage (passed in from previous +* phase/stage). This is the normal approach if prior-stage firmware is +* used, such as TF-A * @FDTSRC_FIT: Found in a multi-dtb FIT. This should be used when U-Boot must * select a devicetree from many options * @FDTSRC_BOARD: Located by custom board code. This should only be used when
@@ -68,6 +71,7 @@ struct bd_info;*/ enum fdt_source_t {FDTSRC_SEPARATE , +FDTSRC_PASSAGE ,FDTSRC_FIT ,FDTSRC_BOARD ,FDTSRC_EMBED ,
lib/fdtdec.c +33 -0
@@ -3,8 +3,11 @@* Copyright (c) 2011 The Chromium OS Authors. */ +#define LOG_CATEGORY LOGC_DT +#ifndef USE_HOSTCC #include <common.h> +#include <bloblist.h> #include <boot_fit.h> #include <dm.h> #include <hang.h>
@@ -78,6 +81,7 @@ static const char * const compat_names[COMPAT_COUNT] = {static const char *const fdt_src_name[] = { [FDTSRC_SEPARATE ] ="separate" , + [FDTSRC_PASSAGE ] ="passage" , [FDTSRC_FIT ] ="fit" , [FDTSRC_BOARD ] ="board" , [FDTSRC_EMBED ] ="embed" ,
@@ -1649,6 +1653,35 @@ int fdtdec_setup(void) gd->fdt_src =FDTSRC_EMBED ; } +/* Passed in via the standard passage */ +if (IS_ENABLED (CONFIG_OF_PASSAGE ) && gd->passage_dtb) { +void *passage_dtb =map_sysmem (gd->passage_dtb,0 ); +void *fdt =NULL ; + +/* Use the bloblist if available */ +if (CONFIG_IS_ENABLED (BLOBLIST )) { + fdt =bloblist_find (BLOBLISTT_CONTROL_DTB ,0 ); + +if (fdt == passage_dtb) + gd->flags |=GD_FLG_OF_PASSAGE ; + }else { +void *bloblist; + +/* Cursory check for a valid bloblist; use the offset */ + bloblist =bloblist_check_magic (gd->passage_bloblist); +if (bloblist) { + fdt = passage_dtb; +log_debug ("passage: Found dtb addr %lx\n" , + gd->passage_dtb); + } + } +if (fdt) { + gd->fdt_blob = fdt; + gd->fdt_src =FDTSRC_PASSAGE ; +log_debug ("passage: Found control dtb at %p\n" , fdt); + } + } +/* Allow the board to override the fdt address. */ if (IS_ENABLED (CONFIG_OF_BOARD )) { gd->fdt_blob =board_fdt_blob_setup (&ret);
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 6/16 passage: arm: Accept a passage from the previous phase
In reply to Simon GlassAccept a bloblist and control devicetree from a previous phase in registers r0 and r1
---
Changes in v2:
- Use three registers instead of two for the entry
arch/arm/cpu/armv7/start.S | 7 ++++++- arch/arm/lib/crt0.S | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-)
arch/arm/cpu/armv7/start.S +6 -1
@@ -36,6 +36,11 @@ #endif reset: + # Keep passage information in case it is provided + mov r6, r1 + mov r7, r2 + mov r8, r3 + /* Allow the board to save important registers */ b save_boot_params save_boot_params_ret:
@@ -124,7 +129,7 @@ switch_to_hypervisor_ret: bl cpu_init_crit #endif #endif - + # Note: r6-r8 are available to _main in case standard passage is used bl _main /*------------------------------------------------------------------------------*/
arch/arm/lib/crt0.S +5 -0
@@ -117,6 +117,11 @@ ENTRY(_main) CLEAR_BSS #endif +#if CONFIG_IS_ENABLED(PASSAGE_IN) + str r6, [r9, #GD_PASSAGE_MACH] + str r7, [r9, #GD_PASSAGE_DTB] + str r8, [r9, #GD_PASSAGE_BLOBLIST] +#endif mov r0, #0 bl board_init_f
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 7/16 passage: spl: Support adding the dtb to the passage bloblist
In reply to Simon GlassAdd an option for SPL to add a devicetree to the passage bloblist, so SPL can provide the devicetree to U-Boot.
---
(no changes since v1)
common/Kconfig | 20 ++++++++++++++++++++ common/spl/spl.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- include/spl.h | 2 ++ 3 files changed, 64 insertions(+), 2 deletions(-)
common/Kconfig +20 -0
@@ -881,6 +881,26 @@ config SPL_PASSAGE_IN firmware phases to communicate state and settings to following phases. +config SPL_PASSAGE_OUT + bool "Support the standard-passage protocol in SPL (out)" + depends on SPL_BLOBLIST + default y if PASSAGE_IN + help + This enables a standard protocol for entering U-Boot, providing + parameters in a bloblist and a devicetree. It allows the various + firmware stages to communicate state and settings to following + stages. + +config SPL_PASSAGE_ADD_DTB + bool "Add devicetree to the outgoing passage" + depends on SPL_PASSAGE_OUT + default y if SPL_PASSAGE_OUT && !SPL_PASSAGE_IN + help + Add the devicetree into the bloblist in SPL (it is assumed to not + already be there) so that the next phase (U-Boot) can find it. + + This option should be enabled in the phase that sets up the passage. + source "common/spl/Kconfig" config IMAGE_SIGN_INFO
common/spl/spl.c +42 -2
74 lines not on this page · raw message
include/spl.h +2 -0
@@ -270,6 +270,8 @@ binman_sym_extern(ulong, u_boot_any, image_pos);binman_sym_extern (ulong, u_boot_any, size);binman_sym_extern (ulong, spl, image_pos);binman_sym_extern (ulong, spl, size); +binman_sym_extern (ulong, u_boot_dtb, image_pos); +binman_sym_extern (ulong, u_boot_dtb, size);/** * spl_get_image_pos() - get the image position of the next phase
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 8/16 passage: spl: Support passing the passage to U-Boot
In reply to Simon GlassCreate a new arch-specific way of creating a standard passage to the next phase.
---
Changes in v2:
- Make the stdpass calling standard arch-specific
common/spl/spl.c | 27 ++++++++++++++++++++++----- include/asm-generic/global_data.h | 6 ++++++ include/passage.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 include/passage.h
common/spl/spl.c +22 -5
@@ -22,6 +22,7 @@#include <malloc.h> #include <mapmem.h> #include <nand.h> +#include <passage.h> #include <serial.h> #include <spl.h> #if CONFIG_IS_ENABLED (BANNER_PRINT )
@@ -392,13 +393,29 @@ int spl_parse_image_header(struct spl_image_info *spl_image,__weak void __noreturn jump_to_image (struct spl_image_info *spl_image) { -typedef void __noreturn (*image_entry_noargs_t )(void ); - -image_entry_noargs_t image_entry = - (image_entry_noargs_t )spl_image->entry_point; +typedef void __noreturn (*image_entry_t )(void ); +ulong bloblist =0 ; +ulong dtb_offset =0 ;debug ("image entry point: 0x%lx\n" , spl_image->entry_point); -image_entry (); + +if (CONFIG_IS_ENABLED (PASSAGE_OUT )) { +const void *fdt; + + bloblist =bloblist_get_base (); + fdt =bloblist_find (BLOBLISTT_CONTROL_DTB ,0 ); + +log_debug ("passage: sending bloblist at %lx, dtb offset %lx\n" , + bloblist, dtb_offset); +arch_passage_entry (spl_image->entry_point, +map_to_sysmem (gd_bloblist ()), +map_to_sysmem (fdt)); + }else { +image_entry_t image_entry; + + image_entry = (image_entry_t )spl_image->entry_point; +image_entry (); + } }#if CONFIG_IS_ENABLED (HANDOFF )
include/asm-generic/global_data.h +6 -0
@@ -552,6 +552,12 @@ static_assert(sizeof(struct global_data) == GD_SIZE);#define gd_set_multi_dtb_fit (_dtb)#endif +#if CONFIG_IS_ENABLED (BLOBLIST ) +#define gd_bloblist () gd->bloblist +#else +#define gd_bloblist () NULL +#endif +/** * enum gd_flags - global data flags *
include/passage.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Standard passage implementation +* +* Copyright 2022 Google LLC +* Written by Simon Glass <[email protected]> +*/ + +#ifndef __PASSAGE_H +#define __PASSAGE_H + +enum { +PASSAGE_ABI_MACH =0xb00757a3 , +PASSAGE_ABI_VERSION =1 , +}; + +static inline ulong passage_mach_version (void ) +{ +#if BITS_PER_LONG ==64 +return (ulong )PASSAGE_ABI_MACH <<32 |PASSAGE_ABI_VERSION ; +#else +return (PASSAGE_ABI_MACH & ~0xff ) |PASSAGE_ABI_VERSION ; +#endif +} + +void __noreturn arch_passage_entry (ulong entry_addr,ulong bloblist,ulong fdt); + +#endif
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 9/16 passage: arm: Add the arch-specific standard passage impl
In reply to Simon GlassAdd implementations for 32- and 64-bit ARM.
---
Changes in v2:
- Add new patch with the arm-specific standard passage implementation
arch/arm/cpu/armv7/cpu.c | 28 ++++++++++++++++++++++++++++ arch/arm/cpu/armv8/cpu.c | 20 ++++++++++++++++++++ 2 files changed, 48 insertions(+)
arch/arm/cpu/armv7/cpu.c +28 -0
@@ -18,6 +18,7 @@#include <command.h> #include <cpu_func.h> #include <irq_func.h> +#include <passage.h> #include <asm/system.h> #include <asm/cache.h> #include <asm/armv7.h>
@@ -83,3 +84,30 @@ int cleanup_before_linux(void) {return cleanup_before_linux_select (CBL_ALL ); } + +void __noreturn arch_passage_entry (ulong entry_addr,ulong bloblist,ulong fdt) +{ +typedef void __noreturn (*passage_entry_t )(ulong zero1,ulong mach, +ulong fdt,ulong bloblist); +passage_entry_t entry = (passage_entry_t )entry_addr; + +/* +* Register Contents +* r0 0 +* r1 0xb0075701 (indicates standard passage v1) +* r2 Address of devicetree +* r3 Address of bloblist +* r4 0 +* lr Return address +* +* The ARMv7 calling convention only passes 4 arguments in registers, so +* set r4 to 0 manually. +*/ + __asm__volatile ( +"mov r4, #0\n" + : + : + :"r4" + ); +entry (0 ,passage_mach_version (), fdt, bloblist); +}
arch/arm/cpu/armv8/cpu.c +20 -0
@@ -14,6 +14,7 @@#include <command.h> #include <cpu_func.h> #include <irq_func.h> +#include <passage.h> #include <asm/cache.h> #include <asm/system.h> #include <asm/secure.h>
@@ -84,3 +85,22 @@ void armv8_setup_psci(void) secure_ram_addr(psci_arch_init)(); }#endif + +void __noreturn arch_passage_entry (ulong entry_addr,ulong bloblist,ulong fdt) +{ +typedef void __noreturn (*passage_entry_t )(ulong fdt,ulong abi, +ulong zero1,ulong bloblist, +ulong zero2); +passage_entry_t entry = (passage_entry_t )entry_addr; + +/* +* Register Contents +* x0 Address of devicetree +* x1 0xb00757a300000001 (indicates standard passage v1) +* x2 0 +* x3 Address of bloblist +* x4 0 +* x30 Return address +*/ +entry (fdt,passage_mach_version (),0 , bloblist,0 ); +}
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 10/16 passage: Add a qemu test for ARM
In reply to Simon GlassCheck that the standard passage works on ARM, by setting it up in SPL and making sure that it comes through correctly in U-Boot proper.
---
Changes in v2:
- Add a devicetree for qemu-arm so that qemu_arm_spl can work
arch/arm/Kconfig | 2 +- configs/qemu_arm_spl_defconfig | 8 +++++++- test/py/tests/test_passage.py | 11 +++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 test/py/tests/test_passage.py
arch/arm/Kconfig +1 -1
@@ -974,7 +974,7 @@ config ARCH_QEMU imply DM_RNG imply DM_RTC imply RTC_PL031 - imply OF_HAS_PRIOR_STAGE + imply OF_HAS_PRIOR_STAGE if !TARGET_QEMU_ARM_32BIT_SPL config ARCH_RMOBILE bool "Renesas ARM SoCs"
configs/qemu_arm_spl_defconfig +7 -1
@@ -12,6 +12,7 @@ CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm" CONFIG_TARGET_QEMU_ARM_32BIT_SPL=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x6000 CONFIG_DEBUG_UART_BASE=0x9000000 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_ARMV7_LPAE=y
@@ -28,6 +29,11 @@ CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_PCI_INIT_R=y +CONFIG_BLOBLIST=y +CONFIG_BLOBLIST_PASSAGE=y +CONFIG_SPL_BLOBLIST_ALLOC=y +CONFIG_BLOBLIST_SIZE=0x4000 +CONFIG_PASSAGE_IN=y CONFIG_SPL_FRAMEWORK_BOARD_INIT_F=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y
@@ -37,7 +43,7 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y CONFIG_CMD_MTDPARTS=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_BOARD=y +CONFIG_OF_PASSAGE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x4000000 CONFIG_SPL_DM=y
test/py/tests/test_passage.py new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2021 Google LLC + +import pytest + [email protected]('target_qemu_arm_32bit_spl') +def test_passage(u_boot_console): + """Test that the standard passage on ARM from SPL to U-Boot works.""" + + response = u_boot_console.run_command('bdinfo') + assert 'devicetree = passage' in response
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 11/16 sandbox: Add a way of checking structs for standard passage
In reply to Simon GlassAdd a file which can be used to check that structs used in standard passage do compile. No other validation is done at present, but could be considered later.
---
(no changes since v1)
board/sandbox/Makefile | 3 ++- board/sandbox/stdpass_check.c | 36 +++++++++++++++++++++++++++++++++++ include/stdpass/README | 4 ++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 board/sandbox/stdpass_check.c create mode 100644 include/stdpass/README
board/sandbox/Makefile +2 -1
@@ -2,4 +2,5 @@ # # Copyright (c) 2011 The Chromium OS Authors. -obj-y := sandbox.o +obj-y += sandbox.o +obj-y += stdpass_check.o
board/sandbox/stdpass_check.c new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* This file compiles all the struct definitions for standard passage, to ensure +* there are no errors +* +* Copyright 2021 Google LLC +*/ + +#include <common.h> + +/* BLOBLISTT_U_BOOT_SPL_HANDOFF */ +#include <handoff.h> +void check_spl_handoff (void ) +{ +__maybe_unused struct spl_handoff check; +}; + +/* +* See also doc/develop/std_passage.rst +* +* Instructions: +* +* 1. Add your header file to U-Boot, or to include/stdpass if it is not used in +* U-Boot +* +* 2. Add a function below to include the header and use the struct +* +* Template follows, see above for example +*/ + +/* BLOBLISTT_tag here */ +/* #include <stdpass/yourfile.h> if not used in U-Boot*/ +void check_struct_name (void ) +{ +/* __maybe_unused struct struct_name check; */ +}
include/stdpass/README new file +4 -0
@@ -0,0 +1,4 @@ +This directory contains standard passage structures + +See doc/develop/std_passage.rst for instructions +
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 12/16 passage: Add documentation
In reply to Simon GlassAdd documentation about standard passage and update the maintainers.
---
Changes in v2:
- Add comments about how to pass standard passage to EFI
- Add comments about passing a bloblist to Linux
- Add detailed arch-specific information
MAINTAINERS | 10 + board/sandbox/stdpass_check.c | 10 +- doc/develop/bloblist.rst | 4 +- doc/develop/index.rst | 1 + doc/develop/std_passage.rst | 396 ++++++++++++++++++++++++++++++++++ 5 files changed, 411 insertions(+), 10 deletions(-) create mode 100644 doc/develop/std_passage.rst
MAINTAINERS +10 -0
@@ -1177,6 +1177,16 @@ F: common/stackprot.c F: cmd/stackprot_test.c F: test/py/tests/test_stackprotector.py +STANDARD PASSAGE +M: Simon Glass <[email protected]> +F: board/sandbox/stdpass_check.c +F: cmd/bloblist.c +F: common/bloblist.c +F: doc/develop/std_passage.rst +F: include/bloblist.h +F: include/stdpass/ +F: test/bloblist.c + TARGET_BCMNS3 M: Bharat Gooty <[email protected]> M: Rayagonda Kokatanur <[email protected]>
board/sandbox/stdpass_check.c +2 -8
@@ -8,13 +8,6 @@#include <common.h> -/* BLOBLISTT_U_BOOT_SPL_HANDOFF */ -#include <handoff.h> -void check_spl_handoff (void ) -{ -__maybe_unused struct spl_handoff check; -}; -/* * See also doc/develop/std_passage.rst *
@@ -23,7 +16,8 @@ void check_spl_handoff(void)* 1. Add your header file to U-Boot, or to include/stdpass if it is not used in * U-Boot * -* 2. Add a function below to include the header and use the struct +* 2. Add a function below to include the header and use the struct. Please put +* your function in order of tag ID (see bloblist.h) * * Template follows, see above for example */
doc/develop/bloblist.rst +2 -2
@@ -1,7 +1,7 @@ .. SPDX-License-Identifier: GPL-2.0+ -Blob Lists - bloblist -===================== +Bloblist +======== Introduction ------------
doc/develop/index.rst +1 -0
@@ -21,6 +21,7 @@ Implementation logging makefiles menus + std_passage uefi/index version
doc/develop/std_passage.rst new file +396 -0
396 lines not on this page · raw message
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
Re: [PATCH v2 12/16] passage: Add documentation
Quoted 267 lines
From: Simon Glass <[email protected]>
Date: Mon, 17 Jan 2022 08:04:24 -0700Add documentation about standard passage and update the maintainers.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Add comments about how to pass standard passage to EFI
- Add comments about passing a bloblist to Linux
- Add detailed arch-specific informationMAINTAINERS | 10 + board/sandbox/stdpass_check.c | 10 +- doc/develop/bloblist.rst | 4 +- doc/develop/index.rst | 1 + doc/develop/std_passage.rst | 396 ++++++++++++++++++++++++++++++++++ 5 files changed, 411 insertions(+), 10 deletions(-) create mode 100644 doc/develop/std_passage.rstMAINTAINERS +10
-0@@ -1177,6 +1177,16 @@ F: common/stackprot.c F: cmd/stackprot_test.c F: test/py/tests/test_stackprotector.py +STANDARD PASSAGE +M: Simon Glass <[email protected]> +F: board/sandbox/stdpass_check.c +F: cmd/bloblist.c +F: common/bloblist.c +F: doc/develop/std_passage.rst +F: include/bloblist.h +F: include/stdpass/ +F: test/bloblist.c + TARGET_BCMNS3 M: Bharat Gooty <[email protected]> M: Rayagonda Kokatanur <[email protected]>board/sandbox/stdpass_check.c +2
-8@@ -8,13 +8,6 @@#include <common.h> -/* BLOBLISTT_U_BOOT_SPL_HANDOFF */ -#include <handoff.h> -void check_spl_handoff (void ) -{ -__maybe_unused struct spl_handoff check; -}; -/* * See also doc/develop/std_passage.rst * @@ -23,7 +16,8 @@ void check_spl_handoff(void)* 1. Add your header file to U-Boot, or to include/stdpass if it is not used in * U-Boot * -* 2. Add a function below to include the header and use the struct +* 2. Add a function below to include the header and use the struct. Please put +* your function in order of tag ID (see bloblist.h) * * Template follows, see above for example */ doc/develop/bloblist.rst +2
-2@@ -1,7 +1,7 @@ .. SPDX-License-Identifier: GPL-2.0+ -Blob Lists - bloblist -===================== +Bloblist +======== Introduction ------------doc/develop/index.rst +1
-0@@ -21,6 +21,7 @@ Implementation logging makefiles menus + std_passage uefi/index versiondoc/develop/std_passage.rst new file +165
-0@@ -0,0 +1,396 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Standard Passage +================ + +Introduction +------------ + +It is sometimes necessary for SPL to communicate information to U-Boot proper, +such as the RAM size. This can sometimes be handled by adding the value to a +Kconfig which both SPL and U-Boot proper can use. But this does not work for +values which are detected at runtime. + +In some cases other firmware binaries are used alongside U-Boot and these may +need to pass information to U-Boot or receive information from it. In this case +there is no shared build system and it is clumsy so have to specify matching +build options across projects. + +U-Boot provides a standard way of passing information between different phases +(TPL, SPL, U-Boot). This is called `standard passage` since it creates a +standard passage through which any sort of information can flow. + + +How it works +------------ + +The standard passage is very simple. It is really just a way of sending a +bloblist between programs, either at a fixed address, or using registers to +indicate the location. + +A :doc:`bloblist` is a simple, contiguous data structure containing a number of +blobs. Each blob has a tag to indicate what it contains. It is designed for +simple information, like a small C struct. For more complex data, a devicetree +is preferred since it has bindings and is extensible. + +The bloblist is typically set up initially by one of the early phases of U-Boot, +such as TPL. It starts either at a fixed address or is allocated in memory using +malloc(). After that, TPL passes the location of the bloblist to SPL (using +machine register in an architecture-specific way) and SPL passes it to U-Boot +proper. It is possible to add new blobs to the bloblist at each phase. U-Boot +proper relocates the bloblist so can expand it if desired. + + +Use by other projects +--------------------- + +The standard passage is also intended to be used by other firmware projects, +particularly if they interface with U-Boot. It allows that project's firmware +binaries to pass information to U-Boot (if they run before U-Boot) or receive +information from U-Boot (if they run afterwards). + +These projects can copy and modify the bloblist code provided they have a +compatible license. + + +Allocating tags +--------------- + +Tags are defined in the `bloblist.h` header file. For the moment, the U-Boot +tree is the upstream repository for tags. + +Tags may be allocated in the following areas: + +BLOBLISTT_AREA_FIRMWARE_TOP + A small area for tags of considerable relevance to multiple projects + +BLOBLISTT_AREA_FIRMWARE + A larger area for tags likely to be relevant to multiple projects either now + or in the future + +BLOBLISTT_PROJECT_AREA + Used for specific projects that want to make sure their tags are correctly + ignored by other binaries in the firmware flow. This area should not be + used for tags that are used by multiple projects. Instead, use + `BLOBLISTT_AREA_FIRMWARE`. + +BLOBLISTT_VENDOR_AREA + Used for specific vendors that want to make sure their tags are correctly + ignored by other binaries in the firmware flow. This area should not be + used for tags that are used by multiple vendors. Instead, use + `BLOBLISTT_AREA_FIRMWARE`. + +BLOBLISTT_PRIVATE_AREA + Used for private flags. Do not send patches with these. They are for local + or temporary use. Standard firmware binaries which see these tags in the + bloblist typically refuse to boot. + +To add a new tag for your project, send a patch to the U-Boot project with: + + - your new tag, using the next available number in the area your choose + - a header file in include/stdpass/ containing your struct definition if your + struct is not actually used in U-Boot + - a line of code in `board/sandbox/stdpass_check.c` to use the struct (see + that file for instructions) + +The struct definition does not need to match the code style or types names used +in the other project. For example, your project might use a type like +__UNSIGNED_INT32 which in U-Boot would be written as u32. Types should be sized +so that the struct is the same on 32- and 64-bit machines. Avoid using __packed +if possible. Instead try to order members so that it is not necessary. + +Conflicts are resolved before applying patches to mainline, so your actual tag +value may change when the patch is applied. Once your patch is accepted your tag +is allocated for all time. + +Devicetree +---------- + +Devicetree has a special place in the standard passage. One of the bloblist tags +is BLOBLISTT_CONTROL_DTB which indicates that that blob contains a devicetree +intended to control U-Boot (or other binaries). This devicetree provides +hardware information and configuration in a generic way using standard bindings, +so that it is available for any project to use. The bindings are compatible with +operating systems (including Linux) so there is no need to remove them before +calling the OS. + +In cases where a binary wants to access the devicetree but does not want to +implement the bloblist feature, the offset of the devicetree within the +bloblist is provided. This avoids the need to implement bloblists just to +access the devicetree. This is a convenience feature intended for use in +degenerate cases. + +However U-Boot itself does not permit accepting a devicetree through standard +passage unless it is part of a valid bloblist. It is easy to turn on the +bloblist feature in U-Boot, so such a variation would only serve to confuse +things and encourage degeneration in other projects. + + +Standard passage API +-------------------- + +The protocol for passing a bloblist through the standard passage from one +binary to another is architecture-specific, meaning it works differently on +32-/64-bit ARM and x86, for example, if only because of the different register +naming. + +The bloblist is mandatory. If there is no information to pass, the bloblist must +still be provided. Following firmware stages may add blobs to the bloblist, +making use of the existing space. + +The minimum bloblist size is 256 bytes, but 4KB is recommended. + +Two registers are used to pass the bloblist and devicetree pointers. Others may +be used depending on the architecture. The protocol chosen for each architecture +should be compatible with the Linux protocol, with a way of determining whether +standard passage is used. This is done not because Linux might start using +standard passage, but to avoid reinventing the wheel. + +For 32-bit ARM: + + ========= ============================================== + Register Contents + ========= ============================================== + r0 0 + r1 0xb0075701 (indicates standard passage v1) + r2 Address of devicetree + r3 Address of bloblist + r4 0 + lr Return address + ========= ============================================== + +For 64-bit ARM: + + ========= =================================================== + Register Contents
doc/develop/std_passage.rst line 175
Quoted 10 lines
doc/develop/std_passage.rst new file +10
-0+ ========= =================================================== + x0 Address of devicetree + x1 0xb00757a300000001 (indicates standard passage v1) + x2 0 + x3 Address of bloblist + x4 0 + x30 Return address + ========= =================================================== + +The devicetree is provided as an address but it normally included within the
^^ is?
Quoted 85 lines
doc/develop/std_passage.rst new file +85
-0+bloblist, meaning that searching for the BLOBLISTT_CONTROL_DTB blob with the +bloblist produces the same result as the devicetree address passed here. Having +everything in a bloblist makes it easier to manage memory, since it is all in +one contiguous block. + + +Usage guidelines +---------------- + +As mentioned above, blobs should contain small, simple blocks of information, +typically represented by a C structure. Using it for large or complex structures +is only permitted if these are defined by a standard byte-accurate form. +Examples include devicetree, ACPI tables, SMBIOS tables and the like. +There are also a lot of pre-existing firmware binaries which are quite complex +but qualify because it is not possible to convert them to devicetree now. Apart +from those exceptions, keep it simple! + +For complex data structures, devicetree can be used. The libfdt library has an +overhead of around 5-10KB which is small enough that most firmware binaries can +easily incorporate it. For those that must run in very constrained environments, +like U-Boot TPL, a simple blob can be used instead, as explained in the +preceding paragraph. + +Devicetree bindings must be defined so that the format of the data is well +understood. This is done through the `dt-schema`_ project, although this process +is still in its infancy. + + +EFI +--- + +When using EFI a different calling convention is used. For example, with 64-bit +ARM we have: + + ========= =================================================== + Register Contents + ========= =================================================== + x0 handle + x1 system table + x30 Return address + ========= =================================================== + +It is not possible to pass the bloblist in a register in this case. Instead, a +config table can be used. The GUID for a bloblist is +4effe9da-7728-11ec-8df6-136969a780ff + + +Linux and bloblists +------------------- + +It is possible to effectively pass a bloblist to Linux, or other Operating +Systems. However it is not expected that Linux would actually implement the +bloblist data structure. How does this work? + +The bloblist sits in memory with some things in it, including a devicetree, +perhaps an SMBIOS table and a TPM log. But when U-Boot calls Linux it puts the +address/size of those individual things in the devicetree. They don't move and +are still contiguous in memory, but the bloblist around them is forgotten. Linux +doesn't know that the three separate things it is picking up are actually part +of a bloblist structure, since it doesn't care about that. Even a console log +can work the same way. There is no need to teach Linux about bloblist when it +already has a perfectly good means to accept these items (via devicetree). + +ACPI can operate in a similar way. The ACPI tables can point to things that +happen to be in a bloblist, but without any knowledge of that needed in Linux, +grub, etc. In fact the ACPI tables themselves may well be in a bloblist, as they +are in U-Boot. + + +Private firmware +---------------- + +Standard passage is intended to operate with open-source firmware. It may be +that closed-source firmware may use standard passage, or happen to work with it. +If so, that is a happy coincidence, but the focus here is on open-source +firmware. + + +Updates +------- + +Updates and patches to this documentation are welcome. Please submit them to +the U-Boot project in the normal way. + +
doc/develop/std_passage.rst line 270
Quoted 10 lines
doc/develop/std_passage.rst new file +10
-0+Design notes +------------ + +This section describes some of the reasons behind the design decisions implied +by this feature. + +Why devicetree? +~~~~~~~~~~~~~~~ + +Firmware is getting large and complicated, with a concomitant need for more
^^^^^^^^^^^
I had to look that word up in a dictionary...
Quoted 130 lines
doc/develop/std_passage.rst new file +126
-0+complex communication between binaries. We don't want to use C structs to pass +around complex data, nor invent new binary formats for everything that comes up. +The devicetree provides a useful format and is already widely used in firmware. +It supports bindings and provides validation to check for compliance, by virtue +of the Linux project and `dt-schema`_. It is easily extensible, being basically +an efficient, hierarchical, ordered dictionary. + +Some examples of how complex and annoying binary formats can become are SMBIOS +tables and Intel's Video BIOS tables. The world does not need another binary +format. + + +Why not *just* devicetree? +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Some early firmware binaries run in very little memory and only need to pass a +few values on to later phases. Devicetree is too heavy-weight for these cases. +For example, it is generally not possible for TPL to access a devicetree, which +is one of the motivations for the of-platdata feature. + + +Why not protobuf, YAML, JSON? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +They are not as efficient and either use a lot more code or require parsing +before use. Devicetree happens to be a nice compromise. + + +Why not something else? +~~~~~~~~~~~~~~~~~~~~~~~ + +Possibly. Please propose it. + + +Why not UUIDs? +~~~~~~~~~~~~~~ + +Why use a simple integer tag instead of an 'industry-standard' UUID? Many +reasons: + +- Code should be as readable as possible. GUIDs require something like:: + + EFI_GUID(0x6dadf1d1, 0xd4cc, 0x4910, \ + 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d) + + which is much harder to read than:: + + enum { + BLOBLISTT_SPL_HANDOFF = 123, + }; + +- UUIDs are more like a hash than a sequence number. Git uses them, although a + short form of the hash is commonly shown. Why use a hash to identify + something when we only have a small number of items? + +- We don't need to worry about collisions in open source software. We can have + a shared repo and allocate sequence numbers from there. UUIDs come from the + idea that everyone is working independently so people need to be able to + allocate their own numbers and be sure that they will not conflict. This is + needed in the PC BIOS industry where there is little shared source / + cooperation. It is not helpful with open source. + +- UUIDs come across as just obfuscation. Does anyone know what these values + mean? How would we look them up? Who owns which one? Is there a central + registry?:: + + EFI_GUID(0x721acf02, 0x4d77, 0x4c2a, 0xb3, 0xdc, 0x27, 0x0b, 0x7b, 0xa9, 0xe4, 0xb0) + EFI_GUID(0xa034147d, 0x690c, 0x4154, 0x8d, 0xe6, 0xc0, 0x44, 0x64, 0x1d, 0xe9, 0x42) + EFI_GUID(0xbbcff46c, 0xc8d3, 0x4113, 0x89, 0x85, 0xb9, 0xd4, 0xf3, 0xb3, 0xf6, 0x4e) + EFI_GUID(0x69a79759, 0x1373, 0x4367, 0xa6, 0xc4, 0xc7, 0xf5, 0x9e, 0xfd, 0x98, 0x6e) + EFI_GUID(0xd038747c, 0xd00c, 0x4980, 0xb3, 0x19, 0x49, 0x01, 0x99, 0xa4, 0x7d, 0x55) + EFI_GUID(0x9c7c3aa7, 0x5332, 0x4917, 0x82, 0xb9, 0x56, 0xa5, 0xf3, 0xe6, 0x2a, 0x07) + +- It is overkill to use 16 bytes for a unique identifier in a shared project. + It is about 10^38. Modern SoCs cannot keep that in a register and there is no + C int type to represent it on most common hardware today! Having to check that + adds time and code to no benefit. In early boot, space and time are + particularly precious. + + +Why contiguous? +~~~~~~~~~~~~~~~ + +It is easier to allocate a single block of data than to allocate lots of little +blocks. It is easy to relocate if needed (a simple copy of a block of memory). +It can be expanded by relocating it. If we absolutely need to create a linked +list then pointers to external data can be added to a blob. + + +Why bloblist? +~~~~~~~~~~~~~ + +Bloblist is a simple format with an integer tag. It avoids UUIDs and meets the +requirements above. Some tweaks may be desirable to the format, but that can be +worked out in code review. + + +Why pass the devicetree offset? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +In cases where a binary wants to access the devicetree but does not want to +implement the bloblist feature, the offset of the devicetree within the +bloblist is provided. This avoids the need to implement bloblists just to +access the devicetree. This is a convenience feature intended for use in +degenerate cases. + + +Why use registers to pass values between binaries? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +It seems like the obvious solution. We could use a shared memory region with +shared configuration between projects, but that is error prone and difficult to +keep in sync. + + +Why not add magic values to indicate that standard passage is used? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +We could put a magic value in a register to tell the next phase that the +standard-passage information is available (in other registers). But making it +a build-time option saves at least one register and makes things a little more +deterministic at built time. If we know we can rely on it, it is easier to +use. + + +.. _`dt-schema`: https://github.com/devicetree-org/dt-schemaSignature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 13/16 passage: Add docs for spl_handoff
In reply to Simon GlassThis tag already exists in U-Boot. Add documentation, following the format set out.
---
(no changes since v1)
board/sandbox/stdpass_check.c | 8 ++++++++ include/handoff.h | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-)
board/sandbox/stdpass_check.c +8 -0
@@ -28,3 +28,11 @@ void check_struct_name(void) {/* __maybe_unused struct struct_name check; */ } + +/* BLOBLISTT_U_BOOT_SPL_HANDOFF */ +#include <handoff.h> +void check_spl_handoff (void ) +{ +__maybe_unused struct spl_handoff check; +}; +
include/handoff.h +5 -3
@@ -9,16 +9,20 @@#define __HANDOFF_H#if CONFIG_IS_ENABLED (HANDOFF ) -#include <asm/handoff.h> +#endif /** * struct spl_handoff - information passed from SPL to U-Boot proper * +* bloblist_tag: BLOBLISTT_U_BOOT_SPL_HANDOFF +* * @ram_size: Value to use for gd->ram_size */ struct spl_handoff { +#if CONFIG_IS_ENABLED (HANDOFF )struct arch_spl_handoff arch; +#endif u64 ram_size;struct {u64 start;
@@ -43,5 +47,3 @@ void handoff_load_dram_banks(struct spl_handoff *ho);int handoff_arch_save (struct spl_handoff *ho);#endif - -#endif
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 14/16 x86: Move Intel GNVS file into the common include directory
In reply to Simon GlassMove this so we can include it from sandbox, needed since it is in a bloblist and must have a check.
---
(no changes since v1)
arch/x86/cpu/apollolake/acpi.c | 2 +-
arch/x86/cpu/intel_common/acpi.c | 2 +-
arch/x86/include/asm/arch-apollolake/global_nvs.h | 2 +-
board/google/chromebook_coral/coral.c | 2 +-
{arch/x86/include/asm => include}/intel_gnvs.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename {arch/x86/include/asm => include}/intel_gnvs.h (100%)arch/x86/cpu/apollolake/acpi.c +1 -1
@@ -13,6 +13,7 @@#include <common.h> #include <cpu.h> #include <dm.h> +#include <intel_gnvs.h> #include <log.h> #include <p2sb.h> #include <pci.h>
@@ -21,7 +22,6 @@#include <asm/acpi_table.h> #include <asm/cpu_common.h> #include <asm/intel_acpi.h> -#include <asm/intel_gnvs.h> #include <asm/intel_pinctrl.h> #include <asm/intel_pinctrl_defs.h> #include <asm/intel_regs.h>
arch/x86/cpu/intel_common/acpi.c +1 -1
@@ -12,6 +12,7 @@#include <bloblist.h> #include <cpu.h> #include <dm.h> +#include <intel_gnvs.h> #include <acpi/acpigen.h> #include <asm/acpigen.h> #include <asm/acpi_table.h>
@@ -23,7 +24,6 @@#include <asm/mpspec.h> #include <asm/smm.h> #include <asm/turbo.h> -#include <asm/intel_gnvs.h> #include <asm/arch/iomap.h> #include <asm/arch/pm.h> #include <asm/arch/systemagent.h>
arch/x86/include/asm/arch-apollolake/global_nvs.h +1 -1
@@ -10,6 +10,6 @@#ifndef _GLOBAL_NVS_H_#define _GLOBAL_NVS_H_ -#include <asm/intel_gnvs.h> +#include <intel_gnvs.h> #endif /* _GLOBAL_NVS_H_ */
board/google/chromebook_coral/coral.c +1 -1
@@ -11,13 +11,13 @@#include <cros_ec.h> #include <dm.h> #include <init.h> +#include <intel_gnvs.h> #include <log.h> #include <sysinfo.h> #include <acpi/acpigen.h> #include <asm-generic/gpio.h> #include <asm/acpi_nhlt.h> #include <asm/cb_sysinfo.h> -#include <asm/intel_gnvs.h> #include <asm/intel_pinctrl.h> #include <dm/acpi.h> #include <linux/delay.h>
include/intel_gnvs.h renamed from arch/x86/include/asm/intel_gnvs.h +0 -0
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 15/16 passage: Add checks for pre-existing blobs
In reply to Simon GlassAdd checks / documentation for blobs which are already in the list. This brings U-Boot up to the standard required by the standard-passage documentation.
---
(no changes since v1)
board/sandbox/stdpass_check.c | 71 ++++++++- include/stdpass/tpm2_eventlog.h | 42 +++++ include/stdpass/vboot_ctx.h | 267 ++++++++++++++++++++++++++++++++ 3 files changed, 379 insertions(+), 1 deletion(-) create mode 100644 include/stdpass/tpm2_eventlog.h create mode 100644 include/stdpass/vboot_ctx.h
board/sandbox/stdpass_check.c +70 -1
@@ -29,10 +29,79 @@ void check_struct_name(void)/* __maybe_unused struct struct_name check; */ } +/* BLOBLISTT_CONTROL_DTB */ +void check_control_dtb (void ) +{ +/* +* Defined by devicetree specification +* https://github.com/devicetree-org/devicetree-specification/releases/tag/v0.3 +*/ +}; + +/* BLOBLISTT_ACPI_GNVS */ +#include <intel_gnvs.h> +void check_acpi_gnvs (void ) +{ +__maybe_unused struct acpi_global_nvs check; +} + +/* BLOBLISTT_INTEL_VBT */ +void check_intel_vbt (void ) +{ +/* +* Pre-existing Intel blob, defined by source code +* +* https://github.com/freedesktop/xorg-intel-gpu-tools/blob/master/tools/intel_vbt_defs.h +* https://github.com/freedesktop/xorg-intel-gpu-tools/blob/master/tools/intel_vbt_decode.c +*/ +} + +/* BLOBLISTT_TPM2_TCG_LOG */ +#include <stdpass/tpm2_eventlog.h> +void check_tpm2_tcg_log (void ) +{ +/* Struct for each record */ +__maybe_unused struct tpm2_eventlog_context check; +} + +/* BLOBLISTT_TCPA_LOG */ +#include <acpi/acpi_table.h> +void check_tcpa_log (void ) +{ +__maybe_unused struct acpi_tcpa check; +}; + +/* BLOBLISTT_ACPI_TABLES */ +void check_acpi_tables (void ) +{ +/* +* Defined by UEFI Advanced Configuration and Power Interface (ACPI) +* Specification, Version 6.3, January 2019 +* https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf +*/ +} + +/* BLOBLISTT_SMBIOS_TABLES */ +void check_smbios_tables (void ) +{ +/* +* Defined by System Management BIOS (SMBIOS) Reference Specification +* v3.5.0 +* https://www.dmtf.org/standards/smbios +*/ +} + +/* BLOBLISTT_VBOOT_CTX */ +#include <stdpass/vboot_ctx.h> +void check_vboot_ctx (void ) +{ +__maybe_unused struct vb2_shared_data check; + +} +/* BLOBLISTT_U_BOOT_SPL_HANDOFF */ #include <handoff.h> void check_spl_handoff (void ) {__maybe_unused struct spl_handoff check; }; -
include/stdpass/tpm2_eventlog.h new file +42 -0
42 lines not on this page · raw message
include/stdpass/vboot_ctx.h new file +267 -0
267 lines not on this page · raw message
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v2 16/16 WIP: RFC: Add a gitlab test
In reply to Simon GlassThis needs fixing up once the new hooks land as well as adding an azure rule.
---
Changes in v2:
- Rebase to master (dropping bloblist patches already applied)
.gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+)
.gitlab-ci.yml +6 -0
@@ -261,6 +261,12 @@ qemu_arm64 test.py: TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn +#qemu_arm spl_test.py: +# variables: +# TEST_PY_BD: "qemu_arm_spl" +# TEST_PY_TEST_SPEC: "not sleep" +# <<: *buildman_and_testpy_dfn + qemu_malta test.py: variables: TEST_PY_BD: "malta"
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog