@@ -1477,6 +1477,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
mtd->oobavail : mtd->oobsize;
uint8_t *bufpoi, *oob, *buf;
+ bool use_oob;
stats = mtd->ecc_stats;
@@ -1490,6 +1491,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
buf = ops->datbuf;
oob = ops->oobbuf;
+ use_oob = oob ? true : false;
while (1) {
bytes = min(mtd->writesize - col, readlen);
@@ -1507,13 +1509,13 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
/* Now read the page into the buffer */
if (unlikely(ops->mode == MTD_OPS_RAW))
ret = chip->ecc.read_page_raw(mtd, chip, bufpoi,
- true, page);
+ use_oob, page);
else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob)
ret = chip->ecc.read_subpage(mtd, chip,
col, bytes, bufpoi);
else
ret = chip->ecc.read_page(mtd, chip, bufpoi,
- true, page);
+ use_oob, page);
if (ret < 0) {
if (!aligned)
/* Invalidate page cache */
@@ -1536,7 +1538,6 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
buf += bytes;
if (unlikely(oob)) {
-
int toread = min(oobreadlen, max_oobsize);
if (toread) {
@@ -2216,6 +2217,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
uint8_t *oob = ops->oobbuf;
uint8_t *buf = ops->datbuf;
int ret, subpage;
+ bool use_oob = oob ? true : false;
ops->retlen = 0;
if (!writelen)
@@ -2278,7 +2280,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
memset(chip->oob_poi, 0xff, mtd->oobsize);
}
- ret = chip->write_page(mtd, chip, wbuf, true, page, cached,
+ ret = chip->write_page(mtd, chip, wbuf, use_oob, page, cached,
(ops->mode == MTD_OPS_RAW));
if (ret)
break;
We now have an interface for notifying the nand_ecc_ctrl functions when OOB data must be returned to the upper layers and when it is simply needed for internal calculations. This patch fills in the 'use_oob' parameter properly from nand_do_{read,write}_ops. When utilized properly in the lower layers, this parameter can improve performance for NAND HW that can simply avoid transferring the OOB data. Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/nand/nand_base.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)