boot: Add a flag for whether there are global bootmeths

The current 'doing_global' refers to being in the state of processing
global bootmeths. Since global bootmeths are currently used once at the
start, it becomes false once the last global bootmeth has been used.

In preparation for allowing bootmeths to run at other points in the
bootstd interation, add a new 'have_global' flag which tracks whether
there are any global bootmeths in the method_order[] list. It is set up
when iteration starts. Unlike doing_global which resets back to false
after the global bootmeths have been handled, once have_global is set to
true, it remains true for the entire iteration process. This provides a
quick check as to whether global-bootmeth processing is needed.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c
index bb2dd84..a0aa633 100644 (file)
--- a/boot/bootmeth-uclass.c
+++ b/boot/bootmeth-uclass.c
@@ -209,6 +209,7 @@ int bootmeth_setup_iter_order(struct bootflow_iter *iter, bool include_global)
            iter->first_glob_method != -1 && iter->first_glob_method != count) {
                iter->cur_method = iter->first_glob_method;
                iter->doing_global = true;
+               iter->have_global = true;
        }
        iter->method_order = order;
        iter->num_methods = count;

diff --git a/include/bootflow.h b/include/bootflow.h
index 2ef6eb2..b18baeb 100644 (file)
--- a/include/bootflow.h
+++ b/include/bootflow.h
@@ -255,6 +255,7 @@ enum bootflow_meth_flags_t {
  * @cur_prio: Current priority being scanned
  * @method_order: List of bootmeth devices to use, in order. The normal methods
  *     appear first, then the global ones, if any
+ * @have_global: true if we have global bootmeths in @method_order[]
  * @doing_global: true if we are iterating through the global bootmeths (which
  *     happens before the normal ones)
  * @method_flags: flags controlling which methods should be used for this @dev
@@ -278,6 +279,7 @@ struct bootflow_iter {
        int first_glob_method;
        enum bootdev_prio_t cur_prio;
        struct udevice **method_order;
+       bool have_global;
        bool doing_global;
        int method_flags;
 };

diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index 07bf239..83fb646 100644 (file)
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -308,6 +308,7 @@ static int bootflow_iter(struct unit_test_state *uts)
        ut_asserteq_str("extlinux", iter.method->name);
        ut_asserteq(0, bflow.err);
        ut_assert(!iter.doing_global);
+       ut_assert(!iter.have_global);
        ut_asserteq(-1, iter.first_glob_method);
 
        /*
@@ -405,6 +406,7 @@ static int bootflow_iter_glob(struct unit_test_state *uts)
                                        BOOTFLOWIF_SHOW, &bflow));
        ut_asserteq(3, iter.num_methods);
        ut_assert(iter.doing_global);
+       ut_assert(iter.have_global);
        ut_asserteq(2, iter.first_glob_method);
 
        ut_asserteq(2, iter.cur_method);
@@ -421,6 +423,7 @@ static int bootflow_iter_glob(struct unit_test_state *uts)
        ut_asserteq(2, iter.num_methods);
        ut_asserteq(2, iter.first_glob_method);
        ut_assert(!iter.doing_global);
+       ut_assert(iter.have_global);
 
        ut_asserteq(0, iter.cur_method);
        ut_asserteq(0, iter.part);
@@ -486,6 +489,7 @@ static int bootflow_iter_disable(struct unit_test_state *uts)
        /* at this point the global bootmeths are stranded above num_methods */
        ut_asserteq(3, iter.num_methods);
        ut_assert(!iter.doing_global);
+       ut_assert(iter.have_global);
        ut_asserteq(3, iter.first_glob_method);
        ut_asserteq_str("sandbox", iter.method->name);
        ut_assertok(inject_response(uts));