linux-kernel - Re: [PATCH v4 27/35] mtd: rawnand: sm_common: convert driver to nand_scan_with

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 27 Jul 2018 01:13:46 +0200
From:   Miquel Raynal <miquel.raynal@...tlin.com>
To:     Boris Brezillon <boris.brezillon@...tlin.com>
Cc:     Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Mans Rullgard <mans@...sr.com>,
        Maxime Ripard <maxime.ripard@...tlin.com>,
        Stefan Agner <stefan@...er.ch>, linux-kernel@...r.kernel.org,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        linux-mtd@...ts.infradead.org, Kamal Dasu <kdasu.kdev@...il.com>,
        Josh Wu <rainyfeeling@...look.com>,
        Marc Gonzalez <marc.w.gonzalez@...e.fr>,
        Marek Vasut <marek.vasut@...il.com>,
        Chen-Yu Tsai <wens@...e.org>,
        bcm-kernel-feedback-list@...adcom.com,
        Sylvain Lemieux <slemieux.tyco@...il.com>,
        Wenyou Yang <wenyou.yang@...rochip.com>,
        Tudor Ambarus <Tudor.Ambarus@...rochip.com>,
        Vladimir Zapolskiy <vz@...ia.com>,
        Harvey Hunt <harveyhuntnexus@...il.com>,
        linux-mediatek@...ts.infradead.org,
        Matthias Brugger <matthias.bgg@...il.com>,
        Han Xu <han.xu@....com>, Xiaolei Li <xiaolei.li@...iatek.com>,
        linux-arm-kernel@...ts.infradead.org,
        Nicolas Ferre <nicolas.ferre@...rochip.com>,
        Richard Weinberger <richard@....at>,
        Brian Norris <computersforpeace@...il.com>,
        David Woodhouse <dwmw2@...radead.org>
Subject: Re: [PATCH v4 27/35] mtd: rawnand: sm_common: convert driver to
 nand_scan_with_ids()

Hi Boris,

Boris Brezillon <boris.brezillon@...tlin.com> wrote on Thu, 26 Jul 2018
21:06:55 +0200:

> On Sun, 22 Jul 2018 08:44:32 +0200
> Boris Brezillon <boris.brezillon@...tlin.com> wrote:
> 
> > On Fri, 20 Jul 2018 17:15:19 +0200
> > Miquel Raynal <miquel.raynal@...tlin.com> wrote:
> >   
> > > Two helpers have been added to the core to make ECC-related
> > > configuration between the detection phase and the final NAND scan. Use
> > > these hooks and convert the driver to just use nand_scan_with_ids()
> > > (alternative to nand_scan() for passing a flash IDs table) instead of
> > > both nand_scan_ident() and nand_scan_tail().
> > > 
> > > Signed-off-by: Miquel Raynal <miquel.raynal@...tlin.com>    
> > 
> > Reviewed-by: Boris Brezillon <boris.brezillon@...tlin.com>
> >   
> > > ---
> > >  drivers/mtd/nand/raw/sm_common.c | 39 +++++++++++++++++++++++++--------------
> > >  1 file changed, 25 insertions(+), 14 deletions(-)
> > > 
> > > diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c
> > > index 7f5044a79f01..d05e3f976a5e 100644
> > > --- a/drivers/mtd/nand/raw/sm_common.c
> > > +++ b/drivers/mtd/nand/raw/sm_common.c
> > > @@ -160,19 +160,9 @@ static struct nand_flash_dev nand_xd_flash_ids[] = {
> > >  	{NULL}
> > >  };
> > >  
> > > -int sm_register_device(struct mtd_info *mtd, int smartmedia)
> > > +static int sm_attach_chip(struct nand_chip *chip)
> > >  {
> > > -	struct nand_chip *chip = mtd_to_nand(mtd);
> > > -	int ret;
> > > -
> > > -	chip->options |= NAND_SKIP_BBTSCAN;
> > > -
> > > -	/* Scan for card properties */
> > > -	ret = nand_scan_ident(mtd, 1, smartmedia ?
> > > -		nand_smartmedia_flash_ids : nand_xd_flash_ids);
> > > -
> > > -	if (ret)
> > > -		return ret;
> > > +	struct mtd_info *mtd = nand_to_mtd(chip);
> > >  
> > >  	/* Bad block marker position */
> > >  	chip->badblockpos = 0x05;
> > > @@ -187,12 +177,33 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia)
> > >  	else
> > >  		return -ENODEV;
> > >  
> > > -	ret = nand_scan_tail(mtd);
> > > +	return 0;
> > > +}
> > >  
> > > +static const struct nand_controller_ops sm_controller_ops = {
> > > +	.attach_chip = sm_attach_chip,
> > > +};
> > > +
> > > +int sm_register_device(struct mtd_info *mtd, int smartmedia)
> > > +{
> > > +	struct nand_chip *chip = mtd_to_nand(mtd);
> > > +	struct nand_flash_dev *flash_ids;
> > > +	int ret;
> > > +
> > > +	chip->options |= NAND_SKIP_BBTSCAN;
> > > +
> > > +	/* Scan for card properties */
> > > +	chip->dummy_controller.ops = &sm_controller_ops;
> > > +	flash_ids = smartmedia ? nand_smartmedia_flash_ids : nand_xd_flash_ids;
> > > +	ret = nand_scan_with_ids(mtd, 1, flash_ids);
> > >  	if (ret)
> > >  		return ret;
> > >  
> > > -	return mtd_device_register(mtd, NULL, 0);
> > > +	ret = mtd_device_register(mtd, NULL, 0);
> > > +	if (ret)
> > > +		nand_release(mtd);  
> 
> Didn't notice that while reviewing, but it would have been better to
> use nand_cleanup() and do this change separately.

Indeed, will fix it.

Miquèl