[PATCH v2] nand_write: initialize OOB buffer for each page

[PATCH v2] nand_write: initialize OOB buffer for each page

[Jan Luebbe]

Previously, during a multi-page write, chip->oob_poi would not be
reinitialized.

See commit f722013ee9fd24623df31dec9a91a6d02c3e2f2f in the kernel
for an analogous change.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 drivers/mtd/nand/nand_write.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/nand/nand_write.c b/drivers/mtd/nand/nand_write.c
index 9997127..276728c 100644
--- a/drivers/mtd/nand/nand_write.c
+++ b/drivers/mtd/nand/nand_write.c
@@ -296,10 +296,6 @@ int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
 	    (chip->pagebuf << chip->page_shift) < (to + ops->len))
 		chip->pagebuf = -1;
 
-	/* Initialize to all 0xFF, to avoid the possibility of
-	   left over OOB data from a previous OOB read. */
-	memset(chip->oob_poi, 0xff, mtd->oobsize);
-
 	while(1) {
 		int bytes = mtd->writesize;
 		int cached = writelen > bytes && page != blockmask;
@@ -315,8 +311,12 @@ int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
 			wbuf = chip->buffers->databuf;
 		}
 
-		if (unlikely(oob))
+		if (unlikely(oob)) {
 			oob = nand_fill_oob(chip, oob, ops);
+		} else {
+			/* We still need to erase leftover OOB data */
+			memset(chip->oob_poi, 0xff, mtd->oobsize);
+		}
 
 		ret = chip->write_page(mtd, chip, wbuf, page, cached,
 				       (ops->mode == MTD_OOB_RAW));
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH v2] nand_write: initialize OOB buffer for each page

[Sascha Hauer]

On Thu, Jan 31, 2013 at 09:21:42AM +0100, Jan Luebbe wrote:
> Previously, during a multi-page write, chip->oob_poi would not be
> reinitialized.
> 
> See commit f722013ee9fd24623df31dec9a91a6d02c3e2f2f in the kernel
> for an analogous change.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Applied, thanks

Sascha

> ---
>  drivers/mtd/nand/nand_write.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mtd/nand/nand_write.c b/drivers/mtd/nand/nand_write.c
> index 9997127..276728c 100644
> --- a/drivers/mtd/nand/nand_write.c
> +++ b/drivers/mtd/nand/nand_write.c
> @@ -296,10 +296,6 @@ int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
>  	    (chip->pagebuf << chip->page_shift) < (to + ops->len))
>  		chip->pagebuf = -1;
>  
> -	/* Initialize to all 0xFF, to avoid the possibility of
> -	   left over OOB data from a previous OOB read. */
> -	memset(chip->oob_poi, 0xff, mtd->oobsize);
> -
>  	while(1) {
>  		int bytes = mtd->writesize;
>  		int cached = writelen > bytes && page != blockmask;
> @@ -315,8 +311,12 @@ int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
>  			wbuf = chip->buffers->databuf;
>  		}
>  
> -		if (unlikely(oob))
> +		if (unlikely(oob)) {
>  			oob = nand_fill_oob(chip, oob, ops);
> +		} else {
> +			/* We still need to erase leftover OOB data */
> +			memset(chip->oob_poi, 0xff, mtd->oobsize);
> +		}
>  
>  		ret = chip->write_page(mtd, chip, wbuf, page, cached,
>  				       (ops->mode == MTD_OOB_RAW));
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox