From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH] startup: Fix do_autoboot_countdown() running multiple times
Date: Mon, 29 Jun 2020 10:37:43 +0200 [thread overview]
Message-ID: <fa8c9ed1-8cde-a015-86ee-10c86ff65bbf@pengutronix.de> (raw)
In-Reply-To: <20200626064129.12094-1-s.hauer@pengutronix.de>
Hi,
On 6/26/20 8:41 AM, Sascha Hauer wrote:
> The comment above do_autoboot_countdown() states: "This function can be
> called multiple times, it is executed only the first time.". Since
> 1973892533 ("startup: don't clobber original autoboot state") This is no
> longer the case. Bring back the old and documented behaviour.
guilty as charged. I didn't read the comment..
do_autoboot_countdown is called only once though in the code base.
How do you make use of being able to call it multiple times?
Cheers
Ahmad
>
> Fixes: 1973892533 ("startup: don't clobber original autoboot state")
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> common/startup.c | 5 ++++-
> include/common.h | 1 +
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/common/startup.c b/common/startup.c
> index 7e0f7d6b64..71a28a7be8 100644
> --- a/common/startup.c
> +++ b/common/startup.c
> @@ -235,7 +235,7 @@ void set_autoboot_state(enum autoboot_state autoboot)
> */
> enum autoboot_state do_autoboot_countdown(void)
> {
> - enum autoboot_state autoboot_state;
> + static enum autoboot_state autoboot_state = AUTOBOOT_UNKNOWN;
> unsigned flags = CONSOLE_COUNTDOWN_EXTERN;
> int ret;
> struct stat s;
> @@ -243,6 +243,9 @@ enum autoboot_state do_autoboot_countdown(void)
> char *abortkeys = NULL;
> unsigned char outkey;
>
> + if (autoboot_state != AUTOBOOT_UNKNOWN)
> + return autoboot_state;
> +
> if (global_autoboot_state != AUTOBOOT_COUNTDOWN)
> return global_autoboot_state;
>
> diff --git a/include/common.h b/include/common.h
> index ce16ff83af..ceb0b358bd 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -88,6 +88,7 @@ enum autoboot_state {
> AUTOBOOT_ABORT,
> AUTOBOOT_MENU,
> AUTOBOOT_BOOT,
> + AUTOBOOT_UNKNOWN,
> };
>
> void set_autoboot_state(enum autoboot_state autoboot);
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-06-29 8:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-26 6:41 Sascha Hauer
2020-06-29 8:37 ` Ahmad Fatoum [this message]
2020-07-01 5:26 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa8c9ed1-8cde-a015-86ee-10c86ff65bbf@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox