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

Commit 2dd087b1 authored by Michal Suchanek's avatar Michal Suchanek Committed by Brian Norris
Browse files

mtd: spi-nor: stop passing around retlen 



Do not pass retlen to hardware driver read/write functions. Update it in
spi-nor generic driver instead.

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 0bad7b93

drivers/mtd/devices/m25p80.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
}

}





static ssize_t 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)

			    const u_char *buf)

{

{

	struct m25p *flash = nor->priv;

	struct m25p *flash = nor->priv;

	struct spi_device *spi = flash->spi;

	struct spi_device *spi = flash->spi;
@@ -106,7 +106,6 @@ static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len, 
	ret = m.actual_length - cmd_sz;

	ret = m.actual_length - cmd_sz;

	if (ret < 0)

	if (ret < 0)

		return -EIO;

		return -EIO;

	*retlen += ret;

	return ret;

	return ret;

}

}
@@ -127,7 +126,7 @@ static inline unsigned int m25p80_rx_nbits(struct spi_nor *nor) 
 * may be any size provided it is within the physical boundaries.

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

 */

 */

static ssize_t 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)

			   u_char *buf)

{

{

	struct m25p *flash = nor->priv;

	struct m25p *flash = nor->priv;

	struct spi_device *spi = flash->spi;

	struct spi_device *spi = flash->spi;
@@ -156,7 +155,6 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, 
		msg.data_nbits = m25p80_rx_nbits(nor);

		msg.data_nbits = m25p80_rx_nbits(nor);





		ret = spi_flash_read(spi, &msg);

		ret = spi_flash_read(spi, &msg);

		*retlen = msg.retlen;

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

		return msg.retlen;

		return msg.retlen;
@@ -184,7 +182,6 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, 
	ret = m.actual_length - m25p_cmdsz(nor) - dummy;

	ret = m.actual_length - m25p_cmdsz(nor) - dummy;

	if (ret < 0)

	if (ret < 0)

		return -EIO;

		return -EIO;

	*retlen += ret;

	return ret;

	return ret;

}

}

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

+6 −11
Original line number Original line Diff line number Diff line
@@ -620,7 +620,7 @@ static inline void fsl_qspi_invalid(struct fsl_qspi *q) 




static ssize_t fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor,

static ssize_t fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor,

				u8 opcode, unsigned int to, u32 *txbuf,

				u8 opcode, unsigned int to, u32 *txbuf,

				unsigned count, size_t *retlen)

				unsigned count)

{

{

	int ret, i, j;

	int ret, i, j;

	u32 tmp;

	u32 tmp;
@@ -647,11 +647,8 @@ static ssize_t fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor, 
	/* Trigger it */

	/* Trigger it */

	ret = fsl_qspi_runcmd(q, opcode, to, count);

	ret = fsl_qspi_runcmd(q, opcode, to, count);





	if (ret == 0) {

	if (ret == 0)

		if (retlen)

			*retlen += count;

		return count;

		return count;

	}





	return ret;

	return ret;

}

}
@@ -862,7 +859,7 @@ static int fsl_qspi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 




	} else if (len > 0) {

	} else if (len > 0) {

		ret = fsl_qspi_nor_write(q, nor, opcode, 0,

		ret = fsl_qspi_nor_write(q, nor, opcode, 0,

					(u32 *)buf, len, NULL);

					(u32 *)buf, len);

		if (ret > 0)

		if (ret > 0)

			return 0;

			return 0;

	} else {

	} else {
@@ -874,12 +871,11 @@ static int fsl_qspi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
}

}





static ssize_t 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)

			      size_t len, const u_char *buf)

{

{

	struct fsl_qspi *q = nor->priv;

	struct fsl_qspi *q = nor->priv;



	ssize_t ret = fsl_qspi_nor_write(q, nor, nor->program_opcode, to,

	ssize_t ret = fsl_qspi_nor_write(q, nor, nor->program_opcode, to,

				(u32 *)buf, len, retlen);

					 (u32 *)buf, len);





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

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

	fsl_qspi_invalid(q);

	fsl_qspi_invalid(q);
@@ -887,7 +883,7 @@ static ssize_t fsl_qspi_write(struct spi_nor *nor, loff_t to, 
}

}





static ssize_t 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)

			     size_t len, u_char *buf)

{

{

	struct fsl_qspi *q = nor->priv;

	struct fsl_qspi *q = nor->priv;

	u8 cmd = nor->read_opcode;

	u8 cmd = nor->read_opcode;
@@ -929,7 +925,6 @@ static ssize_t fsl_qspi_read(struct spi_nor *nor, loff_t from, 
	memcpy(buf, q->ahb_addr + q->chip_base_addr + from - q->memmap_offs,

	memcpy(buf, q->ahb_addr + q->chip_base_addr + from - q->memmap_offs,

		len);

		len);





	*retlen += len;

	return len;

	return len;

}

}

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -244,7 +244,7 @@ static void mt8173_nor_set_addr(struct mt8173_nor *mt8173_nor, u32 addr) 
}

}





static ssize_t 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)

			       u_char *buffer)

{

{

	int i, ret;

	int i, ret;

	int addr = (int)from;

	int addr = (int)from;
@@ -255,7 +255,7 @@ static ssize_t mt8173_nor_read(struct spi_nor *nor, loff_t from, size_t length, 
	mt8173_nor_set_read_mode(mt8173_nor);

	mt8173_nor_set_read_mode(mt8173_nor);

	mt8173_nor_set_addr(mt8173_nor, addr);

	mt8173_nor_set_addr(mt8173_nor, addr);





	for (i = 0; i < length; i++, (*retlen)++) {

	for (i = 0; i < length; i++) {

		ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_PIO_READ_CMD);

		ret = mt8173_nor_execute_cmd(mt8173_nor, MTK_NOR_PIO_READ_CMD);

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;
@@ -298,7 +298,7 @@ static int mt8173_nor_write_buffer(struct mt8173_nor *mt8173_nor, int addr, 
}

}





static ssize_t 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)

				const u_char *buf)

{

{

	int ret;

	int ret;

	struct mt8173_nor *mt8173_nor = nor->priv;

	struct mt8173_nor *mt8173_nor = nor->priv;
@@ -318,7 +318,6 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, 
		}

		}

		to += SFLASH_WRBUF_SIZE;

		to += SFLASH_WRBUF_SIZE;

		buf += SFLASH_WRBUF_SIZE;

		buf += SFLASH_WRBUF_SIZE;

		(*retlen) += SFLASH_WRBUF_SIZE;

	}

	}

	ret = mt8173_nor_write_buffer_disable(mt8173_nor);

	ret = mt8173_nor_write_buffer_disable(mt8173_nor);

	if (ret < 0) {

	if (ret < 0) {
@@ -333,7 +332,6 @@ static ssize_t mt8173_nor_write(struct spi_nor *nor, loff_t to, size_t len, 
			dev_err(mt8173_nor->dev, "write single byte failed!\n");

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

			return ret;

			return ret;

		}

		}

		(*retlen) += len;

	}

	}





	return len;

	return len;

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ static int nxp_spifi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) 
}

}





static ssize_t 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)

			      u_char *buf)

