aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.4/000-4.8-07-mtd-spi-nor-stop-passing-around-retlen.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/000-4.8-07-mtd-spi-nor-stop-passing-around-retlen.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.4/000-4.8-07-mtd-spi-nor-stop-passing-around-retlen.patch266
1 files changed, 0 insertions, 266 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/000-4.8-07-mtd-spi-nor-stop-passing-around-retlen.patch b/target/linux/brcm63xx/patches-4.4/000-4.8-07-mtd-spi-nor-stop-passing-around-retlen.patch
deleted file mode 100644
index 9949d35a6f..0000000000
--- a/target/linux/brcm63xx/patches-4.4/000-4.8-07-mtd-spi-nor-stop-passing-around-retlen.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From 2dd087b16946cf168f401526adf26afa771bb740 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <hramrach@gmail.com>
-Date: Thu, 5 May 2016 17:31:53 -0700
-Subject: [PATCH 07/10] 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: 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>
----
- drivers/mtd/devices/m25p80.c | 7 ++-----
- drivers/mtd/spi-nor/fsl-quadspi.c | 17 ++++++-----------
- drivers/mtd/spi-nor/nxp-spifi.c | 6 ++----
- drivers/mtd/spi-nor/spi-nor.c | 21 +++++++++++++--------
- include/linux/mtd/spi-nor.h | 4 ++--
- 6 files changed, 28 insertions(+), 35 deletions(-)
-
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -74,7 +74,7 @@ static int m25p80_write_reg(struct spi_n
- }
-
- 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 spi_device *spi = flash->spi;
-@@ -106,7 +106,6 @@ static ssize_t m25p80_write(struct spi_n
- ret = m.actual_length - cmd_sz;
- if (ret < 0)
- return -EIO;
-- *retlen += ret;
- return ret;
- }
-
-@@ -127,7 +126,7 @@ static inline unsigned int m25p80_rx_nbi
- * 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,
-- size_t *retlen, u_char *buf)
-+ u_char *buf)
- {
- struct m25p *flash = nor->priv;
- struct spi_device *spi = flash->spi;
-@@ -156,7 +155,6 @@ static ssize_t m25p80_read(struct spi_no
- msg.data_nbits = m25p80_rx_nbits(nor);
-
- ret = spi_flash_read(spi, &msg);
-- *retlen = msg.retlen;
- if (ret < 0)
- return ret;
- return msg.retlen;
-@@ -184,7 +182,6 @@ static ssize_t m25p80_read(struct spi_no
- ret = m.actual_length - m25p_cmdsz(nor) - dummy;
- if (ret < 0)
- return -EIO;
-- *retlen += ret;
- return ret;
- }
-
---- a/drivers/mtd/spi-nor/fsl-quadspi.c
-+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
-@@ -577,7 +577,7 @@ static inline void fsl_qspi_invalid(stru
-
- static ssize_t fsl_qspi_nor_write(struct fsl_qspi *q, struct spi_nor *nor,
- u8 opcode, unsigned int to, u32 *txbuf,
-- unsigned count, size_t *retlen)
-+ unsigned count)
- {
- int ret, i, j;
- u32 tmp;
-@@ -604,11 +604,8 @@ static ssize_t fsl_qspi_nor_write(struct
- /* Trigger it */
- ret = fsl_qspi_runcmd(q, opcode, to, count);
-
-- if (ret == 0) {
-- if (retlen)
-- *retlen += count;
-+ if (ret == 0)
- return count;
-- }
-
- return ret;
- }
-@@ -816,7 +813,7 @@ static int fsl_qspi_write_reg(struct spi
-
- } else if (len > 0) {
- ret = fsl_qspi_nor_write(q, nor, opcode, 0,
-- (u32 *)buf, len, NULL);
-+ (u32 *)buf, len);
- if (ret > 0)
- return 0;
- } else {
-@@ -828,12 +825,11 @@ static int fsl_qspi_write_reg(struct spi
- }
-
- 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;
--
- 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. */
- fsl_qspi_invalid(q);
-@@ -841,7 +837,7 @@ static ssize_t fsl_qspi_write(struct spi
- }
-
- 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;
- u8 cmd = nor->read_opcode;
-@@ -883,7 +879,6 @@ static ssize_t fsl_qspi_read(struct spi_
- memcpy(buf, q->ahb_addr + q->chip_base_addr + from - q->memmap_offs,
- len);
-
-- *retlen += len;
- return len;
- }
-
---- a/drivers/mtd/spi-nor/nxp-spifi.c
-+++ b/drivers/mtd/spi-nor/nxp-spifi.c
-@@ -173,7 +173,7 @@ static int nxp_spifi_write_reg(struct sp
- }
-
- 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;
- int ret;
-@@ -183,13 +183,12 @@ static ssize_t nxp_spifi_read(struct spi
- return ret;
-
- memcpy_fromio(buf, spifi->flash_base + from, len);
-- *retlen += len;
-
- return 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;
- u32 cmd;
-@@ -201,7 +200,6 @@ static ssize_t nxp_spifi_write(struct sp
- return ret;
-
- writel(to, spifi->io_base + SPIFI_ADDR);
-- *retlen += len;
-
- cmd = SPIFI_CMD_DOUT |
- SPIFI_CMD_DATALEN(len) |
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -890,12 +890,13 @@ static int spi_nor_read(struct mtd_info
- if (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);
- if (ret < 0)
- return ret;
-
-+ *retlen += ret;
- return 0;
- }
-
-@@ -922,7 +923,7 @@ static int sst_write(struct mtd_info *mt
- nor->program_opcode = SPINOR_OP_BP;
-
- /* write one byte. */
-- ret = nor->write(nor, to, 1, retlen, buf);
-+ ret = nor->write(nor, to, 1, buf);
- if (ret < 0)
- goto sst_write_err;
- WARN(ret != 1, "While writing 1 byte written %i bytes\n",
-@@ -938,7 +939,7 @@ static int sst_write(struct mtd_info *mt
- nor->program_opcode = SPINOR_OP_AAI_WP;
-
- /* write two bytes. */
-- ret = nor->write(nor, to, 2, retlen, buf + actual);
-+ ret = nor->write(nor, to, 2, buf + actual);
- if (ret < 0)
- goto sst_write_err;
- WARN(ret != 2, "While writing 2 bytes written %i bytes\n",
-@@ -961,7 +962,7 @@ static int sst_write(struct mtd_info *mt
- write_enable(nor);
-
- 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)
- goto sst_write_err;
- WARN(ret != 1, "While writing 1 byte written %i bytes\n",
-@@ -970,8 +971,10 @@ static int sst_write(struct mtd_info *mt
- if (ret)
- goto sst_write_err;
- write_disable(nor);
-+ actual += 1;
- }
- sst_write_err:
-+ *retlen += actual;
- spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
- return ret;
- }
-@@ -1000,15 +1003,17 @@ static int spi_nor_write(struct mtd_info
-
- /* do all the bytes fit onto one page? */
- 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)
- goto write_err;
-+ *retlen += ret;
- } else {
- /* the size of data remaining on the first page */
- 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)
- goto write_err;
-+ *retlen += ret;
-
- /* write everything in nor->page_size chunks */
- for (i = ret; i < len; ) {
-@@ -1022,10 +1027,10 @@ static int spi_nor_write(struct mtd_info
-
- write_enable(nor);
-
-- ret = nor->write(nor, to + i, page_size, retlen,
-- buf + i);
-+ ret = nor->write(nor, to + i, page_size, buf + i);
- if (ret < 0)
- goto write_err;
-+ *retlen += ret;
- i += ret;
- }
- }
---- a/include/linux/mtd/spi-nor.h
-+++ b/include/linux/mtd/spi-nor.h
-@@ -170,9 +170,9 @@ struct spi_nor {
- int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);
-
- ssize_t (*read)(struct spi_nor *nor, loff_t from,
-- size_t len, size_t *retlen, u_char *read_buf);
-+ size_t len, u_char *read_buf);
- ssize_t (*write)(struct spi_nor *nor, loff_t to,
-- size_t len, size_t *retlen, const u_char *write_buf);
-+ size_t len, const u_char *write_buf);
- int (*erase)(struct spi_nor *nor, loff_t offs);
-
- int (*flash_lock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:11:39 +0000