Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59451e12 authored by Michal Suchanek's avatar Michal Suchanek Committed by Brian Norris
Browse files

mtd: spi-nor: change return value of read/write 



Change the return value of spi-nor device read and write methods to
allow returning amount of data transferred and errors as
read(2)/write(2) does.

Also, start handling positive returns in spi_nor_read(), since we want
to convert drivers to start returning the read-length both via *retlen
and the return code. (We don't need to do the same transition process
for spi_nor_write(), since ->write() didn't used to have a return code
at all.)

Signed-off-by: default avatarMichal Suchanek <hramrach@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: default avatarMichal Suchanek <hramrach@gmail.com>
Tested-by: default avatarMichal Suchanek <hramrach@gmail.com>
parent becc7ae5

drivers/mtd/devices/m25p80.c

+3 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return spi_write(spi, flash->command, len + 1);

}



static void m25p80_write(struct spi_nor *nor, loff_t to, size_t len,

static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len,

			size_t *retlen, const u_char *buf)

{

	struct m25p *flash = nor->priv;
@@ -101,6 +101,7 @@ static void m25p80_write(struct spi_nor *nor, loff_t to, size_t len, 
	spi_sync(spi, &m);



	*retlen += m.actual_length - cmd_sz;

	return 0;

}



static inline unsigned int m25p80_rx_nbits(struct spi_nor *nor)
@@ -119,7 +120,7 @@ static inline unsigned int m25p80_rx_nbits(struct spi_nor *nor) 
 * Read an address range from the nor chip.  The address range

 * may be any size provided it is within the physical boundaries.

 */

static int m25p80_read(struct spi_nor *nor, loff_t from, size_t len,

static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len,

			size_t *retlen, u_char *buf)

{

	struct m25p *flash = nor->priv;

drivers/mtd/spi-nor/fsl-quadspi.c

+3 −2
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ static int fsl_qspi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return ret;

}



static void fsl_qspi_write(struct spi_nor *nor, loff_t to,

static ssize_t fsl_qspi_write(struct spi_nor *nor, loff_t to,

		size_t len, size_t *retlen, const u_char *buf)

{

	struct fsl_qspi *q = nor->priv;
@@ -878,9 +878,10 @@ static void fsl_qspi_write(struct spi_nor *nor, loff_t to, 


	/* invalid the data in the AHB buffer. */

	fsl_qspi_invalid(q);

	return 0;

}



static int fsl_qspi_read(struct spi_nor *nor, loff_t from,

static ssize_t fsl_qspi_read(struct spi_nor *nor, loff_t from,

		size_t len, size_t *retlen, u_char *buf)

{

	struct fsl_qspi *q = nor->priv;

drivers/mtd/spi-nor/mtk-quadspi.c

+18 −8
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void mt8173_nor_set_addr(struct mt8173_nor *mt8173_nor, u32 addr) 
	writeb(addr & 0xff, mt8173_nor->base + MTK_NOR_RADR3_REG);

}



static int mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length,

static ssize_t mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length,

			       size_t *retlen, u_char *buffer)

{

	int i, ret;
@@ -297,36 +297,46 @@ static int mt8173_nor_write_buffer(struct mt8173_nor *mt8173_nor, int addr, 
	return mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_WR_CMD);

}



static void mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len,

static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len,

				size_t *retlen, const u_char *buf)

{

	int ret;

	struct mt8173_nor *mt8173_nor = nor->priv;



	ret = mt8173_nor_write_buffer_enable(mt8173_nor);

	if (ret < 0)

	if (ret < 0) {

		dev_warn(mt8173_nor->dev, "write buffer enable failed!\n");

		return ret;

	}



	while (len >= SFLASH_WRBUF_SIZE) {

		ret = mt8173_nor_write_buffer(mt8173_nor, to, buf);

		if (ret < 0)

		if (ret < 0) {

			dev_err(mt8173_nor->dev, "write buffer failed!\n");

			return ret;

		}

		len -= SFLASH_WRBUF_SIZE;

		to += SFLASH_WRBUF_SIZE;

		buf += SFLASH_WRBUF_SIZE;

		(*retlen) += SFLASH_WRBUF_SIZE;

	}

	ret = mt8173_nor_write_buffer_disable(mt8173_nor);

	if (ret < 0)

	if (ret < 0) {

		dev_warn(mt8173_nor->dev, "write buffer disable failed!\n");

		return ret;

	}



	if (len) {

		ret = mt8173_nor_write_single_byte(mt8173_nor, to, (int)len,

						   (u8 *)buf);

		if (ret < 0)

		if (ret < 0) {

			dev_err(mt8173_nor->dev, "write single byte failed!\n");

			return ret;

		}

		(*retlen) += len;

	}



	return 0;

}



static int mt8173_nor_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)

drivers/mtd/spi-nor/nxp-spifi.c

+6 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int nxp_spifi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
	return nxp_spifi_wait_for_cmd(spifi);

}



static int nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len,

static ssize_t nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len,

			      size_t *retlen, u_char *buf)

{

	struct nxp_spifi *spifi = nor->priv;
@@ -188,7 +188,7 @@ static int nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len, 
	return 0;

}



static void 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,

			       size_t *retlen, const u_char *buf)

{

	struct nxp_spifi *spifi = nor->priv;
@@ -197,7 +197,7 @@ static void nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len, 


	ret = nxp_spifi_set_memory_mode_off(spifi);

	if (ret)

		return;

		return ret;



	writel(to, spifi->io_base + SPIFI_ADDR);

	*retlen += len;
@@ -212,7 +212,7 @@ static void nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len, 
	while (len--)

		writeb(*buf++, spifi->io_base + SPIFI_DATA);



	nxp_spifi_wait_for_cmd(spifi);

	return nxp_spifi_wait_for_cmd(spifi);

}



static int nxp_spifi_erase(struct spi_nor *nor, loff_t offs)

drivers/mtd/spi-nor/spi-nor.c

+4 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,10 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, 
	ret = nor->read(nor, from, len, retlen, buf);



	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);

	if (ret < 0)

		return ret;



	return 0;

}



static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,