Patch "mtd: cfi_cmdset_0002: Change erase functions to retry for error" has been added to the 4.17-stable tree

This is a note to let you know that I've just added the patch titled

mtd: cfi_cmdset_0002: Change erase functions to retry for error

to the 4.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mtd-cfi_cmdset_0002-change-erase-functions-to-retry-for-error.patch
and it can be found in the queue-4.17 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Tokunori Ikegami <[email protected]>
Date: Wed, 30 May 2018 18:32:28 +0900
Subject: mtd: cfi_cmdset_0002: Change erase functions to retry for error

From: Tokunori Ikegami <[email protected]>

commit 45f75b8a919a4255f52df454f1ffdee0e42443b2 upstream.

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.

---
 drivers/mtd/chips/cfi_cmdset_0002.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

@@ -2241,6 +2241,7 @@ static int __xipram do_erase_chip(struct
 	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
 	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_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(st
 	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(st
 	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(st
 		map_write( map, CMD(0xF0), chip->start );
 		/* FIXME - should have reset delay before continuing */
 
+		if (++retry_cnt <= MAX_RETRIES)
+			goto retry;
+
 		ret = -EIO;
 	}
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.17/mtd-cfi_cmdset_0002-change-erase-functions-to-retry-for-error.patch queue-4.17/mtd-cfi_cmdset_0002-change-write-buffer-to-check-correct-value.patch queue-4.17/mips-bcm47xx-enable-74k-core-externalsync-for-pcie-erratum.patch

Nope, this broke the build everywhere, so I've dropped it from all trees now. If you want this backported, please provide a working version.

thanks,

greg k-h

Hi Greg,

That's not surprising, this patch depends on "mtd: cfi_cmdset_0002:
Change definition naming to retry write" which did not apply cleanly on 4.17.

To be honest, I was not convinced those 2 patches deserved to be backported to stable releases, but Joakim and Ikegami thought they were good candidate. I'll let Ikegami propose a revised version of those 2 patches that apply cleanly on 4.17 if he wants.

Sorry for the inconvenience.

Regards,

Boris

Hi Greg-san and Boris-san,

Sorry for the error caused.
I have just sent the patches revised for the stable branches separately to Greg-san by git send-emal. If you are okay please applied the patches.
Note: The patch series includes the patch below already applied in stable-queue.git as PATCH 1/4.
mtd-cfi_cmdset_0002-change-write-buffer-to-check-correct-value.patch

If any problem or concern please let me know.

Regards,
Ikegami