{

{

	struct nxp_spifi *spifi = nor->priv;

	struct nxp_spifi *spifi = nor->priv;

	int ret;

	int ret;
@@ -183,13 +183,12 @@ static ssize_t nxp_spifi_read(struct spi_nor *nor, loff_t from, size_t len, 
		return ret;

		return ret;





	memcpy_fromio(buf, spifi->flash_base + from, len);

	memcpy_fromio(buf, spifi->flash_base + from, len);

	*retlen += len;





	return len;

	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,

			       size_t *retlen, const u_char *buf)

			       const u_char *buf)

{

{

	struct nxp_spifi *spifi = nor->priv;

	struct nxp_spifi *spifi = nor->priv;

	u32 cmd;

	u32 cmd;
@@ -201,7 +200,6 @@ static ssize_t nxp_spifi_write(struct spi_nor *nor, loff_t to, size_t len, 
		return ret;

		return ret;





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

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

	*retlen += len;





	cmd = SPIFI_CMD_DOUT |

	cmd = SPIFI_CMD_DOUT |

	      SPIFI_CMD_DATALEN(len) |

	      SPIFI_CMD_DATALEN(len) |

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

+13 −8
Original line number Original line Diff line number Diff line
@@ -1031,12 +1031,13 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = nor->read(nor, from, len, retlen, buf);

	ret = nor->read(nor, from, len, buf);





	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);

	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	*retlen += ret;

	return 0;

	return 0;

}

}
@@ -1063,7 +1064,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
		nor->program_opcode = SPINOR_OP_BP;

		nor->program_opcode = SPINOR_OP_BP;





		/* write one byte. */

		/* write one byte. */

		ret = nor->write(nor, to, 1, retlen, buf);

		ret = nor->write(nor, to, 1, buf);

		if (ret < 0)

		if (ret < 0)

			goto sst_write_err;

			goto sst_write_err;

		WARN(ret != 1, "While writing 1 byte written %i bytes\n",

		WARN(ret != 1, "While writing 1 byte written %i bytes\n",
@@ -1079,7 +1080,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
		nor->program_opcode = SPINOR_OP_AAI_WP;

		nor->program_opcode = SPINOR_OP_AAI_WP;





		/* write two bytes. */

		/* write two bytes. */

		ret = nor->write(nor, to, 2, retlen, buf + actual);

		ret = nor->write(nor, to, 2, buf + actual);

		if (ret < 0)

		if (ret < 0)

			goto sst_write_err;

			goto sst_write_err;

		WARN(ret != 2, "While writing 2 bytes written %i bytes\n",

		WARN(ret != 2, "While writing 2 bytes written %i bytes\n",
@@ -1102,7 +1103,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
		write_enable(nor);

		write_enable(nor);





		nor->program_opcode = SPINOR_OP_BP;

		nor->program_opcode = SPINOR_OP_BP;

		ret = nor->write(nor, to, 1, retlen, buf + actual);

		ret = nor->write(nor, to, 1, buf + actual);

		if (ret < 0)

		if (ret < 0)

			goto sst_write_err;

			goto sst_write_err;

		WARN(ret != 1, "While writing 1 byte written %i bytes\n",

		WARN(ret != 1, "While writing 1 byte written %i bytes\n",
@@ -1111,8 +1112,10 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
		if (ret)

		if (ret)

			goto sst_write_err;

			goto sst_write_err;

		write_disable(nor);

		write_disable(nor);

		actual += 1;

	}

	}

sst_write_err:

sst_write_err:

	*retlen += actual;

	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);

	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);

	return ret;

	return ret;

}

}
@@ -1141,15 +1144,17 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, 




	/* do all the bytes fit onto one page? */

	/* do all the bytes fit onto one page? */

	if (page_offset + len <= nor->page_size) {

	if (page_offset + len <= nor->page_size) {

		ret = nor->write(nor, to, len, retlen, buf);

		ret = nor->write(nor, to, len, buf);

		if (ret < 0)

		if (ret < 0)

			goto write_err;

			goto write_err;

		*retlen += ret;

	} else {

	} 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_size = nor->page_size - page_offset;

		ret = nor->write(nor, to, page_size, retlen, buf);

		ret = nor->write(nor, to, page_size, buf);

		if (ret < 0)

		if (ret < 0)

			goto write_err;

			goto write_err;

		*retlen += ret;





		/* write everything in nor->page_size chunks */

		/* write everything in nor->page_size chunks */

		for (i = ret; i < len; ) {

		for (i = ret; i < len; ) {
@@ -1163,10 +1168,10 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, 




			write_enable(nor);

			write_enable(nor);





			ret = nor->write(nor, to + i, page_size, retlen,

			ret = nor->write(nor, to + i, page_size, buf + i);

					 buf + i);

			if (ret < 0)

			if (ret < 0)

				goto write_err;

				goto write_err;

			*retlen += ret;

			i += ret;

			i += ret;

		}

		}

	}

	}