Re: [PATCH] gpiolib: fix: do not access oftree on non-OFDEVICE boards

[Sam Ravnborg <sam@ravnborg.org>]

On Tue, Jul 04, 2017 at 10:17:39PM +0200, Alexander Kurz wrote:
> Hi Lucas,
> 
> On Mon, 3 Jul 2017, Lucas Stach wrote:
> 
> > Am Sonntag, den 02.07.2017, 22:24 +0200 schrieb Alexander Kurz:
> > > Non-OFDEVICE boards may have OFTREE=y set, e.g. by BOOTM_OFTREE.
> > > Attempts to browse the oftree will crash barebox on those boards.
> > > 
> > > Signed-off-by: Alexander Kurz <akurz@blala.de>
> > > ---
> > >  drivers/gpio/gpiolib.c | 5 ++++-
> > >  1 file changed, 4 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> > > index a3e17ad..a1ff965 100644
> > > --- a/drivers/gpio/gpiolib.c
> > > +++ b/drivers/gpio/gpiolib.c
> > > @@ -416,7 +416,10 @@ int gpiochip_add(struct gpio_chip *chip)
> > >  	for (i = chip->base; i < chip->base + chip->ngpio; i++)
> > >  		gpio_desc[i].chip = chip;
> > >  
> > > -	return of_gpiochip_scan_hogs(chip);
> > > +	if (IS_ENABLED(CONFIG_OFDEVICE))
> > > +		return of_gpiochip_scan_hogs(chip);
> > > +	else
> > > +		return 0;
> > 
> > This may also crash in mixed oftree/board file based systems (however
> > unlikely that is). I think an early return from of_gpiochip_scan_hogs ()
> > if chip->dev->device_node is NULL would be more robust.
> IS_ENABLED(...) is evaluated at compile time.
> Checking CONFIG_OFDEVICE even before calling the OF-function gives the 
> compiler the chance to omit the integration of the unneeded function.
> A quick test on with kindle3_defconfig resulted in half a kilobyte
> image size difference.

I have incorporat this change in the fix I posted, and added your
Signed-off-by: as you posted this first and my change came on
top of yours.
Will post in a new thread.

	Sam

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox