[MTD] NAND: Honour autoplacement schemes supplied by the caller

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 10 insertions, 3 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c1a971ca57e6..f1db0bf9306b 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -59,7 +59,7 @@
  *      The AG-AND chips have nice features for speed improvement,
  *      which are not supported yet. Read / program 4 pages in one go.
  *
- * $Id: nand_base.c,v 1.142 2005/04/11 14:16:07 lavinen Exp $
+ * $Id: nand_base.c,v 1.143 2005/05/19 16:10:22 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -1195,7 +1195,8 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 }       
 
                 /* get oob area, if we have no oob buffer from fs-driver */
-                if (!oob_buf || oobsel->useecc == MTD_NANDECC_AUTOPLACE)
+                if (!oob_buf || oobsel->useecc == MTD_NANDECC_AUTOPLACE ||
+                        oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
                         oob_data = &this->data_buf[end];
 
                 eccsteps = this->eccsteps;
@@ -1284,6 +1285,7 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                         /* without autoplace. Legacy mode used by YAFFS1 */
                         switch(oobsel->useecc) {
                         case MTD_NANDECC_AUTOPLACE:
+                        case MTD_NANDECC_AUTOPL_USR:
                                 /* Walk through the autoplace chunks */
                                 for (i = 0; oobsel->oobfree[i][1]; i++) {
                                         int from = oobsel->oobfree[i][0];
@@ -1645,6 +1647,8 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
                 oobsel = this->autooob;
                 autoplace = 1;
         }       
+        if (oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
+                autoplace = 1;
 
         /* Setup variables and oob buffer */
         totalpages = len >> this->page_shift;
@@ -1919,6 +1923,8 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsig
                 oobsel = this->autooob;
                 autoplace = 1;
         }       
+        if (oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
+                autoplace = 1;
 
         /* Setup start page */
         page = (int) (to >> this->page_shift);
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index cacb9842b195..428d9122940b 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mtd-abi.h,v 1.10 2005/02/09 09:17:42 pavlov Exp $
+ * $Id: mtd-abi.h,v 1.11 2005/05/19 16:08:58 gleixner Exp $
  *
  * Portions of MTD ABI definition which are shared by kernel and user space 
  */
@@ -61,6 +61,7 @@ struct mtd_oob_buf {
 #define MTD_NANDECC_PLACE       1       // Use the given placement in the structure (YAFFS1 legacy mode)
 #define MTD_NANDECC_AUTOPLACE   2       // Use the default placement scheme
 #define MTD_NANDECC_PLACEONLY   3       // Use the given placement in the structure (Do not store ecc result on read)
+#define MTD_NANDECC_AUTOPL_USR  4       // Use the given autoplacement scheme rather than using the default
 
 /* OTP mode selection */
 #define MTD_OTP_OFF             0