mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-28 23:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

bootstd: Scan all bootdevs in a boot_targets entry

Browse Source 
When the boot_targets environment variable is used with the distro-boot
scripts, each device is included individually. For example, if there
are three mmc devices, then we will have something like:

   boot_targets="mmc0 mmc1 mmc2"

In contrast, standard boot supports specifying just the uclass, i.e.:

   boot_targets="mmc"

The intention is that this should scan all MMC devices, but in fact it
currently only scans the first.

Update the logic to handle this case, without required BOOTSTD_FULL to
be enabled.

I believe at least three people reported this, but I found two.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Date Huang <tjjh89017@hotmail.com>
Reported-by: Vincent Stehlé <vincent.stehle@arm.com>
This commit is contained in:
Simon Glass 2023-09-23 14:50:15 -06:00
parent d5d24e2e0a
commit e824d0d0c2
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot/bootdev-uclass.c
View File

@ -469,10 +469,11 @@ int bootdev_find_by_label(const char *label, struct udevice **devp,
* if no sequence number was provided, we must scan all * if no sequence number was provided, we must scan all
* bootdevs for this media uclass * bootdevs for this media uclass
*/ */
if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && seq == -1) if (seq == -1)
method_flags |= BOOTFLOW_METHF_SINGLE_UCLASS; method_flags |= BOOTFLOW_METHF_SINGLE_UCLASS;
if (method_flagsp) if (method_flagsp)
*method_flagsp = method_flags; *method_flagsp = method_flags;
log_debug("method flags %x\n", method_flags);
return 0; return 0;
} }
log_debug("- no device in %s\n", media->name); log_debug("- no device in %s\n", media->name);

21
boot/bootflow.c
View File

@ -260,8 +260,25 @@ static int iter_incr(struct bootflow_iter *iter)
} else { } else {
log_debug("labels %p\n", iter->labels); log_debug("labels %p\n", iter->labels);
if (iter->labels) { if (iter->labels) {
ret = bootdev_next_label(iter, &dev, /*
&method_flags); * when the label is "mmc" we want to scan all
* mmc bootdevs, not just the first. See
* bootdev_find_by_label() where this flag is
* set up
*/
if (iter->method_flags & BOOTFLOW_METHF_SINGLE_UCLASS) {
uclass_next_device(&dev);
log_debug("looking for next device %s: %s\n",
iter->dev->name,
dev ? dev->name : "<none>");
} else {
dev = NULL;
}
if (!dev) {
log_debug("looking at next label\n");
ret = bootdev_next_label(iter, &dev,
&method_flags);
}
} else { } else {
ret = bootdev_next_prio(iter, &dev); ret = bootdev_next_prio(iter, &dev);
method_flags = 0; method_flags = 0;

10
test/boot/bootdev.c
View File

@ -221,6 +221,16 @@ static int bootdev_test_order(struct unit_test_state *uts)
ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name); ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
bootflow_iter_uninit(&iter); bootflow_iter_uninit(&iter);
/* Make sure it scans a bootdevs in each target */
ut_assertok(env_set("boot_targets", "mmc spi"));
ut_asserteq(0, bootflow_scan_first(NULL, NULL, &iter, 0, &bflow));
ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
ut_asserteq(3, iter.num_devs);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
ut_asserteq_str("mmc1.bootdev", iter.dev_used[1]->name);
ut_asserteq_str("mmc0.bootdev", iter.dev_used[2]->name);
bootflow_iter_uninit(&iter);
return 0; return 0;
} }
BOOTSTD_TEST(bootdev_test_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT); BOOTSTD_TEST(bootdev_test_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT);