Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1395544

[PATCH v7 09/10] mtd: spi-nor: add read loop

Show all headers | View raw

From: Michal Suchanek <hramrach@gmail.com>

mtdblock and ubi do not handle the situation when read returns less data
than requested. Loop in spi-nor until buffer is filled or an error is
returned.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
v6 -> v7:
 * no change

 drivers/mtd/spi-nor/spi-nor.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index ff96e1b54384..a78adcda1b85 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1030,14 +1030,27 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
 	if (ret)
 		return ret;
 
-	ret = nor->read(nor, from, len, buf);
+	while (len) {
+		ret = nor->read(nor, from, len, buf);
+		if (ret == 0) {
+			/* We shouldn't see 0-length reads */
+			ret = -EIO;
+			goto read_err;
+		}
+		if (ret < 0)
+			goto read_err;
 
-	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
-	if (ret < 0)
-		return ret;
+		WARN_ON(ret > len);
+		*retlen += ret;
+		buf += ret;
+		from += ret;
+		len -= ret;
+	}
+	ret = 0;
 
-	*retlen += ret;
-	return 0;
+read_err:
+	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
+	return ret;
 }
 
 static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
-- 
2.8.0.rc3.226.g39d4020

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v7 00/10] Add error checking to spi-nor read and write Brian Norris <computersforpeace@gmail.com> - 2016-05-06 02:40 +0200
  [PATCH v7 05/10] mtd: nxp-spifi: return amount of data transferred or error in read/write Brian Norris <computersforpeace@gmail.com> - 2016-05-06 02:40 +0200
  [PATCH v7 03/10] mtd: fsl-quadspi: return amount of data read/written or error Brian Norris <computersforpeace@gmail.com> - 2016-05-06 02:40 +0200
  [PATCH v7 09/10] mtd: spi-nor: add read loop Brian Norris <computersforpeace@gmail.com> - 2016-05-06 02:40 +0200
  [PATCH v7 07/10] mtd: spi-nor: stop passing around retlen Brian Norris <computersforpeace@gmail.com> - 2016-05-06 02:40 +0200
  [PATCH v7 04/10] mtd: mtk-quadspi: return amount of data transferred or error in read/write Brian Norris <computersforpeace@gmail.com> - 2016-05-06 02:40 +0200

csiph-web