[PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[Sascha Hauer]

memorg->ntargets is initialized with '1'. It should be initialized with
the maxchips argument from nand_scan() instead. Otherwise multi chip
support errors out on the secondary chip selects when trying to call
nand_reset() on them:

WARNING: CPU: 0 PID: 1 at drivers/mtd/nand/raw/internals.h:114
nand_reset_op+0x194/0x1c4

With this memorg->ntargets is initialized with the maximum number of
chip selects supported by the driver. After having detected the number
of actually connected chips memory->ntargets is updated with that
number.

Fixes: 32813e288414 ("mtd: rawnand: Get rid of chip->numchips")
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

Changes since v1:

- initialize memorg->ntargets directly in nand_scan_ident() rather than
  passing it as argument to nand_detect()
- Fix Fixes: committish, leading '3' was missing

 drivers/mtd/nand/raw/nand_base.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 7db0f04cf52b..a8a7e81be710 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -4638,7 +4638,6 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
 	memorg = nanddev_get_memorg(&chip->base);
 	memorg->planes_per_lun = 1;
 	memorg->luns_per_target = 1;
-	memorg->ntargets = 1;
 
 	/*
 	 * Reset the chip, required by some chips (e.g. Micron MT29FxGxxxxx)
@@ -5003,6 +5002,8 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips,
 	if (ret)
 		return ret;
 
+	memorg->ntargets = maxchips;
+
 	/* Read the flash type */
 	ret = nand_detect(chip, table);
 	if (ret) {
-- 
2.20.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[Boris Brezillon]

On Tue, 21 May 2019 10:43:35 +0200
Sascha Hauer <s.hauer@pengutronix.de> wrote:

> memorg->ntargets is initialized with '1'. It should be initialized with
> the maxchips argument from nand_scan() instead. Otherwise multi chip
> support errors out on the secondary chip selects when trying to call
> nand_reset() on them:
> 
> WARNING: CPU: 0 PID: 1 at drivers/mtd/nand/raw/internals.h:114
> nand_reset_op+0x194/0x1c4
> 
> With this memorg->ntargets is initialized with the maximum number of
> chip selects supported by the driver. After having detected the number
> of actually connected chips memory->ntargets is updated with that
> number.
> 
> Fixes: 32813e288414 ("mtd: rawnand: Get rid of chip->numchips")
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>

And thanks for the fix.

Boris

> ---
> 
> Changes since v1:
> 
> - initialize memorg->ntargets directly in nand_scan_ident() rather than
>   passing it as argument to nand_detect()
> - Fix Fixes: committish, leading '3' was missing
> 
>  drivers/mtd/nand/raw/nand_base.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
> index 7db0f04cf52b..a8a7e81be710 100644
> --- a/drivers/mtd/nand/raw/nand_base.c
> +++ b/drivers/mtd/nand/raw/nand_base.c
> @@ -4638,7 +4638,6 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
>  	memorg = nanddev_get_memorg(&chip->base);
>  	memorg->planes_per_lun = 1;
>  	memorg->luns_per_target = 1;
> -	memorg->ntargets = 1;
>  
>  	/*
>  	 * Reset the chip, required by some chips (e.g. Micron MT29FxGxxxxx)
> @@ -5003,6 +5002,8 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips,
>  	if (ret)
>  		return ret;
>  
> +	memorg->ntargets = maxchips;
> +
>  	/* Read the flash type */
>  	ret = nand_detect(chip, table);
>  	if (ret) {


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[Miquel Raynal]

On Tue, 2019-05-21 at 08:43:35 UTC, Sascha Hauer wrote:
> memorg->ntargets is initialized with '1'. It should be initialized with
> the maxchips argument from nand_scan() instead. Otherwise multi chip
> support errors out on the secondary chip selects when trying to call
> nand_reset() on them:
> 
> WARNING: CPU: 0 PID: 1 at drivers/mtd/nand/raw/internals.h:114
> nand_reset_op+0x194/0x1c4
> 
> With this memorg->ntargets is initialized with the maximum number of
> chip selects supported by the driver. After having detected the number
> of actually connected chips memory->ntargets is updated with that
> number.
> 
> Fixes: 32813e288414 ("mtd: rawnand: Get rid of chip->numchips")
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[Boris Brezillon]

On Tue, 21 May 2019 11:04:17 +0200
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> On Tue, 2019-05-21 at 08:43:35 UTC, Sascha Hauer wrote:
> > memorg->ntargets is initialized with '1'. It should be initialized with
> > the maxchips argument from nand_scan() instead. Otherwise multi chip
> > support errors out on the secondary chip selects when trying to call
> > nand_reset() on them:
> > 
> > WARNING: CPU: 0 PID: 1 at drivers/mtd/nand/raw/internals.h:114
> > nand_reset_op+0x194/0x1c4
> > 
> > With this memorg->ntargets is initialized with the maximum number of
> > chip selects supported by the driver. After having detected the number
> > of actually connected chips memory->ntargets is updated with that
> > number.
> > 
> > Fixes: 32813e288414 ("mtd: rawnand: Get rid of chip->numchips")
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>  
> 
> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Are you sure it's mtd/next? I'd expect it to be queued in mtd/fixes not
mtd/next.

> 
> Miquel


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[Miquel Raynal]

Hi Boris,

Boris Brezillon <boris.brezillon@collabora.com> wrote on Tue, 21 May
2019 11:40:22 +0200:

> On Tue, 21 May 2019 11:04:17 +0200
> Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> 
> > On Tue, 2019-05-21 at 08:43:35 UTC, Sascha Hauer wrote:  
> > > memorg->ntargets is initialized with '1'. It should be initialized with
> > > the maxchips argument from nand_scan() instead. Otherwise multi chip
> > > support errors out on the secondary chip selects when trying to call
> > > nand_reset() on them:
> > > 
> > > WARNING: CPU: 0 PID: 1 at drivers/mtd/nand/raw/internals.h:114
> > > nand_reset_op+0x194/0x1c4
> > > 
> > > With this memorg->ntargets is initialized with the maximum number of
> > > chip selects supported by the driver. After having detected the number
> > > of actually connected chips memory->ntargets is updated with that
> > > number.
> > > 
> > > Fixes: 32813e288414 ("mtd: rawnand: Get rid of chip->numchips")
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>    
> > 
> > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.  
> 
> Are you sure it's mtd/next? I'd expect it to be queued in mtd/fixes not
> mtd/next.

Yes, I failed to checkout the right branch :)
I meant mtd/fixes, will move the patch.

Thanks,
Miquèl

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH v2] mtd: rawnand: initialize ntargets with maxchips

[Masahiro Yamada]

On Tue, May 21, 2019 at 6:48 PM Miquel Raynal <miquel.raynal@bootlin.com> wrote:
>
> Hi Boris,
>
> Boris Brezillon <boris.brezillon@collabora.com> wrote on Tue, 21 May
> 2019 11:40:22 +0200:
>
> > On Tue, 21 May 2019 11:04:17 +0200
> > Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> >
> > > On Tue, 2019-05-21 at 08:43:35 UTC, Sascha Hauer wrote:
> > > > memorg->ntargets is initialized with '1'. It should be initialized with
> > > > the maxchips argument from nand_scan() instead. Otherwise multi chip
> > > > support errors out on the secondary chip selects when trying to call
> > > > nand_reset() on them:
> > > >
> > > > WARNING: CPU: 0 PID: 1 at drivers/mtd/nand/raw/internals.h:114
> > > > nand_reset_op+0x194/0x1c4
> > > >
> > > > With this memorg->ntargets is initialized with the maximum number of
> > > > chip selects supported by the driver. After having detected the number
> > > > of actually connected chips memory->ntargets is updated with that
> > > > number.
> > > >
> > > > Fixes: 32813e288414 ("mtd: rawnand: Get rid of chip->numchips")
> > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> > >
> > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
> >
> > Are you sure it's mtd/next? I'd expect it to be queued in mtd/fixes not
> > mtd/next.
>
> Yes, I failed to checkout the right branch :)
> I meant mtd/fixes, will move the patch.
>

I was also suffering from this problem today,
then found this patch.


Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>



-- 
Best Regards
Masahiro Yamada

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/