bootstd: Scan all bootdevs in a boot_targets entry (take 2)

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.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Date Huang <tjjh89017@hotmail.com>
Reported-by: Vincent Stehlé <vincent.stehle@arm.com>
Reported-by: Ivan Ivanov <ivan.ivanov@suse.com>
Tested-by: Ivan T.Ivanov <iivanov@suse.de>

diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 974ddee5d2faa05af687dab16f99ab4065a31f08..44ae98a9269cc65ff5438b3568e8b14f840c97a6 100644 (file)
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -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
                         * bootdevs for this media uclass
                         */
-                       if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && seq == -1)
+                       if (seq == -1)
                                method_flags |= BOOTFLOW_METHF_SINGLE_UCLASS;
                        if (method_flagsp)
                                *method_flagsp = method_flags;
+                       log_debug("method flags %x\n", method_flags);
                        return 0;
                }
                log_debug("- no device in %s\n", media->name);

diff --git a/boot/bootflow.c b/boot/bootflow.c
index 7f5b0e9420789eb59bf2fa376e11296516f0537d..be543c8588cc99e235fac670857d8e19651148e4 100644 (file)
--- a/boot/bootflow.c
+++ b/boot/bootflow.c
@@ -280,8 +280,26 @@ static int iter_incr(struct bootflow_iter *iter)
                } else {
                        log_debug("labels %p\n", 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) {
+                                       scan_next_in_uclass(&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 {
                                ret = bootdev_next_prio(iter, &dev);
                                method_flags = 0;

diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index 63786174805749233d1f39dbfc1c64116601388e..0702fccdae60077cf9635b6584085f39b495e3c6 100644 (file)
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -225,7 +225,7 @@ static int bootdev_test_order(struct unit_test_state *uts)
        ut_assertok(env_set("boot_targets", "mmc1 mmc2 usb"));
        ut_assertok(bootflow_scan_first(NULL, NULL, &iter, 0, &bflow));
        ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
-       ut_asserteq(3, iter.num_devs);
+       ut_asserteq(5, iter.num_devs);
        ut_asserteq_str("mmc1.bootdev", iter.dev_used[0]->name);
        ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
        ut_asserteq_str("usb_mass_storage.lun0.bootdev",
@@ -237,7 +237,20 @@ static int bootdev_test_order(struct unit_test_state *uts)
        ut_assertok(bootflow_scan_first(NULL, "mmc", &iter, 0, &bflow));
        ut_asserteq(2, iter.num_devs);
 
-       /* Now scan pass mmc1 and make sure that only mmc0 shows up */
+       /* Now scan past mmc1 and make sure that only mmc0 shows up */
+       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);
+
+       /* Try a single uclass with boot_targets */
+       ut_assertok(env_set("boot_targets", "mmc"));
+       ut_assertok(bootflow_scan_first(NULL, NULL, &iter, 0, &bflow));
+       ut_asserteq(2, iter.num_devs);
+
+       /* Now scan past mmc1 and make sure that only mmc0 shows up */
        ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
        ut_asserteq(3, iter.num_devs);
        ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
@@ -245,6 +258,21 @@ static int bootdev_test_order(struct unit_test_state *uts)
        ut_asserteq_str("mmc0.bootdev", iter.dev_used[2]->name);
        bootflow_iter_uninit(&iter);
 
+       /* Try a single uclass with boot_targets */
+       ut_assertok(env_set("boot_targets", "mmc usb"));
+       ut_assertok(bootflow_scan_first(NULL, NULL, &iter, 0, &bflow));
+       ut_asserteq(2, iter.num_devs);
+
+       /* Now scan past mmc1 and make sure that the 3 USB devices show up */
+       ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
+       ut_asserteq(6, 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);
+       ut_asserteq_str("usb_mass_storage.lun0.bootdev",
+                       iter.dev_used[3]->name);
+       bootflow_iter_uninit(&iter);
+
        return 0;
 }
 BOOTSTD_TEST(bootdev_test_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT);