mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
2f2ea7b44c
This patch bumps the 4.4 kernel from .28 to .30 and refreshes the patches. Compile-tested on ar71xx, x86/64, ramips/mt7621, brcm47xx and kirkwood. Run-tested on ar71xx & ramips/mt7621, brcm47xx and kirkwood (last two confirmed by P. Wassi). Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
216 lines
6.4 KiB
Diff
216 lines
6.4 KiB
Diff
From a99477d72b500b48cb3614aad0ce096fe4e3f437 Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <hramrach@gmail.com>
|
|
Date: Wed, 2 Dec 2015 10:38:20 +0000
|
|
Subject: [PATCH 094/113] mtd: spi-nor: stop passing around retlen
|
|
|
|
[context adjustment]
|
|
not apply changes of drivers/mtd/devices/m25p80.c
|
|
#################
|
|
@@ -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,
|
|
- 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_nor *nor, loff_t to, size_t len,
|
|
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_nbits(struct spi_nor *nor)
|
|
* 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;
|
|
@@ -161,7 +160,6 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len,
|
|
ret = m.actual_length - m25p_cmdsz(nor) - dummy;
|
|
if (ret < 0)
|
|
return -EIO;
|
|
- *retlen += ret;
|
|
return ret;
|
|
}
|
|
|
|
#################
|
|
|
|
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: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
|
|
Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
|
|
---
|
|
drivers/mtd/spi-nor/fsl-quadspi.c | 16 ++++++----------
|
|
drivers/mtd/spi-nor/spi-nor.c | 21 +++++++++++++--------
|
|
include/linux/mtd/spi-nor.h | 4 ++--
|
|
3 files changed, 21 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
|
|
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
|
|
@@ -620,7 +620,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;
|
|
@@ -647,11 +647,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;
|
|
}
|
|
@@ -862,7 +859,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 {
|
|
@@ -874,12 +871,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);
|
|
@@ -887,7 +883,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;
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -920,12 +920,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;
|
|
}
|
|
|
|
@@ -952,7 +953,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",
|
|
@@ -968,7 +969,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",
|
|
@@ -991,7 +992,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",
|
|
@@ -1000,8 +1001,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;
|
|
}
|
|
@@ -1030,15 +1033,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; ) {
|
|
@@ -1052,10 +1057,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
|
|
@@ -171,9 +171,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);
|