leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: nxp-spifi: return amount of data transferred or error in read/write

Browse Source 
Add checking of SPI transfer errors and return them from read/write
functions. Also return the amount of data transferred.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Brian Norris 2016-05-05 17:31:51 -07:00
parent 78b400fde9
commit bc418cd265
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/spi-nor/nxp-spifi.c
View File

@ -185,7 +185,7 @@ static ssize_t nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len,
memcpy_fromio(buf, spifi->flash_base + from, len); memcpy_fromio(buf, spifi->flash_base + from, len);
*retlen += len; *retlen += len;
return 0; return len;
} }
static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len, static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
@ -194,6 +194,7 @@ static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
struct nxp_spifi *spifi = nor->priv; struct nxp_spifi *spifi = nor->priv;
u32 cmd; u32 cmd;
int ret; int ret;
size_t i;
ret = nxp_spifi_set_memory_mode_off(spifi); ret = nxp_spifi_set_memory_mode_off(spifi);
if (ret) if (ret)
@ -209,10 +210,14 @@ static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len,
SPIFI_CMD_FRAMEFORM(spifi->nor.addr_width + 1); SPIFI_CMD_FRAMEFORM(spifi->nor.addr_width + 1);
writel(cmd, spifi->io_base + SPIFI_CMD); writel(cmd, spifi->io_base + SPIFI_CMD);
while (len--) for (i = 0; i < len; i++)
writeb(*buf++, spifi->io_base + SPIFI_DATA); writeb(buf[i], spifi->io_base + SPIFI_DATA);
return nxp_spifi_wait_for_cmd(spifi); ret = nxp_spifi_wait_for_cmd(spifi);
if (ret)
return ret;
return len;
} }
static int nxp_spifi_erase(struct spi_nor *nor, loff_t offs) static int nxp_spifi_erase(struct spi_nor *nor, loff_t offs)