Skip to contentSkip to conversation

vbe: Support device tree fixups for OS requests

PATCH In review Simon Glass 1 participant 28 messages Oct 11, 2022 – Oct 17, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover vbe: Support device tree fixups for OS requests

VBE provides the ability for an OS to request that information be passed to it when it is booted. This is added into the /chosen node, in addition to things like the bootargs for Linux, for example.

VBE's OS requests are intended to replace the need for the EFI 'boot-time services'. This works via a 'stub' which runs before Linux, collects the information from U-Boot, writes it to the device tree (mostly) and then jumps to Linux with the updated device tree.

Rather than just jumping into Linux and waiting for it to request things from U-Boot, we can look at the requests in the FIT and process them before jumping to Linux. This is simpler and easier to test. It is also more deterministic, since we can tell whether we might lack something needed by Linux, before jumping to it.

This series adds initial support for OS requests, with just a few simple ones provided. Further work will expand these out.

Changes in v2:
- Add new patch to update docs about oftree_from_fdt()

Simon Glass (14):
bootm: Change incorrect 'unsupported' error
bootm: Avoid returning error codes from command
bootm: Drop #ifdef from do_bootm()
boot: Correct handling of addresses in boot_relocate_fdt()
fs: Quieten down the filesystems more
fdt: Show a message when the working FDT changes
bootstd: Move VBE setup into a shared function
sandbox: Support FDT fixups
boot: Pass the correct FDT to the EVT_FT_FIXUP event
boot: Tidy up logging and naming in vbe_simple
test: Move common FIT code into a separate fit_util file
vbe: Add fixups for a basic set of OS requests
dm: core: Update docs about oftree_from_fdt()
vbe: Add a test for VBE device tree fixups

 arch/sandbox/lib/bootm.c              |  17 ++
 boot/Makefile                         |   2 +-
 boot/bootm.c                          |   2 +-
 boot/image-fdt.c                      |  37 ++--
 boot/vbe_fixup.c                      | 233 ++++++++++++++++++++++++++
 boot/vbe_simple.c                     |  16 +-
 cmd/bootm.c                           |  25 +--
 cmd/fdt.c                             |   1 +
 configs/sandbox_flattree_defconfig    |   2 +-
 disk/part_efi.c                       |  15 +-
 doc/develop/driver-model/livetree.rst |   2 +-
 doc/develop/vbe.rst                   |   3 +-
 doc/usage/cmd/fdt.rst                 |   1 +
 fs/btrfs/disk-io.c                    |   7 +-
 fs/ext4/ext4_common.c                 |   2 +-
 fs/fs_internal.c                      |   3 +-
 include/dm/ofnode.h                   |   3 +
 test/boot/Makefile                    |   1 +
 test/boot/bootflow.c                  |   2 +
 test/boot/bootstd_common.c            |  49 ++++++
 test/boot/bootstd_common.h            |  16 ++
 test/boot/vbe_fixup.c                 |  59 +++++++
 test/boot/vbe_simple.c                |  34 +---
 test/cmd/fdt.c                        |  11 +-
 test/py/tests/fit_util.py             |  93 ++++++++++
 test/py/tests/test_event_dump.py      |   1 +
 test/py/tests/test_fit.py             |  79 +--------
 test/py/tests/test_vbe.py             | 123 ++++++++++++++
 28 files changed, 684 insertions(+), 155 deletions(-)
 create mode 100644 boot/vbe_fixup.c
 create mode 100644 test/boot/vbe_fixup.c
 create mode 100644 test/py/tests/fit_util.py
 create mode 100644 test/py/tests/test_vbe.py
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#1 lore raw

PATCH v2 1/14 bootm: Change incorrect 'unsupported' error

At present when bootm fails, it says:

subcommand not supported

and then prints help for the bootm command. This is not very useful, since generally the error is related to something else, such as fixups failing. It is quite confusing to see this in a test run.

Change the error and show the error code.

We could update the OS functions to return -ENOSYS when they do not support the bootm subcommand. But this involves some thought since this is arch-specific code and proper errno error codes are not always returned. Also, with the code as is, all required subcommands are of course supported - a problem would only come if someone added a new one or removed support for one from an existing OS. Therefore it seems better to leave that sort of effort for when our bootm tests are improved.

Note: v1 of this patch generated a discussion[1] about printing error strings automatically using printf(). That is outside the scope of this patch but will be dealt with separately.

[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

---

(no changes since v1)

 boot/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
boot/bootm.c +1 -1
index 5b20b418dba..a4c0870c0fe 100644
@@ -790,7 +790,7 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc,
 
 	/* Check for unsupported subcommand. */
 	if (ret) {
-		puts("subcommand not supported\n");
+		printf("subcommand failed (err=%d)\n", ret);
 		return ret;
 	}
 
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#2 lore raw

Re: [PATCH v2 01/14] bootm: Change incorrect 'unsupported' error

At present when bootm fails, it says:

subcommand not supported

and then prints help for the bootm command. This is not very useful, since generally the error is related to something else, such as fixups failing. It is quite confusing to see this in a test run.

Change the error and show the error code.

We could update the OS functions to return -ENOSYS when they do not support the bootm subcommand. But this involves some thought since this is arch-specific code and proper errno error codes are not always returned. Also, with the code as is, all required subcommands are of course supported - a problem would only come if someone added a new one or removed support for one from an existing OS. Therefore it seems better to leave that sort of effort for when our bootm tests are improved.

Note: v1 of this patch generated a discussion[1] about printing error strings automatically using printf(). That is outside the scope of this patch but will be dealt with separately.

[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

---

(no changes since v1)

 boot/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to u-boot-dm, thanks!

#3 lore raw

PATCH v2 2/14 bootm: Avoid returning error codes from command

In reply to Simon Glass

Functions which implement commands must return a CMD_RET_... error code. At present bootm can return a negative errno value in some cases, thus causing strange behaviour such as trying to exit the shell and printing usage information.

Fix this by returning the correct value.

---

(no changes since v1)

 cmd/bootm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
cmd/bootm.c +6 -2
index d764a27002d..f09b41c2c16 100644
@@ -111,7 +111,7 @@ static int do_bootm_subcommand(struct cmd_tbl *cmdtp, int flag, int argc,
 			    bootm_get_addr(argc, argv) + image_load_offset);
 #endif
 
-	return ret;
+	return ret ? CMD_RET_FAILURE : 0;
 }
 
 /*******************************************************************/
@@ -120,6 +120,8 @@ static int do_bootm_subcommand(struct cmd_tbl *cmdtp, int flag, int argc,
 
 int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
+	int ret;
+
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
 	static int relocated = 0;
 
@@ -152,7 +154,7 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 			return do_bootm_subcommand(cmdtp, flag, argc, argv);
 	}
 
-	return do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START |
+	ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START |
 		BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | BOOTM_STATE_FINDOTHER |
 		BOOTM_STATE_LOADOS |
 #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
@@ -163,6 +165,8 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 #endif
 		BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
 		BOOTM_STATE_OS_GO, &images, 1);
+
+	return ret ? CMD_RET_FAILURE : 0;
 }
 
 int bootm_maybe_autostart(struct cmd_tbl *cmdtp, const char *cmd)
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#4 lore raw

Re: [PATCH v2 02/14] bootm: Avoid returning error codes from command

Functions which implement commands must return a CMD_RET_... error code. At present bootm can return a negative errno value in some cases, thus causing strange behaviour such as trying to exit the shell and printing usage information.

Fix this by returning the correct value.

---

(no changes since v1)

 cmd/bootm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Applied to u-boot-dm, thanks!

#5 lore raw

PATCH v2 3/14 bootm: Drop #ifdef from do_bootm()

In reply to Simon Glass

Drop the #ifdefs from this command by using a variable to hold the states that should be executed.

---

(no changes since v1)

 cmd/bootm.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
cmd/bootm.c +9 -10
index f09b41c2c16..37c2af96e08 100644
@@ -120,6 +120,7 @@ static int do_bootm_subcommand(struct cmd_tbl *cmdtp, int flag, int argc,
 
 int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
+	int states;
 	int ret;
 
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
@@ -154,17 +155,15 @@ int do_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 			return do_bootm_subcommand(cmdtp, flag, argc, argv);
 	}
 
-	ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START |
-		BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD | BOOTM_STATE_FINDOTHER |
-		BOOTM_STATE_LOADOS |
-#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
-		BOOTM_STATE_RAMDISK |
-#endif
-#if defined(CONFIG_PPC) || defined(CONFIG_MIPS)
-		BOOTM_STATE_OS_CMDLINE |
-#endif
+	states = BOOTM_STATE_START | BOOTM_STATE_FINDOS | BOOTM_STATE_PRE_LOAD |
+		BOOTM_STATE_FINDOTHER | BOOTM_STATE_LOADOS |
 		BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
-		BOOTM_STATE_OS_GO, &images, 1);
+		BOOTM_STATE_OS_GO;
+	if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
+		states |= BOOTM_STATE_RAMDISK;
+	if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_MIPS))
+		states |= BOOTM_STATE_OS_CMDLINE;
+	ret = do_bootm_states(cmdtp, flag, argc, argv, states, &images, 1);
 
 	return ret ? CMD_RET_FAILURE : 0;
 }
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#6 lore raw

Re: [PATCH v2 03/14] bootm: Drop #ifdef from do_bootm()

Drop the #ifdefs from this command by using a variable to hold the states that should be executed.

---

(no changes since v1)

 cmd/bootm.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Applied to u-boot-dm, thanks!

#7 lore raw

PATCH v2 4/14 boot: Correct handling of addresses in boot_relocate_fdt()

In reply to Simon Glass

This code uses casts between addresses and pointers, so does not work with sandbox. Update it so we can allow sandbox to do device tree fixups.

---

(no changes since v1)

 boot/image-fdt.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
