1 From 0bad7b9304d543dd7627f4cd564aea5d7338b950 Mon Sep 17 00:00:00 2001
2 From: Michal Suchanek <hramrach@gmail.com>
3 Date: Thu, 5 May 2016 17:31:52 -0700
4 Subject: [PATCH 06/10] mtd: spi-nor: check return value from write
6 SPI NOR hardware drivers now return useful value from their write
7 functions so check them.
9 Signed-off-by: Michal Suchanek <hramrach@gmail.com>
10 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
11 Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com>
12 Acked-by: Michal Suchanek <hramrach@gmail.com>
13 Tested-by: Michal Suchanek <hramrach@gmail.com>
15 drivers/mtd/spi-nor/spi-nor.c | 45 ++++++++++++++++++++++++++++++-------------
16 1 file changed, 32 insertions(+), 13 deletions(-)
18 --- a/drivers/mtd/spi-nor/spi-nor.c
19 +++ b/drivers/mtd/spi-nor/spi-nor.c
20 @@ -922,10 +922,14 @@ static int sst_write(struct mtd_info *mt
21 nor->program_opcode = SPINOR_OP_BP;
24 - nor->write(nor, to, 1, retlen, buf);
25 + ret = nor->write(nor, to, 1, retlen, buf);
28 + WARN(ret != 1, "While writing 1 byte written %i bytes\n",
30 ret = spi_nor_wait_till_ready(nor);
37 @@ -934,10 +938,14 @@ static int sst_write(struct mtd_info *mt
38 nor->program_opcode = SPINOR_OP_AAI_WP;
40 /* write two bytes. */
41 - nor->write(nor, to, 2, retlen, buf + actual);
42 + ret = nor->write(nor, to, 2, retlen, buf + actual);
45 + WARN(ret != 2, "While writing 2 bytes written %i bytes\n",
47 ret = spi_nor_wait_till_ready(nor);
52 nor->sst_write_second = true;
54 @@ -946,21 +954,24 @@ static int sst_write(struct mtd_info *mt
56 ret = spi_nor_wait_till_ready(nor);
61 /* Write out trailing byte if it exists. */
65 nor->program_opcode = SPINOR_OP_BP;
66 - nor->write(nor, to, 1, retlen, buf + actual);
68 + ret = nor->write(nor, to, 1, retlen, buf + actual);
71 + WARN(ret != 1, "While writing 1 byte written %i bytes\n",
73 ret = spi_nor_wait_till_ready(nor);
81 spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
84 @@ -989,14 +1000,18 @@ static int spi_nor_write(struct mtd_info
86 /* do all the bytes fit onto one page? */
87 if (page_offset + len <= nor->page_size) {
88 - nor->write(nor, to, len, retlen, buf);
89 + ret = nor->write(nor, to, len, retlen, buf);
93 /* the size of data remaining on the first page */
94 page_size = nor->page_size - page_offset;
95 - nor->write(nor, to, page_size, retlen, buf);
96 + ret = nor->write(nor, to, page_size, retlen, buf);
100 /* write everything in nor->page_size chunks */
101 - for (i = page_size; i < len; i += page_size) {
102 + for (i = ret; i < len; ) {
104 if (page_size > nor->page_size)
105 page_size = nor->page_size;
106 @@ -1007,7 +1022,11 @@ static int spi_nor_write(struct mtd_info
110 - nor->write(nor, to + i, page_size, retlen, buf + i);
111 + ret = nor->write(nor, to + i, page_size, retlen,