* [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists()
@ 2018-08-29 7:21 Andrey Smirnov
2018-08-29 7:21 ` [PATCH 2/2] commands: barebox-update: Improve nonexistent handler reporting Andrey Smirnov
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrey Smirnov @ 2018-08-29 7:21 UTC (permalink / raw)
To: barebox; +Cc: Andrey Smirnov
Convert barebox_update_handler_exists() to treat struct bbu_data with
both "handler_name" and "devicefile" set to NULL as a specifier for
default update handler in order to support such use-case for
"barebox_update" and fix a recent regression.
This change shouldn't affect another user of
barebox_update_handler_exists(), cb_flash() in
drivers/usb/gadget/f_fastboot.c, since that function explicitly
specifies "devicefile".
Fixes 0ac96ab6e ("bbu: command: Make sure specified update handler exists")
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
common/bbu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/bbu.c b/common/bbu.c
index 3974bf672..ffe5e15a2 100644
--- a/common/bbu.c
+++ b/common/bbu.c
@@ -148,7 +148,7 @@ bool barebox_update_handler_exists(struct bbu_data *data)
if (handler)
return true;
- if (!data->handler_name)
+ if (!data->handler_name && data->devicefile)
return false;
return bbu_find_handler(data->handler_name) != NULL;
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] commands: barebox-update: Improve nonexistent handler reporting
2018-08-29 7:21 [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Andrey Smirnov
@ 2018-08-29 7:21 ` Andrey Smirnov
2018-08-29 7:58 ` [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Sascha Hauer
2018-09-04 6:35 ` Sascha Hauer
2 siblings, 0 replies; 6+ messages in thread
From: Andrey Smirnov @ 2018-08-29 7:21 UTC (permalink / raw)
To: barebox; +Cc: Andrey Smirnov
Convert code printing said error message to be more informative and
avoid printing <NULL> for handler name.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
commands/barebox-update.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/commands/barebox-update.c b/commands/barebox-update.c
index f76aa19a5..89aa9fddb 100644
--- a/commands/barebox-update.c
+++ b/commands/barebox-update.c
@@ -63,7 +63,15 @@ static int do_barebox_update(int argc, char *argv[])
}
if (!barebox_update_handler_exists(&data)) {
- printf("handler '%s' does not exist\n", data.handler_name);
+ if (data.handler_name)
+ printf("handler '%s' does not exist\n",
+ data.handler_name);
+ else if (data.devicefile)
+ printf("handler for '%s' does not exist\n",
+ data.devicefile);
+ else
+ printf("default handler does not exist\n");
+
print_handlers_list();
return COMMAND_ERROR;
}
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists()
2018-08-29 7:21 [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Andrey Smirnov
2018-08-29 7:21 ` [PATCH 2/2] commands: barebox-update: Improve nonexistent handler reporting Andrey Smirnov
@ 2018-08-29 7:58 ` Sascha Hauer
2018-08-31 5:23 ` Andrey Smirnov
2018-09-04 6:35 ` Sascha Hauer
2 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2018-08-29 7:58 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: barebox
On Wed, Aug 29, 2018 at 12:21:52AM -0700, Andrey Smirnov wrote:
> Convert barebox_update_handler_exists() to treat struct bbu_data with
> both "handler_name" and "devicefile" set to NULL as a specifier for
> default update handler in order to support such use-case for
> "barebox_update" and fix a recent regression.
>
> This change shouldn't affect another user of
> barebox_update_handler_exists(), cb_flash() in
> drivers/usb/gadget/f_fastboot.c, since that function explicitly
> specifies "devicefile".
>
> Fixes 0ac96ab6e ("bbu: command: Make sure specified update handler exists")
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> common/bbu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/bbu.c b/common/bbu.c
> index 3974bf672..ffe5e15a2 100644
> --- a/common/bbu.c
> +++ b/common/bbu.c
> @@ -148,7 +148,7 @@ bool barebox_update_handler_exists(struct bbu_data *data)
> if (handler)
> return true;
>
> - if (!data->handler_name)
> + if (!data->handler_name && data->devicefile)
> return false;
>
> return bbu_find_handler(data->handler_name) != NULL;
This function is confusing. We should split this up into two functions:
barebox_update_handler_exists_for_name() and
barebox_update_handler_exists_for_devpath() *). Fastboot would only need
the latter and the barebox_update command would use both, possibly
barking when both a name and a device is given (as otherwise we would
have to check for name <-> devpath conflicts)
Sascha
*) I'm open for better names ;)
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists()
2018-08-29 7:58 ` [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Sascha Hauer
@ 2018-08-31 5:23 ` Andrey Smirnov
2018-08-31 6:40 ` Sascha Hauer
0 siblings, 1 reply; 6+ messages in thread
From: Andrey Smirnov @ 2018-08-31 5:23 UTC (permalink / raw)
To: Sascha Hauer; +Cc: Barebox List
On Wed, Aug 29, 2018 at 12:58 AM Sascha Hauer <s.hauer@pengutronix.de> wrote:
>
> On Wed, Aug 29, 2018 at 12:21:52AM -0700, Andrey Smirnov wrote:
> > Convert barebox_update_handler_exists() to treat struct bbu_data with
> > both "handler_name" and "devicefile" set to NULL as a specifier for
> > default update handler in order to support such use-case for
> > "barebox_update" and fix a recent regression.
> >
> > This change shouldn't affect another user of
> > barebox_update_handler_exists(), cb_flash() in
> > drivers/usb/gadget/f_fastboot.c, since that function explicitly
> > specifies "devicefile".
> >
> > Fixes 0ac96ab6e ("bbu: command: Make sure specified update handler exists")
> >
> > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> > ---
> > common/bbu.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/common/bbu.c b/common/bbu.c
> > index 3974bf672..ffe5e15a2 100644
> > --- a/common/bbu.c
> > +++ b/common/bbu.c
> > @@ -148,7 +148,7 @@ bool barebox_update_handler_exists(struct bbu_data *data)
> > if (handler)
> > return true;
> >
> > - if (!data->handler_name)
> > + if (!data->handler_name && data->devicefile)
> > return false;
> >
> > return bbu_find_handler(data->handler_name) != NULL;
>
> This function is confusing. We should split this up into two functions:
> barebox_update_handler_exists_for_name() and
> barebox_update_handler_exists_for_devpath() *). Fastboot would only need
> the latter and the barebox_update command would use both, possibly
> barking when both a name and a device is given (as otherwise we would
> have to check for name <-> devpath conflicts)
>
What if we just expose already existing bbu_find_handler (potentially
renaming it to bbu_find_handler_by_name()) and
bbu_find_handler_by_device() instead and use them as you propose?
Thanks,
Andrey Smirnov
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists()
2018-08-31 5:23 ` Andrey Smirnov
@ 2018-08-31 6:40 ` Sascha Hauer
0 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2018-08-31 6:40 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: Barebox List
On Thu, Aug 30, 2018 at 10:23:12PM -0700, Andrey Smirnov wrote:
> On Wed, Aug 29, 2018 at 12:58 AM Sascha Hauer <s.hauer@pengutronix.de> wrote:
> >
> > On Wed, Aug 29, 2018 at 12:21:52AM -0700, Andrey Smirnov wrote:
> > > Convert barebox_update_handler_exists() to treat struct bbu_data with
> > > both "handler_name" and "devicefile" set to NULL as a specifier for
> > > default update handler in order to support such use-case for
> > > "barebox_update" and fix a recent regression.
> > >
> > > This change shouldn't affect another user of
> > > barebox_update_handler_exists(), cb_flash() in
> > > drivers/usb/gadget/f_fastboot.c, since that function explicitly
> > > specifies "devicefile".
> > >
> > > Fixes 0ac96ab6e ("bbu: command: Make sure specified update handler exists")
> > >
> > > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> > > ---
> > > common/bbu.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/common/bbu.c b/common/bbu.c
> > > index 3974bf672..ffe5e15a2 100644
> > > --- a/common/bbu.c
> > > +++ b/common/bbu.c
> > > @@ -148,7 +148,7 @@ bool barebox_update_handler_exists(struct bbu_data *data)
> > > if (handler)
> > > return true;
> > >
> > > - if (!data->handler_name)
> > > + if (!data->handler_name && data->devicefile)
> > > return false;
> > >
> > > return bbu_find_handler(data->handler_name) != NULL;
> >
> > This function is confusing. We should split this up into two functions:
> > barebox_update_handler_exists_for_name() and
> > barebox_update_handler_exists_for_devpath() *). Fastboot would only need
> > the latter and the barebox_update command would use both, possibly
> > barking when both a name and a device is given (as otherwise we would
> > have to check for name <-> devpath conflicts)
> >
>
> What if we just expose already existing bbu_find_handler (potentially
> renaming it to bbu_find_handler_by_name()) and
> bbu_find_handler_by_device() instead and use them as you propose?
That would be fine also.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists()
2018-08-29 7:21 [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Andrey Smirnov
2018-08-29 7:21 ` [PATCH 2/2] commands: barebox-update: Improve nonexistent handler reporting Andrey Smirnov
2018-08-29 7:58 ` [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Sascha Hauer
@ 2018-09-04 6:35 ` Sascha Hauer
2 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2018-09-04 6:35 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: barebox
On Wed, Aug 29, 2018 at 12:21:52AM -0700, Andrey Smirnov wrote:
> Convert barebox_update_handler_exists() to treat struct bbu_data with
> both "handler_name" and "devicefile" set to NULL as a specifier for
> default update handler in order to support such use-case for
> "barebox_update" and fix a recent regression.
>
> This change shouldn't affect another user of
> barebox_update_handler_exists(), cb_flash() in
> drivers/usb/gadget/f_fastboot.c, since that function explicitly
> specifies "devicefile".
>
> Fixes 0ac96ab6e ("bbu: command: Make sure specified update handler exists")
I dropped 0ac96ab6e for now, so you are free to implement a proper
solution on top of current next branch.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-04 6:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-29 7:21 [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Andrey Smirnov
2018-08-29 7:21 ` [PATCH 2/2] commands: barebox-update: Improve nonexistent handler reporting Andrey Smirnov
2018-08-29 7:58 ` [PATCH 1/2] bbu: Look for default handler in barebox_update_handler_exists() Sascha Hauer
2018-08-31 5:23 ` Andrey Smirnov
2018-08-31 6:40 ` Sascha Hauer
2018-09-04 6:35 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox