[MTD] NAND Expose the new raw mode function and status info to userspace

The raw read/write access to NAND (without ECC) has been changed in the
NAND rework. Expose the new way - setting the file mode via ioctl - to
userspace. Also allow to read out the ecc statistics information so userspace
tools can see that bitflips happened and whether errors where correctable
or not. Also expose the number of bad blocks for the partition, so nandwrite
can check if the data fits into the parition before writing to it.

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

2 files changed, 19 insertions, 10 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 7a3a44907715..ea6d2c334aed 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -347,7 +347,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 {
         struct nand_chip *chip = mtd->priv;
         uint8_t buf[2] = { 0, 0 };
-        int block;
+        int block, ret;
 
         /* Get block number */
         block = ((int)ofs) >> chip->bbt_erase_shift;
@@ -356,16 +356,22 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
         /* Do we have a flash based bad block table ? */
         if (chip->options & NAND_USE_FLASH_BBT)
-                return nand_update_bbt(mtd, ofs);
-
-        /* We write two bytes, so we dont have to mess with 16 bit access */
-        ofs += mtd->oobsize;
-        chip->ops.len = 2;
-        chip->ops.datbuf = NULL;
-        chip->ops.oobbuf = buf;
-        chip->ops.ooboffs = chip->badblockpos & ~0x01;
+                ret = nand_update_bbt(mtd, ofs);
+        else {
+                /* We write two bytes, so we dont have to mess with 16 bit
+                 * access
+                 */
+                ofs += mtd->oobsize;
+                chip->ops.len = 2;
+                chip->ops.datbuf = NULL;
+                chip->ops.oobbuf = buf;
+                chip->ops.ooboffs = chip->badblockpos & ~0x01;
 
-        return nand_do_write_oob(mtd, ofs, &chip->ops);
+                ret = nand_do_write_oob(mtd, ofs, &chip->ops);
+        }
+        if (!ret)
+                mtd->ecc_stats.badblocks++;
+        return ret;
 }
 
 /**
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 480c3cbf9bf9..a612c4ea8194 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -176,6 +176,7 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                         printk(KERN_DEBUG "nand_read_bbt: Reserved block at 0x%08x\n",
                                                ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
                                         this->bbt[offs + (act >> 3)] |= 0x2 << (act & 0x06);
+                                        mtd->ecc_stats.bbtblocks++;
                                         continue;
                                 }
                                 /* Leave it for now, if its matured we can move this
@@ -187,6 +188,7 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                         this->bbt[offs + (act >> 3)] |= 0x3 << (act & 0x06);
                                 else
                                         this->bbt[offs + (act >> 3)] |= 0x1 << (act & 0x06);
+                                mtd->ecc_stats.badblocks++;
                         }
                 }
                 totlen -= len;
@@ -431,6 +433,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
                         this->bbt[i >> 3] |= 0x03 << (i & 0x6);
                         printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
                                i >> 1, (unsigned int)from);
+                        mtd->ecc_stats.badblocks++;
                 }
 
                 i += 2;