hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: spi-nor: simplify write loop 

The spi-nor write loop assumes that what is passed to the hardware
driver write() is what gets written.

When write() writes less than page size at once data is dropped on the
floor. Check the amount of data writen and exit if it does not match
requested amount.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Michal Suchanek <hramrach@gmail.com>
Tested-by: Michal Suchanek <hramrach@gmail.com>
This commit is contained in:
Michal Suchanek 2016-05-05 17:31:54 -07:00 committed by Brian Norris
parent 2dd087b169
commit e5d05cbd6d
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/mtd/spi-nor/spi-nor.c
View File

@ -1129,8 +1129,8 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
struct spi_nor *nor = mtd_to_spi_nor(mtd); struct spi_nor *nor = mtd_to_spi_nor(mtd);
u32 page_offset, page_size, i; size_t page_offset, page_remain, i;
int ret; ssize_t ret;
dev_dbg(nor->dev, "to 0x%08x, len %zd\n", (u32)to, len); dev_dbg(nor->dev, "to 0x%08x, len %zd\n", (u32)to, len);
@ -1138,45 +1138,37 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
if (ret) if (ret)
return ret; return ret;
write_enable(nor); for (i = 0; i < len; ) {
ssize_t written;
page_offset = to & (nor->page_size - 1); page_offset = (to + i) & (nor->page_size - 1);
WARN_ONCE(page_offset,
/* do all the bytes fit onto one page? */ "Writing at offset %zu into a NOR page. Writing partial pages may decrease reliability and increase wear of NOR flash.",
if (page_offset + len <= nor->page_size) { page_offset);
ret = nor->write(nor, to, len, buf);
if (ret < 0)
goto write_err;
*retlen += ret;
} else {
/* the size of data remaining on the first page */ /* the size of data remaining on the first page */
page_size = nor->page_size - page_offset; page_remain = min_t(size_t,
ret = nor->write(nor, to, page_size, buf); nor->page_size - page_offset, len - i);
write_enable(nor);
ret = nor->write(nor, to + i, page_remain, buf + i);
if (ret < 0) if (ret < 0)
goto write_err; goto write_err;
*retlen += ret; written = ret;
/* write everything in nor->page_size chunks */ ret = spi_nor_wait_till_ready(nor);
for (i = ret; i < len; ) { if (ret)
page_size = len - i; goto write_err;
if (page_size > nor->page_size) *retlen += written;
page_size = nor->page_size; i += written;
if (written != page_remain) {
ret = spi_nor_wait_till_ready(nor); dev_err(nor->dev,
if (ret) "While writing %zu bytes written %zd bytes\n",
goto write_err; page_remain, written);
ret = -EIO;
write_enable(nor); goto write_err;
ret = nor->write(nor, to + i, page_size, buf + i);
if (ret < 0)
goto write_err;
*retlen += ret;
i += ret;
} }
} }
ret = spi_nor_wait_till_ready(nor);
write_err: write_err:
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret; return ret;