GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-spi

Browse source 
- Important spi-mem fix
This commit is contained in:
Tom Rini 2019-05-06 07:18:28 -04:00
commit 8b77ea90a7
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/mtd/spi/spi-nor-core.c
View file

@ -116,7 +116,6 @@ static ssize_t spi_nor_write_data(struct spi_nor *nor, loff_t to, size_t len,
SPI_MEM_OP_ADDR(nor->addr_width, to, 1), SPI_MEM_OP_ADDR(nor->addr_width, to, 1),
SPI_MEM_OP_NO_DUMMY, SPI_MEM_OP_NO_DUMMY,
SPI_MEM_OP_DATA_OUT(len, buf, 1)); SPI_MEM_OP_DATA_OUT(len, buf, 1));
size_t remaining = len;
int ret; int ret;
/* get transfer protocols. */ /* get transfer protocols. */
@ -127,22 +126,16 @@ static ssize_t spi_nor_write_data(struct spi_nor *nor, loff_t to, size_t len,
if (nor->program_opcode == SPINOR_OP_AAI_WP && nor->sst_write_second) if (nor->program_opcode == SPINOR_OP_AAI_WP && nor->sst_write_second)
op.addr.nbytes = 0; op.addr.nbytes = 0;
while (remaining) {
op.data.nbytes = remaining < UINT_MAX ? remaining : UINT_MAX;
ret = spi_mem_adjust_op_size(nor->spi, &op); ret = spi_mem_adjust_op_size(nor->spi, &op);
if (ret) if (ret)
return ret; return ret;
op.data.nbytes = len < op.data.nbytes ? len : op.data.nbytes;
ret = spi_mem_exec_op(nor->spi, &op); ret = spi_mem_exec_op(nor->spi, &op);
if (ret) if (ret)
return ret; return ret;
op.addr.val += op.data.nbytes; return op.data.nbytes;
remaining -= op.data.nbytes;
op.data.buf.out += op.data.nbytes;
}
return len;
} }
/* /*
@ -1101,10 +1094,6 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
goto write_err; goto write_err;
*retlen += written; *retlen += written;
i += written; i += written;
if (written != page_remain) {
ret = -EIO;
goto write_err;
}
} }
write_err: write_err: