| Message ID | 1465982532-30174-1-git-send-email-boris.brezillon@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 252173c69eec6998ecf1be7b11d31cd39ce92c9c |
| Headers | show |
On Wed, 15 Jun 2016 11:22:12 +0200 Boris Brezillon <boris.brezillon@free-electrons.com> wrote: > The column address passed to the RNDOUT operation was missing the page > size offset. > Applied. > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Fixes: 614049a8d904 ("mtd: nand: sunxi: add support for DMA assisted operations") > --- > drivers/mtd/nand/sunxi_nand.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c > index ea74827..bcdd015 100644 > --- a/drivers/mtd/nand/sunxi_nand.c > +++ b/drivers/mtd/nand/sunxi_nand.c > @@ -1094,7 +1094,8 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct mtd_info *mtd, uint8_t *buf, > > if (oob_required && !erased) { > /* TODO: use DMA to retrieve OOB */ > - nand->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_off, -1); > + nand->cmdfunc(mtd, NAND_CMD_RNDOUT, > + mtd->writesize + oob_off, -1); > nand->read_buf(mtd, oob, ecc->bytes + 4); > > sunxi_nfc_hw_ecc_get_prot_oob_bytes(mtd, oob, i, > @@ -1129,7 +1130,8 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct mtd_info *mtd, uint8_t *buf, > } > > /* TODO: use DMA to retrieve OOB */ > - nand->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_off, -1); > + nand->cmdfunc(mtd, NAND_CMD_RNDOUT, > + mtd->writesize + oob_off, -1); > nand->read_buf(mtd, oob, ecc->bytes + 4); > > ret = nand_check_erased_ecc_chunk(data, ecc->size,
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index ea74827..bcdd015 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -1094,7 +1094,8 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct mtd_info *mtd, uint8_t *buf, if (oob_required && !erased) { /* TODO: use DMA to retrieve OOB */ - nand->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_off, -1); + nand->cmdfunc(mtd, NAND_CMD_RNDOUT, + mtd->writesize + oob_off, -1); nand->read_buf(mtd, oob, ecc->bytes + 4); sunxi_nfc_hw_ecc_get_prot_oob_bytes(mtd, oob, i, @@ -1129,7 +1130,8 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct mtd_info *mtd, uint8_t *buf, } /* TODO: use DMA to retrieve OOB */ - nand->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_off, -1); + nand->cmdfunc(mtd, NAND_CMD_RNDOUT, + mtd->writesize + oob_off, -1); nand->read_buf(mtd, oob, ecc->bytes + 4); ret = nand_check_erased_ecc_chunk(data, ecc->size,
The column address passed to the RNDOUT operation was missing the page size offset. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Fixes: 614049a8d904 ("mtd: nand: sunxi: add support for DMA assisted operations") --- drivers/mtd/nand/sunxi_nand.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)