[v2,1/2] mtd: cfi_cmdset_0002: only check errors when ready in cfi_check_err_status()
diff mbox series

Message ID f395d94b-40ca-6037-3e6c-f6fbf46882e5@cogentembedded.com
State Accepted
Delegated to: Vignesh R
Headers show
  • Fix the HyperFlash support in the AMD/Fujitsu/Spansion CFI driver
Related show

Commit Message

Sergei Shtylyov Oct. 31, 2019, 8:37 p.m. UTC
Cypress S26K{L|S}P{128|256|512}S datasheet says that the error bits in
the status register are only valid when the "device ready" bit 7 is set.
Add the check for the device ready bit in cfi_check_err_status() as that
function isn't always called with this bit set.

Fixes: 4844ef80305d ("mtd: cfi_cmdset_0002: Add support for polling status register")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Changes in version 2:
- refreshed the patch.

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

diff mbox series

Index: linux/drivers/mtd/chips/cfi_cmdset_0002.c
--- linux.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -136,6 +136,10 @@  static void cfi_check_err_status(struct
 			 cfi->device_type, NULL);
 	status = map_read(map, adr);
+	/* The error bits are invalid while the chip's busy */
+	if (!map_word_bitsset(map, status, CMD(CFI_SR_DRB)))
+		return;
 	if (map_word_bitsset(map, status, CMD(0x3a))) {
 		unsigned long chipstatus = MERGESTATUS(status);