boot/image-fdt.c +11 -11
index 884e089f2d8..f651940d9b4 100644
@@ -186,24 +186,25 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
 	/* If fdt_high is set use it to select the relocation address */
 	fdt_high = env_get("fdt_high");
 	if (fdt_high) {
-		void *desired_addr = (void *)hextoul(fdt_high, NULL);
+		ulong desired_addr = hextoul(fdt_high, NULL);
+		ulong addr;
 
-		if (((ulong) desired_addr) == ~0UL) {
+		if (desired_addr == ~0UL) {
 			/* All ones means use fdt in place */
 			of_start = fdt_blob;
-			lmb_reserve(lmb, (ulong)of_start, of_len);
+			lmb_reserve(lmb, map_to_sysmem(of_start), of_len);
 			disable_relocation = 1;
 		} else if (desired_addr) {
-			of_start =
-			    (void *)(ulong) lmb_alloc_base(lmb, of_len, 0x1000,
-							   (ulong)desired_addr);
+			addr = lmb_alloc_base(lmb, of_len, 0x1000,
+					      desired_addr);
+			of_start = map_sysmem(addr, of_len);
 			if (of_start == NULL) {
 				puts("Failed using fdt_high value for Device Tree");
 				goto error;
 			}
 		} else {
-			of_start =
-			    (void *)(ulong) lmb_alloc(lmb, of_len, 0x1000);
+			addr = lmb_alloc(lmb, of_len, 0x1000);
+			of_start = map_sysmem(addr, of_len);
 		}
 	} else {
 		mapsize = env_get_bootm_mapsize();
@@ -224,9 +225,8 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
 			 * At least part of this DRAM bank is usable, try
 			 * using it for LMB allocation.
 			 */
-			of_start =
-			    (void *)(ulong) lmb_alloc_base(lmb, of_len, 0x1000,
-							   start + usable);
+			of_start = map_sysmem((ulong)lmb_alloc_base(lmb,
+				    of_len, 0x1000, start + usable), of_len);
 			/* Allocation succeeded, use this block. */
 			if (of_start != NULL)
 				break;
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#8 lore raw

Re: [PATCH v2 04/14] boot: Correct handling of addresses in boot_relocate_fdt()

This code uses casts between addresses and pointers, so does not work with sandbox. Update it so we can allow sandbox to do device tree fixups.

---

(no changes since v1)

 boot/image-fdt.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Applied to u-boot-dm, thanks!

#9 lore raw

PATCH v2 5/14 fs: Quieten down the filesystems more

In reply to Simon Glass

When looking for a filesystem on a partition we should do so quietly. At present if the filesystem is very small (e.g. 512 bytes) we get a host of messages.

Update these to only show when debugging.

---

(no changes since v1)

 disk/part_efi.c       | 15 +++++++--------
 fs/btrfs/disk-io.c    |  7 ++++---
 fs/ext4/ext4_common.c |  2 +-
 fs/fs_internal.c      |  3 +--
 4 files changed, 13 insertions(+), 14 deletions(-)
disk/part_efi.c +7 -8
index ad94504ed90..26738a57d5d 100644
@@ -264,20 +264,19 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part,
 
 	/* "part" argument must be at least 1 */
 	if (part < 1) {
-		printf("%s: Invalid Argument(s)\n", __func__);
-		return -1;
+		log_debug("Invalid Argument(s)\n");
+		return -EINVAL;
 	}
 
 	/* This function validates AND fills in the GPT header and PTE */
 	if (find_valid_gpt(dev_desc, gpt_head, &gpt_pte) != 1)
-		return -1;
+		return -EINVAL;
 
 	if (part > le32_to_cpu(gpt_head->num_partition_entries) ||
 	    !is_pte_valid(&gpt_pte[part - 1])) {
-		debug("%s: *** ERROR: Invalid partition number %d ***\n",
-			__func__, part);
+		log_debug("*** ERROR: Invalid partition number %d ***\n", part);
 		free(gpt_pte);
-		return -1;
+		return -EPERM;
 	}
 
 	/* The 'lbaint_t' casting may limit the maximum disk size to 2 TB */
@@ -300,8 +299,8 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part,
 			info->type_guid, UUID_STR_FORMAT_GUID);
 #endif
 
-	debug("%s: start 0x" LBAF ", size 0x" LBAF ", name %s\n", __func__,
-	      info->start, info->size, info->name);
+	log_debug("start 0x" LBAF ", size 0x" LBAF ", name %s\n", info->start,
+		  info->size, info->name);
 
 	/* Remember to free pte */
 	free(gpt_pte);
fs/btrfs/disk-io.c +4 -3
index c80f8e80283..3f0d9f1c113 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 #include <common.h>
 #include <fs_internal.h>
+#include <log.h>
 #include <uuid.h>
 #include <memalign.h>
 #include "kernel-shared/btrfs_tree.h"
@@ -910,9 +911,9 @@ static int btrfs_scan_fs_devices(struct blk_desc *desc,
 
 	if (round_up(BTRFS_SUPER_INFO_SIZE + BTRFS_SUPER_INFO_OFFSET,
 		     desc->blksz) > (part->size << desc->log2blksz)) {
-		error("superblock end %u is larger than device size " LBAFU,
-				BTRFS_SUPER_INFO_SIZE + BTRFS_SUPER_INFO_OFFSET,
-				part->size << desc->log2blksz);
+		log_debug("superblock end %u is larger than device size " LBAFU,
+			  BTRFS_SUPER_INFO_SIZE + BTRFS_SUPER_INFO_OFFSET,
+			  part->size << desc->log2blksz);
 		return -EINVAL;
 	}
 
fs/ext4/ext4_common.c +1 -1
index d49ba4a9954..1185cb2c046 100644
@@ -2415,7 +2415,7 @@ int ext4fs_mount(unsigned part_length)
 
 	return 1;
 fail:
-	printf("Failed to mount ext2 filesystem...\n");
+	log_debug("Failed to mount ext2 filesystem...\n");
 fail_noerr:
 	free(data);
 	ext4fs_root = NULL;
fs/fs_internal.c +1 -2
index ae1cb8584c7..111f91b355d 100644
@@ -29,8 +29,7 @@ int fs_devread(struct blk_desc *blk, struct disk_partition *partition,
 	/* Check partition boundaries */
 	if ((sector + ((byte_offset + byte_len - 1) >> log2blksz))
 	    >= partition->size) {
-		log_err("%s read outside partition " LBAFU "\n", __func__,
-			sector);
+		log_debug("read outside partition " LBAFU "\n", sector);
 		return 0;
 	}
 
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#10 lore raw

Re: [PATCH v2 05/14] fs: Quieten down the filesystems more

When looking for a filesystem on a partition we should do so quietly. At present if the filesystem is very small (e.g. 512 bytes) we get a host of messages.

Update these to only show when debugging.

---

(no changes since v1)

 disk/part_efi.c       | 15 +++++++--------
 fs/btrfs/disk-io.c    |  7 ++++---
 fs/ext4/ext4_common.c |  2 +-
 fs/fs_internal.c      |  3 +--
 4 files changed, 13 insertions(+), 14 deletions(-)

Applied to u-boot-dm, thanks!

#11 lore raw

PATCH v2 6/14 fdt: Show a message when the working FDT changes

In reply to Simon Glass

The working FDT is the one which comes from the OS and is fixed up by U-Boot. When the bootm command runs, it sets up the working FDT to be the one it is about to pass to the OS, so that fixups can happen.

This seems like an important step, so add a message indicating that the working FDT has changed. This is shown during the running of the bootm command.

---

(no changes since v1)

 cmd/fdt.c             |  1 +
 doc/usage/cmd/fdt.rst |  1 +
 test/cmd/fdt.c        | 11 ++++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)
cmd/fdt.c +1 -0
index 6fbd9205d38..4b2dcfec863 100644
@@ -40,6 +40,7 @@ void set_working_fdt_addr(ulong addr)
 {
 	void *buf;
 
+	printf("Working FDT set to %lx\n", addr);
 	buf = map_sysmem(addr, 0);
 	working_fdt = buf;
 	env_set_hex("fdtaddr", addr);
doc/usage/cmd/fdt.rst +1 -0
index 07fed732e45..36b8230877c 100644
@@ -60,6 +60,7 @@ The second word shows the size of the FDT. Now set the working FDT to that
 address and expand it to 0xf000 in size::
 
     => fdt addr 10000 f000
+    Working FDT set to 10000
     => md 10000 4
     00010000: edfe0dd0 00f00000 78000000 7c270000  ...........x..'|
 
test/cmd/fdt.c +10 -1
index 100a7ef5ebf..ba9eaa42c14 100644
@@ -55,6 +55,7 @@ static int fdt_test_addr(struct unit_test_state *uts)
 
 	/* The working fdt is not set, so this should fail */
 	set_working_fdt_addr(0);
+	ut_assert_nextline("Working FDT set to 0");
 	ut_asserteq(CMD_RET_FAILURE, run_command("fdt addr", 0));
 	ut_assert_nextline("libfdt fdt_check_header(): FDT_ERR_BADMAGIC");
 	ut_assertok(ut_check_console_end(uts));
@@ -63,18 +64,22 @@ static int fdt_test_addr(struct unit_test_state *uts)
 	ut_assertok(make_test_fdt(uts, fdt, sizeof(fdt)));
 	addr = map_to_sysmem(fdt);
 	set_working_fdt_addr(addr);
+	ut_assert_nextline("Working FDT set to %lx", addr);
 	ut_assertok(run_command("fdt addr", 0));
 	ut_assert_nextline("Working fdt: %08lx", (ulong)map_to_sysmem(fdt));
 	ut_assertok(ut_check_console_end(uts));
 
 	/* Set the working FDT */
 	set_working_fdt_addr(0);
+	ut_assert_nextline("Working FDT set to 0");
 	ut_assertok(run_commandf("fdt addr %08x", addr));
+	ut_assert_nextline("Working FDT set to %lx", addr);
 	ut_asserteq(addr, map_to_sysmem(working_fdt));
 	ut_assertok(ut_check_console_end(uts));
 	set_working_fdt_addr(0);
+	ut_assert_nextline("Working FDT set to 0");
 
-	/* Set the working FDT */
+	/* Set the control FDT */
 	fdt_blob = gd->fdt_blob;
 	gd->fdt_blob = NULL;
 	ret = run_commandf("fdt addr -c %08x", addr);
@@ -93,6 +98,7 @@ static int fdt_test_addr(struct unit_test_state *uts)
 	/* Test detecting an invalid FDT */
 	fdt[0] = 123;
 	set_working_fdt_addr(addr);
+	ut_assert_nextline("Working FDT set to %lx", addr);
 	ut_asserteq(1, run_commandf("fdt addr"));
 	ut_assert_nextline("libfdt fdt_check_header(): FDT_ERR_BADMAGIC");
 	ut_assertok(ut_check_console_end(uts));
@@ -115,16 +121,19 @@ static int fdt_test_resize(struct unit_test_state *uts)
 	/* Test setting and resizing the working FDT to a larger size */
 	ut_assertok(console_record_reset_enable());
 	ut_assertok(run_commandf("fdt addr %08x %x", addr, newsize));
+	ut_assert_nextline("Working FDT set to %lx", addr);
 	ut_assertok(ut_check_console_end(uts));
 
 	/* Try shrinking it */
 	ut_assertok(run_commandf("fdt addr %08x %x", addr, sizeof(fdt) / 4));
+	ut_assert_nextline("Working FDT set to %lx", addr);
 	ut_assert_nextline("New length %d < existing length %d, ignoring",
 			   (int)sizeof(fdt) / 4, newsize);
 	ut_assertok(ut_check_console_end(uts));
 
 	/* ...quietly */
 	ut_assertok(run_commandf("fdt addr -q %08x %x", addr, sizeof(fdt) / 4));
+	ut_assert_nextline("Working FDT set to %lx", addr);
 	ut_assertok(ut_check_console_end(uts));
 
 	/* We cannot easily provoke errors in fdt_open_into(), so ignore that */
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#12 lore raw

PATCH v2 7/14 bootstd: Move VBE setup into a shared function

In reply to Simon Glass

This information needs to be set up by the bootstd tests as well. Move it into a common function and ensure it is executed before any bootstd test is run.

Make sure the 'images' parameter is set correctly for fixups.

---

(no changes since v1)

 test/boot/bootstd_common.c | 48 ++++++++++++++++++++++++++++++++++++++
 test/boot/bootstd_common.h | 16 +++++++++++++
 test/boot/vbe_simple.c     | 34 ++++-----------------------
 3 files changed, 68 insertions(+), 30 deletions(-)
test/boot/bootstd_common.c +48 -0
index 05347d87106..59d46bef0c5 100644
@@ -9,10 +9,46 @@
 #include <common.h>
 #include <bootstd.h>
 #include <dm.h>
+#include <memalign.h>
+#include <mmc.h>
+#include <linux/log2.h>
 #include <test/suites.h>
 #include <test/ut.h>
+#include <u-boot/crc.h>
 #include "bootstd_common.h"
 
+bool vbe_setup_done;
+
+/* set up MMC for VBE tests */
+int bootstd_setup_for_tests(void)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(u8, buf, MMC_MAX_BLOCK_LEN);
+	struct udevice *mmc;
+	struct blk_desc *desc;
+	int ret;
+
+	/* Set up the version string */
+	ret = uclass_get_device(UCLASS_MMC, 1, &mmc);
+	if (ret)
+		return log_msg_ret("mmc", -EIO);
+	desc = blk_get_by_device(mmc);
+
+	memset(buf, '\0', MMC_MAX_BLOCK_LEN);
+	strcpy(buf, TEST_VERSION);
+	if (blk_dwrite(desc, VERSION_START_BLK, 1, buf) != 1)
+		return log_msg_ret("wr1", -EIO);
+
+	/* Set up the nvdata */
+	memset(buf, '\0', MMC_MAX_BLOCK_LEN);
+	buf[1] = ilog2(0x40) << 4 | 1;
+	*(u32 *)(buf + 4) = TEST_VERNUM;
+	buf[0] = crc8(0, buf + 1, 0x3f);
+	if (blk_dwrite(desc, NVDATA_START_BLK, 1, buf) != 1)
+		return log_msg_ret("wr2", -EIO);
+
+	return 0;
+}
+
 int bootstd_test_drop_bootdev_order(struct unit_test_state *uts)
 {
 	struct bootstd_priv *priv;
@@ -30,6 +66,18 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 	struct unit_test *tests = UNIT_TEST_SUITE_START(bootstd_test);
 	const int n_ents = UNIT_TEST_SUITE_COUNT(bootstd_test);
 
+	if (!vbe_setup_done) {
+		int ret;
+
+		ret = bootstd_setup_for_tests();
+		if (ret) {
+			printf("Failed to set up for bootstd tests (err=%d)\n",
+			       ret);
+			return CMD_RET_FAILURE;
+		}
+		vbe_setup_done = true;
+	}
+
 	return cmd_ut_category("bootstd", "bootstd_test_",
 			       tests, n_ents, argc, argv);
 }
test/boot/bootstd_common.h +16 -0
index 676ef0a57f9..c5e0fd1ceab 100644
@@ -9,10 +9,17 @@
 #ifndef __bootstd_common_h
 #define __bootstd_common_h
 
+#include <version_string.h>
+
 /* Declare a new bootdev test */
 #define BOOTSTD_TEST(_name, _flags) \
 		UNIT_TEST(_name, _flags, bootstd_test)
 
+#define NVDATA_START_BLK	((0x400 + 0x400) / MMC_MAX_BLOCK_LEN)
+#define VERSION_START_BLK	((0x400 + 0x800) / MMC_MAX_BLOCK_LEN)
+#define TEST_VERSION		"U-Boot v2022.04-local2"
+#define TEST_VERNUM		0x00010002
+
 struct unit_test_state;
 
 /**
@@ -24,4 +31,13 @@ struct unit_test_state;
  */
 int bootstd_test_drop_bootdev_order(struct unit_test_state *uts);
 
+/**
+ * bootstd_setup_for_tests() - Set up MMC data for VBE tests
+ *
+ * Some data is needed for VBE tests to work. This function sets that up.
+ *
+ * @return 0 if OK, -ve on error
+ */
+int bootstd_setup_for_tests(void);
+
 #endif
test/boot/vbe_simple.c +4 -30
index 8acd777f4cd..faba9e8f90b 100644
@@ -10,54 +10,27 @@
 #include <bootmeth.h>
 #include <dm.h>
 #include <image.h>
-#include <memalign.h>
-#include <mmc.h>
 #include <of_live.h>
 #include <vbe.h>
-#include <version_string.h>
-#include <linux/log2.h>
 #include <test/suites.h>
 #include <test/ut.h>
-#include <u-boot/crc.h>
 #include "bootstd_common.h"
 
-#define NVDATA_START_BLK	((0x400 + 0x400) / MMC_MAX_BLOCK_LEN)
-#define VERSION_START_BLK	((0x400 + 0x800) / MMC_MAX_BLOCK_LEN)
-#define TEST_VERSION		"U-Boot v2022.04-local2"
-#define TEST_VERNUM		0x00010002
-
 /* Basic test of reading nvdata and updating a fwupd node in the device tree */
 static int vbe_simple_test_base(struct unit_test_state *uts)
 {
-	ALLOC_CACHE_ALIGN_BUFFER(u8, buf, MMC_MAX_BLOCK_LEN);
 	const char *version, *bl_version;
 	struct event_ft_fixup fixup;
-	struct udevice *dev, *mmc;
+	struct udevice *dev;
 	struct device_node *np;
-	struct blk_desc *desc;
 	char fdt_buf[0x400];
 	char info[100];
 	int node_ofs;
 	ofnode node;
 	u32 vernum;
 
-	/* Set up the version string */
-	ut_assertok(uclass_get_device(UCLASS_MMC, 1, &mmc));
-	desc = blk_get_by_device(mmc);
-	ut_assertnonnull(desc);
-
-	memset(buf, '\0', MMC_MAX_BLOCK_LEN);
-	strcpy(buf, TEST_VERSION);
-	if (blk_dwrite(desc, VERSION_START_BLK, 1, buf) != 1)
-		return log_msg_ret("write", -EIO);
-
-	/* Set up the nvdata */
-	memset(buf, '\0', MMC_MAX_BLOCK_LEN);
-	buf[1] = ilog2(0x40) << 4 | 1;
-	*(u32 *)(buf + 4) = TEST_VERNUM;
-	buf[0] = crc8(0, buf + 1, 0x3f);
-	if (blk_dwrite(desc, NVDATA_START_BLK, 1, buf) != 1)
-		return log_msg_ret("write", -EIO);
+	/* Set up the VBE info */
+	ut_assertok(bootstd_setup_for_tests());
 
 	/* Read the version back */
 	ut_assertok(vbe_find_by_any("firmware0", &dev));
@@ -90,6 +63,7 @@ static int vbe_simple_test_base(struct unit_test_state *uts)
 	 *
 	 * Two fix this we need image_setup_libfdt() is updated to use ofnode
 	 */
+	fixup.images = NULL;
 	ut_assertok(event_notify(EVT_FT_FIXUP, &fixup, sizeof(fixup)));
 
 	node = oftree_path(fixup.tree, "/chosen/fwupd/firmware0");
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#13 lore raw

Re: [PATCH v2 07/14] bootstd: Move VBE setup into a shared function

This information needs to be set up by the bootstd tests as well. Move it into a common function and ensure it is executed before any bootstd test is run.

Make sure the 'images' parameter is set correctly for fixups.

---

(no changes since v1)

 test/boot/bootstd_common.c | 48 ++++++++++++++++++++++++++++++++++++++
 test/boot/bootstd_common.h | 16 +++++++++++++
 test/boot/vbe_simple.c     | 34 ++++-----------------------
 3 files changed, 68 insertions(+), 30 deletions(-)

Applied to u-boot-dm, thanks!

#14 lore raw

PATCH v2 8/14 sandbox: Support FDT fixups

In reply to Simon Glass

Add support for doing device tree fixups in sandbox. This allows us to test that functionality in CI.

---

(no changes since v1)

 arch/sandbox/lib/bootm.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/sandbox/lib/bootm.c +17 -0
index c1742f94de7..28f4a746fb6 100644
@@ -50,8 +50,25 @@ int bootz_setup(ulong image, ulong *start, ulong *end)
 	return ret;
 }
 
+/* Subcommand: PREP */
+static int boot_prep_linux(struct bootm_headers *images)
+{
+	int ret;
+
+	if (CONFIG_IS_ENABLED(LMB)) {
+		ret = image_setup_linux(images);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
 int do_bootm_linux(int flag, int argc, char *argv[], struct bootm_headers *images)
 {
+	if (flag & BOOTM_STATE_OS_PREP)
+		return boot_prep_linux(images);
+
 	if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
 		bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 		printf("## Transferring control to Linux (at address %08lx)...\n",
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#15 lore raw

Re: [PATCH v2 08/14] sandbox: Support FDT fixups

Add support for doing device tree fixups in sandbox. This allows us to test that functionality in CI.

---

(no changes since v1)

 arch/sandbox/lib/bootm.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Applied to u-boot-dm, thanks!

#16 lore raw

PATCH v2 9/14 boot: Pass the correct FDT to the EVT_FT_FIXUP event

In reply to Simon Glass

Now that we support multiple device trees with the ofnode interface, we can pass the correct FDT to this event. This allows the 'working' FDT to be fixed up, as expected, so long as OFNODE_MULTI_TREE is enabled.

Also make sure we don't try to do this with livetree, which does not support fixups yet.

---

(no changes since v1)

 boot/image-fdt.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
boot/image-fdt.c +9 -6
index f651940d9b4..b830a0ab418 100644
@@ -665,15 +665,18 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,
 			goto err;
 		}
 	}
-	if (CONFIG_IS_ENABLED(EVENT)) {
+	if (!of_live_active() && CONFIG_IS_ENABLED(EVENT)) {
 		struct event_ft_fixup fixup;
 
-		fixup.tree = oftree_default();
+		fixup.tree = oftree_from_fdt(blob);
 		fixup.images = images;
-		ret = event_notify(EVT_FT_FIXUP, &fixup, sizeof(fixup));
-		if (ret) {
-			printf("ERROR: fdt fixup event failed: %d\n", ret);
-			goto err;
+		if (oftree_valid(fixup.tree)) {
+			ret = event_notify(EVT_FT_FIXUP, &fixup, sizeof(fixup));
+			if (ret) {
+				printf("ERROR: fdt fixup event failed: %d\n",
+				       ret);
+				goto err;
+			}
 		}
 	}
 
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#17 lore raw

Re: [PATCH v2 09/14] boot: Pass the correct FDT to the EVT_FT_FIXUP event

Now that we support multiple device trees with the ofnode interface, we can pass the correct FDT to this event. This allows the 'working' FDT to be fixed up, as expected, so long as OFNODE_MULTI_TREE is enabled.

Also make sure we don't try to do this with livetree, which does not support fixups yet.

---

(no changes since v1)

 boot/image-fdt.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Applied to u-boot-dm, thanks!

#18 lore raw

PATCH v2 10/14 boot: Tidy up logging and naming in vbe_simple

In reply to Simon Glass

Make sure the log_msg_ret() values are unique so that the log trace is unambiguous with LOG_ERROR_RETURN. Also avoid reusing the 'node' variable for two different nodes in bootmeth_vbe_simple_ft_fixup(), since this is confusing.

---

(no changes since v1)

 boot/vbe_simple.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
boot/vbe_simple.c +9 -7
index 61b6322ebe2..076b650c25a 100644
@@ -6,6 +6,8 @@
  * Written by Simon Glass <[email protected]>
  */
 
+#define LOG_CATEGORY LOGC_BOOT
+
 #include <common.h>
 #include <log.h>
 #include <memalign.h>
@@ -199,17 +201,17 @@ int vbe_simple_fixup_node(ofnode node, struct simple_state *state)
 
 	version = strdup(state->fw_version);
 	if (!version)
-		return log_msg_ret("ver", -ENOMEM);
+		return log_msg_ret("dup", -ENOMEM);
 
 	ret = ofnode_write_string(node, "cur-version", version);
 	if (ret)
 		return log_msg_ret("ver", ret);
 	ret = ofnode_write_u32(node, "cur-vernum", state->fw_vernum);
 	if (ret)
-		return log_msg_ret("ver", ret);
+		return log_msg_ret("num", ret);
 	ret = ofnode_write_string(node, "bootloader-version", version_string);
 	if (ret)
-		return log_msg_ret("fix", ret);
+		return log_msg_ret("bl", ret);
 
 	return 0;
 }
@@ -233,7 +235,7 @@ static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event)
 	 */
 	for (vbe_find_first_device(&dev); dev; vbe_find_next_device(&dev)) {
 		struct simple_state state;
-		ofnode node;
+		ofnode node, subnode;
 		int ret;
 
 		if (strcmp("vbe_simple", dev->driver->name))
@@ -243,8 +245,8 @@ static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event)
 		node = oftree_path(tree, "/chosen/fwupd");
 		if (!ofnode_valid(node))
 			continue;
-		node = ofnode_find_subnode(node, dev->name);
-		if (!ofnode_valid(node))
+		subnode = ofnode_find_subnode(node, dev->name);
+		if (!ofnode_valid(subnode))
 			continue;
 
 		log_debug("Fixing up: %s\n", dev->name);
@@ -255,7 +257,7 @@ static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event)
 		if (ret)
 			return log_msg_ret("read", ret);
 
-		ret = vbe_simple_fixup_node(node, &state);
+		ret = vbe_simple_fixup_node(subnode, &state);
 		if (ret)
 			return log_msg_ret("fix", ret);
 	}
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#19 lore raw

Re: [PATCH v2 10/14] boot: Tidy up logging and naming in vbe_simple

Make sure the log_msg_ret() values are unique so that the log trace is unambiguous with LOG_ERROR_RETURN. Also avoid reusing the 'node' variable for two different nodes in bootmeth_vbe_simple_ft_fixup(), since this is confusing.

---

(no changes since v1)

 boot/vbe_simple.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Applied to u-boot-dm, thanks!

#20 lore raw

PATCH v2 11/14 test: Move common FIT code into a separate fit_util file

In reply to Simon Glass

To avoid duplicating code, create a new fit_util module which provides various utility functions for FIT. Move this code out from the existing test_fit.py and refactor it with addition parameters.

Fix up pylint warnings in the conversion.

This involves no functional change.

---

(no changes since v1)

 test/boot/bootstd_common.c | 21 ++++-----
 test/py/tests/fit_util.py  | 90 ++++++++++++++++++++++++++++++++++++++
 test/py/tests/test_fit.py  | 79 ++++-----------------------------
 3 files changed, 110 insertions(+), 80 deletions(-)
 create mode 100644 test/py/tests/fit_util.py
test/boot/bootstd_common.c +11 -10
index 59d46bef0c5..7a40836507a 100644
@@ -17,6 +17,7 @@
 #include <u-boot/crc.h>
 #include "bootstd_common.h"
 
+/* tracks whether bootstd_setup_for_tests() has been run yet */
 bool vbe_setup_done;
 
 /* set up MMC for VBE tests */
@@ -27,6 +28,9 @@ int bootstd_setup_for_tests(void)
 	struct blk_desc *desc;
 	int ret;
 
+	if (vbe_setup_done)
+		return 0;
+
 	/* Set up the version string */
 	ret = uclass_get_device(UCLASS_MMC, 1, &mmc);
 	if (ret)
@@ -46,6 +50,8 @@ int bootstd_setup_for_tests(void)
 	if (blk_dwrite(desc, NVDATA_START_BLK, 1, buf) != 1)
 		return log_msg_ret("wr2", -EIO);
 
+	vbe_setup_done = true;
+
 	return 0;
 }
 
@@ -65,17 +71,12 @@ int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	struct unit_test *tests = UNIT_TEST_SUITE_START(bootstd_test);
 	const int n_ents = UNIT_TEST_SUITE_COUNT(bootstd_test);
+	int ret;
 
-	if (!vbe_setup_done) {
-		int ret;
-
-		ret = bootstd_setup_for_tests();
-		if (ret) {
-			printf("Failed to set up for bootstd tests (err=%d)\n",
-			       ret);
-			return CMD_RET_FAILURE;
-		}
-		vbe_setup_done = true;
+	ret = bootstd_setup_for_tests();
+	if (ret) {
+		printf("Failed to set up for bootstd tests (err=%d)\n", ret);
+		return CMD_RET_FAILURE;
 	}
 
 	return cmd_ut_category("bootstd", "bootstd_test_",
test/py/tests/fit_util.py new file +90 -0

90 lines not on this page · raw message

test/py/tests/test_fit.py +9 -70

134 lines not on this page · raw message

Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#21 lore raw

Re: [PATCH v2 11/14] test: Move common FIT code into a separate fit_util file

To avoid duplicating code, create a new fit_util module which provides various utility functions for FIT. Move this code out from the existing test_fit.py and refactor it with addition parameters.

Fix up pylint warnings in the conversion.

This involves no functional change.

---

(no changes since v1)

 test/boot/bootstd_common.c | 21 ++++-----
 test/py/tests/fit_util.py  | 90 ++++++++++++++++++++++++++++++++++++++
 test/py/tests/test_fit.py  | 79 ++++-----------------------------
 3 files changed, 110 insertions(+), 80 deletions(-)
 create mode 100644 test/py/tests/fit_util.py

Applied to u-boot-dm, thanks!

#22 lore raw

PATCH v2 12/14 vbe: Add fixups for a basic set of OS requests

In reply to Simon Glass

As a starting point, add support for providing random data, if requested by the OS. Also add ASLR, as a placeholder for now.

---

(no changes since v1)

 boot/Makefile                    |   2 +-
 boot/vbe_fixup.c                 | 233 +++++++++++++++++++++++++++++++
 test/py/tests/test_event_dump.py |   1 +
 3 files changed, 235 insertions(+), 1 deletion(-)
 create mode 100644 boot/vbe_fixup.c
boot/Makefile +1 -1
index 67e335255f1..dd45d786f8c 100644
@@ -47,5 +47,5 @@ ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
 endif
 
-obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o
+obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_fixup.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o
boot/vbe_fixup.c new file +233 -0

233 lines not on this page · raw message

test/py/tests/test_event_dump.py +1 -0
index bc54149e8f2..e63c25df537 100644
@@ -16,6 +16,7 @@ def test_event_dump(u_boot_console):
     out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox])
     expect = '''.*Event type            Id                              Source location
 --------------------  ------------------------------  ------------------------------
+EVT_FT_FIXUP          bootmeth_vbe_ft_fixup           .*boot/vbe_fixup.c:.*
 EVT_FT_FIXUP          bootmeth_vbe_simple_ft_fixup    .*boot/vbe_simple.c:.*
 EVT_MISC_INIT_F       sandbox_misc_init_f             .*arch/sandbox/cpu/start.c:'''
     assert re.match(expect, out, re.MULTILINE) is not None
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#23 lore raw

Re: [PATCH v2 12/14] vbe: Add fixups for a basic set of OS requests

As a starting point, add support for providing random data, if requested by the OS. Also add ASLR, as a placeholder for now.

---

(no changes since v1)

 boot/Makefile                    |   2 +-
 boot/vbe_fixup.c                 | 233 +++++++++++++++++++++++++++++++
 test/py/tests/test_event_dump.py |   1 +
 3 files changed, 235 insertions(+), 1 deletion(-)
 create mode 100644 boot/vbe_fixup.c

Applied to u-boot-dm, thanks!

#24 lore raw

PATCH v2 13/14 dm: core: Update docs about oftree_from_fdt()

In reply to Simon Glass

Update this function's comment and also the livetree documentation, so it is clear when to use the function.

---

Changes in v2:
- Add new patch to update docs about oftree_from_fdt()

 doc/develop/driver-model/livetree.rst | 2 +-
 include/dm/ofnode.h                   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
doc/develop/driver-model/livetree.rst +1 -1
index 55aa3eac929..579eef5ca9f 100644
@@ -255,7 +255,7 @@ So long as OF_LIVE is disabled, it is possible to do fixups using the ofnode
 interface. The OF_LIVE support required addition of the flattening step at the
 end.
 
-See dm_test_ofnode_root() for some examples. The ofnode_path_root() function
+See dm_test_ofnode_root() for some examples. The oftree_from_fdt() function
 causes a flat device tree to be 'registered' such that it can be used by the
 ofnode interface.
 
include/dm/ofnode.h +3 -0
index 7aae2c29ef1..fa9865602d8 100644
@@ -59,6 +59,9 @@ __attribute_const__ int ofnode_to_offset(ofnode node);
 /**
  * oftree_from_fdt() - Returns an oftree from a flat device tree pointer
  *
+ * If @fdt is not already registered in the list of current device trees, it is
+ * added to the list.
+ *
  * @fdt: Device tree to use
  *
  * Returns: reference to the given node
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#25 lore raw

Re: [PATCH v2 13/14] dm: core: Update docs about oftree_from_fdt()

Update this function's comment and also the livetree documentation, so it is clear when to use the function.

---

Changes in v2:
- Add new patch to update docs about oftree_from_fdt()

 doc/develop/driver-model/livetree.rst | 2 +-
 include/dm/ofnode.h                   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

Applied to u-boot-dm, thanks!

#26 lore raw

PATCH v2 14/14 vbe: Add a test for VBE device tree fixups

In reply to Simon Glass

When a FIT includes some OS requests, U-Boot should process these and add the requested info to corresponding subnodes of the /chosen node. Add a pytest for this, which sets up the FIT, runs bootm and then uses a C unit test to check that everything looks OK.

The test needs to run on sandbox_flattree since we don't support device tree fixups on sandbox (live tree) yet. So enable BOOTMETH_VBE and disable bootflow_system(), since EFI is not supported on sandbox_flattree.

Add a link to the initial documentation.

---

(no changes since v1)

 configs/sandbox_flattree_defconfig |   2 +-
 doc/develop/vbe.rst                |   3 +-
 test/boot/Makefile                 |   1 +
 test/boot/bootflow.c               |   2 +
 test/boot/vbe_fixup.c              |  59 ++++++++++++++
 test/py/tests/fit_util.py          |   5 +-
 test/py/tests/test_vbe.py          | 123 +++++++++++++++++++++++++++++
 7 files changed, 192 insertions(+), 3 deletions(-)
 create mode 100644 test/boot/vbe_fixup.c
 create mode 100644 test/py/tests/test_vbe.py
configs/sandbox_flattree_defconfig +1 -1
index a2eb7afcf9b..0d8e3132320 100644
@@ -11,7 +11,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-# CONFIG_BOOTMETH_VBE is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_BOOTSTAGE_FDT=y
@@ -83,6 +82,7 @@ CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y
 CONFIG_DEBUG_DEVRES=y
+CONFIG_OFNODE_MULTI_TREE=y
 CONFIG_ADC=y
 CONFIG_ADC_SANDBOX=y
 CONFIG_AXI=y
doc/develop/vbe.rst +2 -1
index 8f147fd9360..cca193c8fd4 100644
@@ -19,8 +19,9 @@ listing methods and getting the status for a method.
 
 For a detailed overview of VBE, see vbe-intro_. A fuller description of
 bootflows is at vbe-bootflows_ and the firmware-update mechanism is described at
-vbe-fwupdate_.
+vbe-fwupdate_. VBE OS requests are described at  vbe-osrequests_.
 
 .. _vbe-intro: https://docs.google.com/document/d/e/2PACX-1vQjXLPWMIyVktaTMf8edHZYDrEvMYD_iNzIj1FgPmKF37fpglAC47Tt5cvPBC5fvTdoK-GA5Zv1wifo/pub
 .. _vbe-bootflows: https://docs.google.com/document/d/e/2PACX-1vR0OzhuyRJQ8kdeOibS3xB1rVFy3J4M_QKTM5-3vPIBNcdvR0W8EXu9ymG-yWfqthzWoM4JUNhqwydN/pub
 .. _vbe-fwupdate: https://docs.google.com/document/d/e/2PACX-1vTnlIL17vVbl6TVoTHWYMED0bme7oHHNk-g5VGxblbPiKIdGDALE1HKId8Go5f0g1eziLsv4h9bocbk/pub
+.. _vbe-osrequests: https://docs.google.com/document/d/e/2PACX-1vTHhxX7WSZe68i9rAkW-DHdx6koU-jxYHhamLhZn9GQ9QT2_epSBosMV1_r7yPHOXZccx71rF_t0PXL/pub
test/boot/Makefile +1 -0
index 9e9d5ae21f3..5bb3f889759 100644
@@ -7,3 +7,4 @@ obj-$(CONFIG_BOOTSTD) += bootdev.o bootstd_common.o bootflow.o bootmeth.o
 ifdef CONFIG_OF_LIVE
 obj-$(CONFIG_BOOTMETH_VBE_SIMPLE) += vbe_simple.o
 endif
+obj-$(CONFIG_BOOTMETH_VBE) += vbe_fixup.o
test/boot/bootflow.c +2 -0
index 85305234e01..1e8ea754bcd 100644
@@ -329,6 +329,8 @@ static int bootflow_system(struct unit_test_state *uts)
 {
 	struct udevice *dev;
 
+	if (!IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR))
+		return 0;
 	ut_assertok(uclass_get_device_by_name(UCLASS_BOOTMETH, "efi_mgr",
 					      &dev));
 	sandbox_set_fake_efi_mgr_dev(dev, true);
test/boot/vbe_fixup.c new file +59 -0

59 lines not on this page · raw message

test/py/tests/fit_util.py +4 -1
index fcec4c43c3c..79718d431a0 100644
@@ -36,7 +36,7 @@ def make_its(cons, base_its, params, basename='test.its'):
         print(base_its % params, file=outf)
     return its
 
-def make_fit(cons, mkimage, base_its, params, basename='test.fit'):
+def make_fit(cons, mkimage, base_its, params, basename='test.fit', base_fdt=None):
     """Make a sample .fit file ready for loading
 
     This creates a .its script with the selected parameters and uses mkimage to
@@ -55,6 +55,9 @@ def make_fit(cons, mkimage, base_its, params, basename='test.fit'):
     fit = make_fname(cons, basename)
     its = make_its(cons, base_its, params)
     util.run_and_log(cons, [mkimage, '-f', its, fit])
+    if base_fdt:
+        with open(make_fname(cons, 'u-boot.dts'), 'w') as fd:
+            fd.write(base_fdt)
     return fit
 
 def make_kernel(cons, basename, text):
test/py/tests/test_vbe.py new file +123 -0

123 lines not on this page · raw message

Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
#27 lore raw

Re: [PATCH v2 14/14] vbe: Add a test for VBE device tree fixups

When a FIT includes some OS requests, U-Boot should process these and add the requested info to corresponding subnodes of the /chosen node. Add a pytest for this, which sets up the FIT, runs bootm and then uses a C unit test to check that everything looks OK.

The test needs to run on sandbox_flattree since we don't support device tree fixups on sandbox (live tree) yet. So enable BOOTMETH_VBE and disable bootflow_system(), since EFI is not supported on sandbox_flattree.

Add a link to the initial documentation.

---

(no changes since v1)

 configs/sandbox_flattree_defconfig |   2 +-
 doc/develop/vbe.rst                |   3 +-
 test/boot/Makefile                 |   1 +
 test/boot/bootflow.c               |   2 +
 test/boot/vbe_fixup.c              |  59 ++++++++++++++
 test/py/tests/fit_util.py          |   5 +-
 test/py/tests/test_vbe.py          | 123 +++++++++++++++++++++++++++++
 7 files changed, 192 insertions(+), 3 deletions(-)
 create mode 100644 test/boot/vbe_fixup.c
 create mode 100644 test/py/tests/test_vbe.py

Applied to u-boot-dm, thanks!