[PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[Tokunori Ikegami]

For the word write it is checked if the chip has the correct value.
But it is not checked for the write buffer as only checked if ready.
To make sure for the write buffer change to check the value.

It is enough as this patch is only checking the last written word.
Since it is described by data sheets to check the operation status.

Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Cc: linux-mtd@lists.infradead.org
Cc: stable@vger.kernel.org
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 692902df2598..9ab521d25ea2 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1880,7 +1880,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 		if (time_after(jiffies, timeo) && !chip_ready(map, adr))
 			break;
 
-		if (chip_ready(map, adr)) {
+		if (chip_good(map, adr, datum)) {
 			xip_enable(map, chip, adr);
 			goto op_done;
 		}
-- 
2.16.1

Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[Greg Kroah-Hartman]

On Mon, Jul 02, 2018 at 11:50:42AM +0900, Tokunori Ikegami wrote:
> For the word write it is checked if the chip has the correct value.
> But it is not checked for the write buffer as only checked if ready.
> To make sure for the write buffer change to check the value.
> 
> It is enough as this patch is only checking the last written word.
> Since it is described by data sheets to check the operation status.
> 
> Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
> Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Cc: Brian Norris <computersforpeace@gmail.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
> Cc: linux-mtd@lists.infradead.org
> Cc: stable@vger.kernel.org
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
>  drivers/mtd/chips/cfi_cmdset_0002.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

What are the git commit ids for all of these patches, and what stable
tree do they need to go to?

thanks,

greg k-h

RE: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[IKEGAMI Tokunori]

Hi Greg-san,

The commit IDs on mainline are below.

  1. dfeae1073583 mtd: cfi_cmdset_0002: Change write buffer to check correct value
  2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming to retry write operation
  3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions to retry for error
  4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions to check chip good only

Note:
  The patches just sent today as revised are only existing with commit IDs on my local environment.
  Also the patches are existing on the Linux MTD development patchwork as below but the commit IDs are not assigned.
    <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133>

  If those revised patches should be applied anywhere to have commit IDs at first please let me know.
  Probably it should be consulted with the MTD maintainer Boris-san.

Regards,
Ikegami

> -----Original Message-----
> From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> Sent: Monday, July 02, 2018 3:19 PM
> To: IKEGAMI Tokunori
> Cc: PACKHAM Chris; Brian Norris; David Woodhouse; Boris Brezillon; Marek
> Vasut; Richard Weinberger; Cyrille Pitchen;
> linux-mtd@lists.infradead.org; stable@vger.kernel.org; Boris
> Brezillon
> Subject: Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to
> check correct value
> 
> On Mon, Jul 02, 2018 at 11:50:42AM +0900, Tokunori Ikegami wrote:
> > For the word write it is checked if the chip has the correct value.
> > But it is not checked for the write buffer as only checked if ready.
> > To make sure for the write buffer change to check the value.
> >
> > It is enough as this patch is only checking the last written word.
> > Since it is described by data sheets to check the operation status.
> >
> > Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
> > Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> > Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
> > Cc: Brian Norris <computersforpeace@gmail.com>
> > Cc: David Woodhouse <dwmw2@infradead.org>
> > Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> > Cc: Marek Vasut <marek.vasut@gmail.com>
> > Cc: Richard Weinberger <richard@nod.at>
> > Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
> > Cc: linux-mtd@lists.infradead.org
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> > ---
> >  drivers/mtd/chips/cfi_cmdset_0002.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> What are the git commit ids for all of these patches, and what stable
> tree do they need to go to?
> 
> thanks,
> 
> greg k-h

Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[Greg Kroah-Hartman]

On Mon, Jul 02, 2018 at 07:16:47AM +0000, IKEGAMI Tokunori wrote:
> Hi Greg-san,
> 
> The commit IDs on mainline are below.
> 
>   1. dfeae1073583 mtd: cfi_cmdset_0002: Change write buffer to check correct value
>   2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming to retry write operation
>   3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions to retry for error
>   4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions to check chip good only
> 
> Note:
>   The patches just sent today as revised are only existing with commit IDs on my local environment.
>   Also the patches are existing on the Linux MTD development patchwork as below but the commit IDs are not assigned.
>     <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133>
> 
>   If those revised patches should be applied anywhere to have commit IDs at first please let me know.
>   Probably it should be consulted with the MTD maintainer Boris-san.

And what stable tree(s) do you want to see these applied to?

thanks,

greg k-h

RE: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[IKEGAMI Tokunori]

The 1 patch below has been added to review into the following 5 trees.

  Patch: 1. dfeae1073583 mtd: cfi_cmdset_0002: Change write buffer to check correct value

  Tree: 1. 3.18-stable
        2. 4.4-stable
        3. 4.9-stable
        4. 4.14-stable
        5. 4.17-stable

So please applied the remaining 3 patches below as same.

  Patch: 2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming to retry write operation
         3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions to retry for error
         4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions to check chip good only

  Note: The commit IDs are on mainline so there are not existed for revised version patches.

> -----Original Message-----
> From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> Sent: Monday, July 02, 2018 4:23 PM
> To: IKEGAMI Tokunori
> Cc: PACKHAM Chris; Brian Norris; David Woodhouse; Boris Brezillon; Marek
> Vasut; Richard Weinberger; Cyrille Pitchen;
> linux-mtd@lists.infradead.org; stable@vger.kernel.org; Boris
> Brezillon
> Subject: Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to
> check correct value
> 
> On Mon, Jul 02, 2018 at 07:16:47AM +0000, IKEGAMI Tokunori wrote:
> > Hi Greg-san,
> >
> > The commit IDs on mainline are below.
> >
> >   1. dfeae1073583 mtd: cfi_cmdset_0002: Change write buffer to check
> correct value
> >   2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming to
> retry write operation
> >   3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions to
> retry for error
> >   4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions to
> check chip good only
> >
> > Note:
> >   The patches just sent today as revised are only existing with commit
> IDs on my local environment.
> >   Also the patches are existing on the Linux MTD development patchwork
> as below but the commit IDs are not assigned.
> >
> <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133>
> >
> >   If those revised patches should be applied anywhere to have commit
> IDs at first please let me know.
> >   Probably it should be consulted with the MTD maintainer Boris-san.
> 
> And what stable tree(s) do you want to see these applied to?
> 
> thanks,
> 
> greg k-h

RE: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[IKEGAMI Tokunori]

Hi Greg-san,

Let me confirm below.
About the patches 2, 3 and 4 below still should I prepare the commit IDs for revised version?
Or those can be added to the stable trees next time without commit IDs?

>   Patch: 2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming
> to retry write operation
>          3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions
> to retry for error
>          4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions
> to check chip good only
> 
>   Note: The commit IDs are on mainline so there are not existed for
> revised version patches.

I think that the patches revised version are still existing on the linux-mtd Patchwork without commit IDs.
  <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133&state=*>

Sorry for this confirmation but I am not sure how to resolve this to apply these revised version patches to stable trees.

Regards,
Ikegami

> -----Original Message-----
> From: IKEGAMI Tokunori
> Sent: Monday, July 02, 2018 4:34 PM
> To: 'Greg Kroah-Hartman'
> Cc: PACKHAM Chris; Brian Norris; David Woodhouse; Boris Brezillon; Marek
> Vasut; Richard Weinberger; Cyrille Pitchen;
> linux-mtd@lists.infradead.org; stable@vger.kernel.org; Boris
> Brezillon
> Subject: RE: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to
> check correct value
> 
> The 1 patch below has been added to review into the following 5 trees.
> 
>   Patch: 1. dfeae1073583 mtd: cfi_cmdset_0002: Change write buffer to
> check correct value
> 
>   Tree: 1. 3.18-stable
>         2. 4.4-stable
>         3. 4.9-stable
>         4. 4.14-stable
>         5. 4.17-stable
> 
> So please applied the remaining 3 patches below as same.
> 
>   Patch: 2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming
> to retry write operation
>          3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions
> to retry for error
>          4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions
> to check chip good only
> 
>   Note: The commit IDs are on mainline so there are not existed for
> revised version patches.
> 
> > -----Original Message-----
> > From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> > Sent: Monday, July 02, 2018 4:23 PM
> > To: IKEGAMI Tokunori
> > Cc: PACKHAM Chris; Brian Norris; David Woodhouse; Boris Brezillon;
> Marek
> > Vasut; Richard Weinberger; Cyrille Pitchen;
> > linux-mtd@lists.infradead.org; stable@vger.kernel.org; Boris
> > Brezillon
> > Subject: Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to
> > check correct value
> >
> > On Mon, Jul 02, 2018 at 07:16:47AM +0000, IKEGAMI Tokunori wrote:
> > > Hi Greg-san,
> > >
> > > The commit IDs on mainline are below.
> > >
> > >   1. dfeae1073583 mtd: cfi_cmdset_0002: Change write buffer to check
> > correct value
> > >   2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming to
> > retry write operation
> > >   3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions to
> > retry for error
> > >   4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions to
> > check chip good only
> > >
> > > Note:
> > >   The patches just sent today as revised are only existing with commit
> > IDs on my local environment.
> > >   Also the patches are existing on the Linux MTD development
> patchwork
> > as below but the commit IDs are not assigned.
> > >
> >
> <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133>
> > >
> > >   If those revised patches should be applied anywhere to have commit
> > IDs at first please let me know.
> > >   Probably it should be consulted with the MTD maintainer Boris-san.
> >
> > And what stable tree(s) do you want to see these applied to?
> >
> > thanks,
> >
> > greg k-h

Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[Greg Kroah-Hartman]

On Fri, Jul 06, 2018 at 10:11:39AM +0000, IKEGAMI Tokunori wrote:
> Hi Greg-san,
> 
> Let me confirm below.
> About the patches 2, 3 and 4 below still should I prepare the commit IDs for revised version?
> Or those can be added to the stable trees next time without commit IDs?
> 
> >   Patch: 2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming
> > to retry write operation
> >          3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions
> > to retry for error
> >          4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions
> > to check chip good only
> > 
> >   Note: The commit IDs are on mainline so there are not existed for
> > revised version patches.
> 
> I think that the patches revised version are still existing on the linux-mtd Patchwork without commit IDs.
>   <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133&state=*>
> 
> Sorry for this confirmation but I am not sure how to resolve this to apply these revised version patches to stable trees.

Ok, I think I have it figured out now.  Look at what I have queued up to
the stable queues to verify I got it correct.

thanks,

greg k-h

RE: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check correct value

[IKEGAMI Tokunori]

Hi Greg-san,

Thank you so much for the mail.
I have just confirmed that the queued patches are correct.

Regards,
Ikegami

> -----Original Message-----
> From: stable-owner@vger.kernel.org [mailto:stable-owner@vger.kernel.org] On
> Behalf Of Greg Kroah-Hartman
> Sent: Tuesday, July 10, 2018 11:46 PM
> To: IKEGAMI Tokunori
> Cc: PACKHAM Chris; Brian Norris; David Woodhouse; Boris Brezillon; Marek
> Vasut; Richard Weinberger; Cyrille Pitchen; linux-mtd@lists.infradead.org;
> stable@vger.kernel.org; Boris Brezillon
> Subject: Re: [PATCH 1/4] mtd: cfi_cmdset_0002: Change write buffer to check
> correct value
> 
> On Fri, Jul 06, 2018 at 10:11:39AM +0000, IKEGAMI Tokunori wrote:
> > Hi Greg-san,
> >
> > Let me confirm below.
> > About the patches 2, 3 and 4 below still should I prepare the commit IDs
> for revised version?
> > Or those can be added to the stable trees next time without commit IDs?
> >
> > >   Patch: 2. 85a82e28b023 mtd: cfi_cmdset_0002: Change definition naming
> > > to retry write operation
> > >          3. 45f75b8a919a mtd: cfi_cmdset_0002: Change erase functions
> > > to retry for error
> > >          4. 79ca484b6130 mtd: cfi_cmdset_0002: Change erase functions
> > > to check chip good only
> > >
> > >   Note: The commit IDs are on mainline so there are not existed for
> > > revised version patches.
> >
> > I think that the patches revised version are still existing on the linux-mtd
> Patchwork without commit IDs.
> >
> <https://patchwork.ozlabs.org/project/linux-mtd/list/?series=53133&state=
> *>
> >
> > Sorry for this confirmation but I am not sure how to resolve this to apply
> these revised version patches to stable trees.
> 
> Ok, I think I have it figured out now.  Look at what I have queued up to
> the stable queues to verify I got it correct.
> 
> thanks,
> 
> greg k-h

[PATCH 2/4] mtd: cfi_cmdset_0002: Change definition naming to retry write operation

[Tokunori Ikegami]

The definition can be used for other program and erase operations also.
So change the naming to MAX_RETRIES from MAX_WORD_RETRIES.

Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Cc: linux-mtd@lists.infradead.org
Cc: stable@vger.kernel.org
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 9ab521d25ea2..29913eeac5fb 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -42,7 +42,7 @@
 #define AMD_BOOTLOC_BUG
 #define FORCE_WORD_WRITE 0
 
-#define MAX_WORD_RETRIES 3
+#define MAX_RETRIES 3
 
 #define SST49LF004B	        0x0060
 #define SST49LF040B	        0x0050
@@ -1647,7 +1647,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
 		map_write( map, CMD(0xF0), chip->start );
 		/* FIXME - should have reset delay before continuing */
 
-		if (++retry_cnt <= MAX_WORD_RETRIES)
+		if (++retry_cnt <= MAX_RETRIES)
 			goto retry;
 
 		ret = -EIO;
@@ -2106,7 +2106,7 @@ static int do_panic_write_oneword(struct map_info *map, struct flchip *chip,
 		map_write(map, CMD(0xF0), chip->start);
 		/* FIXME - should have reset delay before continuing */
 
-		if (++retry_cnt <= MAX_WORD_RETRIES)
+		if (++retry_cnt <= MAX_RETRIES)
 			goto retry;
 
 		ret = -EIO;
-- 
2.16.1

[PATCH 3/4] mtd: cfi_cmdset_0002: Change erase functions to retry for error

[Tokunori Ikegami]

For the word write functions it is retried for error.
But it is not implemented to retry for the erase functions.
To make sure for the erase functions change to retry as same.

This is needed to prevent the flash erase error caused only once.
It was caused by the error case of chip_good() in the do_erase_oneblock().
Also it was confirmed on the MACRONIX flash device MX29GL512FHT2I-11G.
But the error issue behavior is not able to reproduce at this moment.
The flash controller is parallel Flash interface integrated on BCM53003.

Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Cc: linux-mtd@lists.infradead.org
Cc: stable@vger.kernel.org
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 29913eeac5fb..13ce64362db8 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -2241,6 +2241,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
 	unsigned long int adr;
 	DECLARE_WAITQUEUE(wait, current);
 	int ret = 0;
+	int retry_cnt = 0;
 
 	adr = cfi->addr_unlock1;
 
@@ -2258,6 +2259,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
 	ENABLE_VPP(map);
 	xip_disable(map, chip, adr);
 
+ retry:
 	cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
 	cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
 	cfi_send_gen_cmd(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -2312,6 +2314,9 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
 		map_write( map, CMD(0xF0), chip->start );
 		/* FIXME - should have reset delay before continuing */
 
+		if (++retry_cnt <= MAX_RETRIES)
+			goto retry;
+
 		ret = -EIO;
 	}
 
@@ -2331,6 +2336,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
 	unsigned long timeo = jiffies + HZ;
 	DECLARE_WAITQUEUE(wait, current);
 	int ret = 0;
+	int retry_cnt = 0;
 
 	adr += chip->start;
 
@@ -2348,6 +2354,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
 	ENABLE_VPP(map);
 	xip_disable(map, chip, adr);
 
+ retry:
 	cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
 	cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
 	cfi_send_gen_cmd(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
@@ -2405,6 +2412,9 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
 		map_write( map, CMD(0xF0), chip->start );
 		/* FIXME - should have reset delay before continuing */
 
+		if (++retry_cnt <= MAX_RETRIES)
+			goto retry;
+
 		ret = -EIO;
 	}
 
-- 
2.16.1

[PATCH 4/4] mtd: cfi_cmdset_0002: Change erase functions to check chip good only

[Tokunori Ikegami]

Currently the functions use to check both chip ready and good.
But the chip ready is not enough to check the operation status.
So change this to check the chip good instead of this.
About the retry functions to make sure the error handling remain it.

Signed-off-by: Tokunori Ikegami <ikegami@allied-telesis.co.jp>
Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Cc: linux-mtd@lists.infradead.org
Cc: stable@vger.kernel.org
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 13ce64362db8..2a39dc3a4760 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -2296,12 +2296,13 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
 			chip->erase_suspended = 0;
 		}
 
-		if (chip_ready(map, adr))
+		if (chip_good(map, adr, map_word_ff(map)))
 			break;
 
 		if (time_after(jiffies, timeo)) {
 			printk(KERN_WARNING "MTD %s(): software timeout\n",
 				__func__ );
+			ret = -EIO;
 			break;
 		}
 
@@ -2309,15 +2310,15 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip)
 		UDELAY(map, chip, adr, 1000000/HZ);
 	}
 	/* Did we succeed? */
-	if (!chip_good(map, adr, map_word_ff(map))) {
+	if (ret) {
 		/* reset on all failures. */
 		map_write( map, CMD(0xF0), chip->start );
 		/* FIXME - should have reset delay before continuing */
 
-		if (++retry_cnt <= MAX_RETRIES)
+		if (++retry_cnt <= MAX_RETRIES) {
+			ret = 0;
 			goto retry;
-
-		ret = -EIO;
+		}
 	}
 
 	chip->state = FL_READY;
@@ -2391,7 +2392,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
 			chip->erase_suspended = 0;
 		}
 
-		if (chip_ready(map, adr)) {
+		if (chip_good(map, adr, map_word_ff(map))) {
 			xip_enable(map, chip, adr);
 			break;
 		}
@@ -2400,6 +2401,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
 			xip_enable(map, chip, adr);
 			printk(KERN_WARNING "MTD %s(): software timeout\n",
 				__func__ );
+			ret = -EIO;
 			break;
 		}
 
@@ -2407,15 +2409,15 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
 		UDELAY(map, chip, adr, 1000000/HZ);
 	}
 	/* Did we succeed? */
-	if (!chip_good(map, adr, map_word_ff(map))) {
+	if (ret) {
 		/* reset on all failures. */
 		map_write( map, CMD(0xF0), chip->start );
 		/* FIXME - should have reset delay before continuing */
 
-		if (++retry_cnt <= MAX_RETRIES)
+		if (++retry_cnt <= MAX_RETRIES) {
+			ret = 0;
 			goto retry;
-
-		ret = -EIO;
+		}
 	}
 
 	chip->state = FL_READY;
-- 
2.16.1