mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marco Felsch <m.felsch@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: "open list:BAREBOX" <barebox@lists.infradead.org>
Subject: Re: [PATCH 04/13] ARM: k3: r5: add proper error handling
Date: Tue, 11 Mar 2025 09:50:19 +0100	[thread overview]
Message-ID: <20250311085019.rfmfsckfwwxh5hxn@pengutronix.de> (raw)
In-Reply-To: <Z8_zIC2f7n3-_sVn@pengutronix.de>

On 25-03-11, Sascha Hauer wrote:
> On Mon, Mar 10, 2025 at 07:52:17PM +0100, Marco Felsch wrote:
> > On 25-02-28, Sascha Hauer wrote:
> > > Add missing error handling in the image loading code. Properly check for
> > > errors and panic when mandatory binaries are missing instead of blindly
> > > continuing.
> > > 
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > ---
> > >  arch/arm/mach-k3/r5.c | 57 ++++++++++++++++++++++++++++-----------------------
> > >  1 file changed, 31 insertions(+), 26 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-k3/r5.c b/arch/arm/mach-k3/r5.c
> > > index 2418e9ae73..e12c888afa 100644
> > > --- a/arch/arm/mach-k3/r5.c
> > > +++ b/arch/arm/mach-k3/r5.c
> > > @@ -283,7 +283,7 @@ static int load_fip(const char *filename, off_t offset)
> > >  	return 0;
> > >  }
> > >  
> > > -static void do_dfu(void)
> > > +static int do_dfu(void)
> > >  {
> > >  	struct usbgadget_funcs funcs = {};
> > >  	int ret;
> > > @@ -293,37 +293,24 @@ static void do_dfu(void)
> > >  	funcs.dfu_opts = "/fip.img(fip)cs";
> > >  
> > >  	ret = usbgadget_prepare_register(&funcs);
> > > -	if (ret)
> > > -		goto err;
> > > +	if (ret) {
> > > +		pr_err("DFU failed with: %pe\n", ERR_PTR(ret));
> > > +		return ret;
> > > +	}
> > >  
> > >  	while (1) {
> > >  		ret = stat("/fip.img", &s);
> > >  		if (!ret) {
> > >  			printf("Downloaded FIP image, DFU done\n");
> > > -			load_fip("/fip.img", 0);
> > > -			break;
> > > +			ret = load_fip("/fip.img", 0);
> > > +			if (!ret)
> > > +				return 0;
> > >  		}
> > >  
> > >  		command_slice_release();
> > >  		mdelay(50);
> > >  		command_slice_acquire();
> > >  	};
> > > -
> > > -	return;
> > > -
> > > -err:
> > > -	pr_err("DFU failed with: %pe\n", ERR_PTR(ret));
> > > -}
> > > -
> > > -static int load_images(void)
> > > -{
> > > -	int err;
> > > -
> > > -	err = load_fip("/boot/k3.fip", 0);
> > > -	if (!err)
> > > -		return 0;
> > > -
> > > -	return 0;
> > >  }
> > 
> > Removing load_images should go into patch-3.
> 
> I deliberately did it in this patch because load_images already does
> error checking, but up to now the return value of load_images() wasn't
> checked. By doing it like you suggest I would either end up calling
> load_fip() without checking the error, or I would introduce an
> incomplete error checking in k3_r5_start_image() where the return value
> of load_fip() is checked, but not the return values of do_dfu and
> load_fip_emmc().

Ah okay, good point. In that case I'm fine with it.

Regards,
  Marco


> 
> > >  static int load_fip_emmc(void)
> > > @@ -332,6 +319,7 @@ static int load_fip_emmc(void)
> > >  	struct mci *mci;
> > >  	char *fname;
> > >  	const char *mmcdev = "mmc0";
> > > +	int ret;
> > 
> > Nit: Sometimes you do use ret, sometimes err. I would like to align it
> > if possible.
> 
> Changed to 'ret' consistently.
> 
> Sascha
> 
> -- 
> 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 |
> 



  reply	other threads:[~2025-03-11  8:51 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-28  7:16 [PATCH 00/13] am625: support secure loading of full barebox Sascha Hauer
2025-02-28  7:16 ` [PATCH 01/13] firmware: always generate sha256sum Sascha Hauer
2025-02-28  7:16 ` [PATCH 02/13] firmware: add function to verify next image Sascha Hauer
2025-03-10 18:37   ` Marco Felsch
2025-03-11  7:35     ` Sascha Hauer
2025-02-28  7:16 ` [PATCH 03/13] ARM: k3: r5: drop loading of separate binaries Sascha Hauer
2025-03-10 18:44   ` Marco Felsch
2025-02-28  7:16 ` [PATCH 04/13] ARM: k3: r5: add proper error handling Sascha Hauer
2025-03-10 18:52   ` Marco Felsch
2025-03-11  8:24     ` Sascha Hauer
2025-03-11  8:50       ` Marco Felsch [this message]
2025-02-28  7:16 ` [PATCH 05/13] fip: rework fip_image_open() Sascha Hauer
2025-02-28  7:16 ` [PATCH 06/13] fip: fix wrong function call Sascha Hauer
2025-02-28  7:16 ` [PATCH 07/13] fip: add function to calculate a sha256 over FIP image Sascha Hauer
2025-02-28  7:16 ` [PATCH 08/13] ARM: am625: support hash verification of full barebox Sascha Hauer
2025-03-10 19:22   ` Marco Felsch
2025-03-11  7:53     ` Sascha Hauer
2025-02-28  7:16 ` [PATCH 09/13] ARM: k3: add support for authenticating images against the ROM API Sascha Hauer
2025-02-28  7:16 ` [PATCH 10/13] ARM: k3: r5: delete fip image when it can't be opened Sascha Hauer
2025-02-28  7:16 ` [PATCH 11/13] ARM: k3: r5: Allow to authenticate next image by ROM API Sascha Hauer
2025-03-10 19:26   ` Marco Felsch
2025-03-11  7:54     ` Sascha Hauer
2025-02-28  7:17 ` [PATCH 12/13] scripts/k3img: remove temporary files Sascha Hauer
2025-02-28  7:17 ` [PATCH 13/13] scripts: add k3sign Sascha Hauer
2025-03-10 17:40 ` [PATCH 00/13] am625: support secure loading of full barebox Marco Felsch
2025-03-11  8:12   ` Sascha Hauer
2025-03-11  8:48     ` Marco Felsch
2025-03-11  9:13       ` 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=20250311085019.rfmfsckfwwxh5hxn@pengutronix.de \
    --to=m.felsch@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