128 lines
3.6 KiB
Diff
128 lines
3.6 KiB
Diff
From 8527843351169d999995d331bbdad75560ccafb2 Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <hramrach@gmail.com>
|
|
Date: Wed, 2 Dec 2015 10:38:20 +0000
|
|
Subject: [PATCH 093/113] mtd: spi-nor: check return value from read/write
|
|
|
|
SPI NOR hardware drivers now return useful value from their read/write
|
|
functions so check them.
|
|
|
|
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
|
|
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 50 +++++++++++++++++++++++++++++------------
|
|
1 file changed, 36 insertions(+), 14 deletions(-)
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -930,7 +930,10 @@ static int spi_nor_read(struct mtd_info
|
|
ret = nor->read(nor, from, len, retlen, buf);
|
|
|
|
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
|
|
- return ret;
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
|
|
@@ -956,10 +959,14 @@ static int sst_write(struct mtd_info *mt
|
|
nor->program_opcode = SPINOR_OP_BP;
|
|
|
|
/* write one byte. */
|
|
- nor->write(nor, to, 1, retlen, buf);
|
|
+ ret = nor->write(nor, to, 1, retlen, buf);
|
|
+ if (ret < 0)
|
|
+ goto sst_write_err;
|
|
+ WARN(ret != 1, "While writing 1 byte written %i bytes\n",
|
|
+ (int)ret);
|
|
ret = spi_nor_wait_till_ready(nor);
|
|
if (ret)
|
|
- goto time_out;
|
|
+ goto sst_write_err;
|
|
}
|
|
to += actual;
|
|
|
|
@@ -968,10 +975,14 @@ static int sst_write(struct mtd_info *mt
|
|
nor->program_opcode = SPINOR_OP_AAI_WP;
|
|
|
|
/* write two bytes. */
|
|
- nor->write(nor, to, 2, retlen, buf + actual);
|
|
+ ret = nor->write(nor, to, 2, retlen, buf + actual);
|
|
+ if (ret < 0)
|
|
+ goto sst_write_err;
|
|
+ WARN(ret != 2, "While writing 2 bytes written %i bytes\n",
|
|
+ (int)ret);
|
|
ret = spi_nor_wait_till_ready(nor);
|
|
if (ret)
|
|
- goto time_out;
|
|
+ goto sst_write_err;
|
|
to += 2;
|
|
nor->sst_write_second = true;
|
|
}
|
|
@@ -980,21 +991,24 @@ static int sst_write(struct mtd_info *mt
|
|
write_disable(nor);
|
|
ret = spi_nor_wait_till_ready(nor);
|
|
if (ret)
|
|
- goto time_out;
|
|
+ goto sst_write_err;
|
|
|
|
/* Write out trailing byte if it exists. */
|
|
if (actual != len) {
|
|
write_enable(nor);
|
|
|
|
nor->program_opcode = SPINOR_OP_BP;
|
|
- nor->write(nor, to, 1, retlen, buf + actual);
|
|
-
|
|
+ ret = nor->write(nor, to, 1, retlen, buf + actual);
|
|
+ if (ret < 0)
|
|
+ goto sst_write_err;
|
|
+ WARN(ret != 1, "While writing 1 byte written %i bytes\n",
|
|
+ (int)ret);
|
|
ret = spi_nor_wait_till_ready(nor);
|
|
if (ret)
|
|
- goto time_out;
|
|
+ goto sst_write_err;
|
|
write_disable(nor);
|
|
}
|
|
-time_out:
|
|
+sst_write_err:
|
|
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
|
|
return ret;
|
|
}
|
|
@@ -1023,14 +1037,18 @@ static int spi_nor_write(struct mtd_info
|
|
|
|
/* do all the bytes fit onto one page? */
|
|
if (page_offset + len <= nor->page_size) {
|
|
- nor->write(nor, to, len, retlen, buf);
|
|
+ ret = nor->write(nor, to, len, retlen, buf);
|
|
+ if (ret < 0)
|
|
+ goto write_err;
|
|
} else {
|
|
/* the size of data remaining on the first page */
|
|
page_size = nor->page_size - page_offset;
|
|
- nor->write(nor, to, page_size, retlen, buf);
|
|
+ ret = nor->write(nor, to, page_size, retlen, buf);
|
|
+ if (ret < 0)
|
|
+ goto write_err;
|
|
|
|
/* write everything in nor->page_size chunks */
|
|
- for (i = page_size; i < len; i += page_size) {
|
|
+ for (i = ret; i < len; ) {
|
|
page_size = len - i;
|
|
if (page_size > nor->page_size)
|
|
page_size = nor->page_size;
|
|
@@ -1041,7 +1059,11 @@ static int spi_nor_write(struct mtd_info
|
|
|
|
write_enable(nor);
|
|
|
|
- nor->write(nor, to + i, page_size, retlen, buf + i);
|
|
+ ret = nor->write(nor, to + i, page_size, retlen,
|
|
+ buf + i);
|
|
+ if (ret < 0)
|
|
+ goto write_err;
|
|
+ i += ret;
|
|
}
|
|
}
|
|
|