From: Simon Glass <sjg@chromium.org> QEMU creates ACPI tables but doesn't include FPDT (Firmware Performance Data Table). Add FPDT generation in qfw_acpi.c following the same pattern as BGRT. Move the acpi_write_fpdt() function from acpi_table.c to acpi_extra.c so that is available even when CONFIG_ACPIGEN is disabled. This allows QEMU x86_64 builds to provide firmware boot timing information to the operating system. Disable this for qemu-riscv64_smode_acpi as it is near the code-size limit. Co-developed-by: Claude <noreply@anthropic.com> Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/qfw/qfw_acpi.c | 10 +++++ lib/acpi/acpi_extra.c | 92 ++++++++++++++++++++++++++++++++++++++++++ lib/acpi/acpi_table.c | 90 ----------------------------------------- 3 files changed, 102 insertions(+), 90 deletions(-) diff --git a/drivers/qfw/qfw_acpi.c b/drivers/qfw/qfw_acpi.c index 916a59be7fb..7f7dba73155 100644 --- a/drivers/qfw/qfw_acpi.c +++ b/drivers/qfw/qfw_acpi.c @@ -8,6 +8,7 @@ #include <abuf.h> #include <bloblist.h> +#include <bootstage.h> #include <errno.h> #include <malloc.h> #include <mapmem.h> @@ -256,6 +257,15 @@ out: return addr; } + if (!IS_ENABLED(CONFIG_TARGET_QEMU_VIRT)) { + ret = acpi_write_fpdt(ctx, + bootstage_get_time(BOOTSTAGE_ID_START_UBOOT_F)); + if (ret) { + printf("error: failed to write FPDT (err=%dE)\n", ret); + return addr; + } + } + return addr; } diff --git a/lib/acpi/acpi_extra.c b/lib/acpi/acpi_extra.c index 709f64305b5..09b8a251ca2 100644 --- a/lib/acpi/acpi_extra.c +++ b/lib/acpi/acpi_extra.c @@ -7,9 +7,11 @@ #define LOG_CATEGORY LOGC_ACPI +#include <bootstage.h> #include <dm.h> #include <efi_loader.h> #include <mapmem.h> +#include <tables_csum.h> #include <video.h> #include <acpi/acpi_table.h> @@ -87,3 +89,93 @@ int acpi_write_bgrt(struct acpi_ctx *ctx) return 0; } + +int acpi_write_fpdt(struct acpi_ctx *ctx, u64 uboot_start) +{ + struct acpi_fpdt *fpdt; + struct acpi_fpdt_boot *rec; + struct acpi_table_header *header; + u64 current_time; + int size; + + fpdt = ctx->current; + header = &fpdt->header; + + /* Calculate total size: FPDT header + boot performance record */ + size = sizeof(struct acpi_fpdt) + sizeof(struct acpi_fpdt_boot); + + memset(fpdt, '\0', size); + + /* Fill out FPDT header */ + acpi_fill_header(header, "FPDT"); + header->length = size; + header->revision = 1; /* ACPI 6.4+: 1 */ + + /* Add boot performance record right after FPDT header */ + rec = (struct acpi_fpdt_boot *)(fpdt + 1); + + /* Fill in record header */ + rec->hdr.type = FPDT_REC_BOOT; + rec->hdr.length = sizeof(struct acpi_fpdt_boot); + rec->hdr.revision = 2; /* FPDT Boot Performance Record revision */ + + /* Fill in timing data */ + current_time = timer_get_boot_us(); + rec->reset_end = uboot_start; + rec->loader_start = current_time; + rec->loader_exec = current_time; + rec->ebs_entry = current_time; + rec->ebs_exit = current_time; + + header->checksum = table_compute_checksum(fpdt, header->length); + + acpi_inc_align(ctx, size); + acpi_add_table(ctx, fpdt); + + return 0; +} + +struct acpi_fpdt_boot *acpi_get_fpdt_boot(void) +{ + struct acpi_table_header *header; + struct acpi_fpdt *fpdt; + + header = acpi_find_table("FPDT"); + if (!header) + return NULL; + + fpdt = (struct acpi_fpdt *)header; + return (struct acpi_fpdt_boot *)(fpdt + 1); +} + +int acpi_fix_fpdt_checksum(void) +{ + struct acpi_table_header *header; + + header = acpi_find_table("FPDT"); + if (!header) + return -ENOENT; + + header->checksum = 0; + header->checksum = table_compute_checksum(header, header->length); + + return 0; +} + +void acpi_final_fpdt(void) +{ + struct acpi_fpdt_boot *fpdt; + + if (IS_ENABLED(CONFIG_TARGET_QEMU_VIRT)) + return; + + fpdt = acpi_get_fpdt_boot(); + if (fpdt) { + u64 time; + + time = timer_get_boot_us(); + fpdt->ebs_entry = time; + fpdt->ebs_exit = time; + acpi_fix_fpdt_checksum(); + } +} diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c index 99251176d09..94e6647b666 100644 --- a/lib/acpi/acpi_table.c +++ b/lib/acpi/acpi_table.c @@ -715,96 +715,6 @@ static int acpi_create_bgrt(struct acpi_ctx *ctx, ACPI_WRITER(6bgrt, "BGRT", acpi_create_bgrt, 0); #endif -int acpi_write_fpdt(struct acpi_ctx *ctx, u64 uboot_start) -{ - struct acpi_fpdt *fpdt; - struct acpi_fpdt_boot *rec; - struct acpi_table_header *header; - u64 current_time; - int size; - - fpdt = ctx->current; - header = &fpdt->header; - - /* Calculate total size: FPDT header + boot performance record */ - size = sizeof(struct acpi_fpdt) + sizeof(struct acpi_fpdt_boot); - - memset(fpdt, '\0', size); - - /* Fill out FPDT header */ - acpi_fill_header(header, "FPDT"); - header->length = size; - header->revision = acpi_get_table_revision(ACPITAB_FPDT); - - /* Add boot performance record right after FPDT header */ - rec = (struct acpi_fpdt_boot *)(fpdt + 1); - - /* Fill in record header */ - rec->hdr.type = FPDT_REC_BOOT; - rec->hdr.length = sizeof(struct acpi_fpdt_boot); - rec->hdr.revision = 2; /* FPDT Boot Performance Record revision */ - - /* Fill in timing data */ - current_time = timer_get_boot_us(); - rec->reset_end = uboot_start; - rec->loader_start = current_time; - rec->loader_exec = current_time; - rec->ebs_entry = current_time; - rec->ebs_exit = current_time; - - header->checksum = table_compute_checksum(fpdt, header->length); - - acpi_inc_align(ctx, size); - acpi_add_table(ctx, fpdt); - - return 0; -} - -struct acpi_fpdt_boot *acpi_get_fpdt_boot(void) -{ - struct acpi_table_header *header; - struct acpi_fpdt *fpdt; - - header = acpi_find_table("FPDT"); - if (!header) - return NULL; - - fpdt = (struct acpi_fpdt *)header; - return (struct acpi_fpdt_boot *)(fpdt + 1); -} - -int acpi_fix_fpdt_checksum(void) -{ - struct acpi_table_header *header; - - header = acpi_find_table("FPDT"); - if (!header) - return -ENOENT; - - header->checksum = 0; - header->checksum = table_compute_checksum(header, header->length); - - return 0; -} - -void acpi_final_fpdt(void) -{ - struct acpi_fpdt_boot *fpdt; - - if (IS_ENABLED(CONFIG_TARGET_QEMU_VIRT)) - return; - - fpdt = acpi_get_fpdt_boot(); - if (fpdt) { - u64 time; - - time = timer_get_boot_us(); - fpdt->ebs_entry = time; - fpdt->ebs_exit = time; - acpi_fix_fpdt_checksum(); - } -} - /* this board lacks the bootstage timer */ #ifndef CONFIG_TARGET_QEMU_VIRT -- 2.43.0

From: Simon Glass <sjg@chromium.org> Add documentation explaining how to use the fw_cfg interface to specify a boot command for QEMU x86. This feature allows automated testing and scripting by providing the boot command directly through QEMU's firmware configuration interface. The documentation includes: - How to create a boot command file - The QEMU command-line syntax with -fw_cfg option - Behavior and limitations of the feature 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --- doc/board/emulation/qemu-x86.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/board/emulation/qemu-x86.rst b/doc/board/emulation/qemu-x86.rst index c604e42990e..c2862e631ee 100644 --- a/doc/board/emulation/qemu-x86.rst +++ b/doc/board/emulation/qemu-x86.rst @@ -113,6 +113,26 @@ sure the specified CPU supports 64-bit like '-cpu core2duo'. Conversely '-cpu pentium' won't work for obvious reasons that the processor only supports 32-bit. +Specifying a boot command +-------------------------- + +It is possible to specify the boot command directly using the fw_cfg interface. +This allows QEMU to control the boot command, which can be useful for automated +testing or scripting. To use this feature, create a file containing the boot +command and pass it to QEMU using the fw_cfg option:: + + $ echo "qfw load; zboot 01000000 - 04000000 1b1ab50" > bootcmd.txt + $ qemu-system-x86_64 -nographic -bios path/to/u-boot.rom \ + -fw_cfg name=opt/u-boot/bootcmd,file=bootcmd.txt + +U-Boot will read the boot command from the firmware configuration and execute it +automatically during the boot process. This bypasses the normal distro boot +sequence. + +Note that the boot command is limited in length and should not exceed the boot +command buffer size. If the command is too long, U-Boot will fail to read it and +fall back to the default boot behavior. + Booting distros --------------- -- 2.43.0

From: Simon Glass <sjg@chromium.org> When running U-Boot as an EFI application under EDK2/OVMF, U-Boot doesn't have direct access to QEMU's fw_cfg interface. To support the --bootcmd option, write a uboot.env file to the EFI partition containing the boot command. Co-developed-by: Claude <noreply@anthropic.com> Signed-off-by: Simon Glass <sjg@chromium.org> --- scripts/build-efi | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/scripts/build-efi b/scripts/build-efi index 95a8f456097..6c3b7a274f3 100755 --- a/scripts/build-efi +++ b/scripts/build-efi @@ -13,6 +13,13 @@ OVMF-pure-efi.x64.fd at https://drive.google.com/file/d/1c39YI9QtpByGQ4V0UNNQtGqttEzS-eFV/view?usp=s... Use ~/.build-efi to configure the various paths used by this script. + +When --bootcmd is specified, a uboot.env file is created on the EFI partition +containing the boot command. U-Boot needs to be configured to import this file +on startup, for example by adding to CONFIG_PREBOOT or the default bootcmd: + + load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} uboot.env; \ + env import -t ${loadaddr} ${filesize} """ from argparse import ArgumentParser @@ -20,6 +27,7 @@ import os from pathlib import Path import shutil import sys +import tempfile import build_helper @@ -169,6 +177,32 @@ class BuildEfi: tools.write_file(f'{dst}/startup.nsh', f'fs0:{fname}', binary=False) shutil.copy(f'{self.build_dir}/{fname}', dst) + # Write U-Boot environment file if bootcmd is specified + if self.args.bootcmd: + # Check if mkenvimage is available (local build or system-wide) + mkenvimage = 'tools/mkenvimage' + if not os.path.exists(mkenvimage): + mkenvimage = 'mkenvimage' + if not shutil.which(mkenvimage): + tout.error('Please install u-boot-tools package:') + tout.error(' sudo apt install u-boot-tools') + raise FileNotFoundError('mkenvimage not found') + + # Create text environment file + env_content = f'bootcmd={self.args.bootcmd}\n' + with tempfile.NamedTemporaryFile(mode='w', delete=False, + suffix='.txt') as outf: + outf.write(env_content) + env_fname = outf.name + + try: + # Convert to binary format with CRC using mkenvimage + command.run(mkenvimage, '-s', '0x1000', + '-o', f'{dst}/uboot.env', env_fname) + print(f'Created uboot.env with bootcmd: {self.args.bootcmd}') + finally: + os.unlink(env_fname) + def do_build(self, build): """Build U-Boot for the selected board""" extra = ['-a', '~CONSOLE_PAGER'] if self.args.no_pager else [] -- 2.43.0

From: Simon Glass <sjg@chromium.org> Enable CONFIG_ENV_IS_IN_FAT to automatically load the environment from the uboot.env file on the FAT filesystem. This makes the build-efi script's --bootcmd option work correctly. Co-developed-by: Claude <noreply@anthropic.com> Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/efi-x86_app64_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig index d50c8ac4f2c..6f038c102b4 100644 --- a/configs/efi-x86_app64_defconfig +++ b/configs/efi-x86_app64_defconfig @@ -30,6 +30,9 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="efi" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:0" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_BOOTFILE=y CONFIG_BOOTFILE="bzImage" -- 2.43.0