[MTD] Rework the out of band handling completely

Hopefully the last iteration on this!

The handling of out of band data on NAND was accompanied by tons of fruitless
discussions and halfarsed patches to make it work for a particular
problem. Sufficiently annoyed by I all those "I know it better" mails and the
resonable amount of discarded "it solves my problem" patches, I finally decided
to go for the big rework. After removing the _ecc variants of mtd read/write
functions the solution to satisfy the various requirements was to refactor the
read/write _oob functions in mtd.

The major change is that read/write_oob now takes a pointer to an operation
descriptor structure "struct mtd_oob_ops".instead of having a function with at
least seven arguments.

read/write_oob which should probably renamed to a more descriptive name, can do
the following tasks:

- read/write out of band data
- read/write data content and out of band data
- read/write raw data content and out of band data (ecc disabled)

struct mtd_oob_ops has a mode field, which determines the oob handling mode.

Aside of the MTD_OOB_RAW mode, which is intended to be especially for
diagnostic purposes and some internal functions e.g. bad block table creation,
the other two modes are for mtd clients:

MTD_OOB_PLACE puts/gets the given oob data exactly to/from the place which is
described by the ooboffs and ooblen fields of the mtd_oob_ops strcuture. It's
up to the caller to make sure that the byte positions are not used by the ECC
placement algorithms.

MTD_OOB_AUTO puts/gets the given oob data automaticaly to/from the places in
the out of band area which are described by the oobfree tuples in the ecclayout
data structre which is associated to the devicee.

The decision whether data plus oob or oob only handling is done depends on the
setting of the datbuf member of the data structure. When datbuf == NULL then
the internal read/write_oob functions are selected, otherwise the read/write
data routines are invoked.

Tested on a few platforms with all variants. Please be aware of possible
regressions for your particular device / application scenario

Disclaimer: Any whining will be ignored from those who just contributed "hot
air blurb" and never sat down to tackle the underlying problem of the mess in
the NAND driver grown over time and the big chunk of work to fix up the
existing users. The problem was not the holiness of the existing MTD
interfaces. The problems was the lack of time to go for the big overhaul. It's
easy to add more mess to the existing one, but it takes alot of effort to go
for a real solution.

Improvements and bugfixes are welcome!

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

1 files changed, 76 insertions, 16 deletions

diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index 359533b33d9b..f6ffe7949b26 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -134,6 +134,69 @@ static void nftl_remove_dev(struct mtd_blktrans_dev *dev)
         kfree(nftl);
 }
 
+/*
+ * Read oob data from flash
+ */
+int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                  size_t *retlen, uint8_t *buf)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs & (mtd->writesize - 1);
+        ops.ooblen = len;
+        ops.oobbuf = buf;
+        ops.datbuf = NULL;
+        ops.len = len;
+
+        res = mtd->read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
+ * Write oob data to flash
+ */
+int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                   size_t *retlen, uint8_t *buf)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs & (mtd->writesize - 1);
+        ops.ooblen = len;
+        ops.oobbuf = buf;
+        ops.datbuf = NULL;
+        ops.len = len;
+
+        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
+ * Write data and oob to flash
+ */
+static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
+                      size_t *retlen, uint8_t *buf, uint8_t *oob)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs;
+        ops.ooblen = mtd->oobsize;
+        ops.oobbuf = oob;
+        ops.datbuf = buf;
+        ops.len = len;
+
+        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
 #ifdef CONFIG_NFTL_RW
 
 /* Actual NFTL access routines */
@@ -216,7 +279,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
 
                 targetEUN = thisEUN;
                 for (block = 0; block < nftl->EraseSize / 512; block ++) {
-                        mtd->read_oob(mtd, (thisEUN * nftl->EraseSize) +
+                        nftl_read_oob(mtd, (thisEUN * nftl->EraseSize) +
                                       (block * 512), 16 , &retlen,
                                       (char *)&oob);
                         if (block == 2) {
@@ -333,7 +396,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                longer one */
                 oob.u.c.FoldMark = oob.u.c.FoldMark1 = cpu_to_le16(FOLD_MARK_IN_PROGRESS);
                 oob.u.c.unused = 0xffffffff;
-                mtd->write_oob(mtd, (nftl->EraseSize * targetEUN) + 2 * 512 + 8,
+                nftl_write_oob(mtd, (nftl->EraseSize * targetEUN) + 2 * 512 + 8,
                                8, &retlen, (char *)&oob.u);
         }
 
@@ -369,17 +432,15 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                 memset(&oob, 0xff, sizeof(struct nftl_oob));
                 oob.b.Status = oob.b.Status1 = SECTOR_USED;
 
-                nand_write_raw(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) +
-                               (block * 512), 512, &retlen, movebuf,
-                               (char *)&oob);
-
+                nftl_write(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) +
+                           (block * 512), 512, &retlen, movebuf, (char *)&oob);
         }
 
         /* add the header so that it is now a valid chain */
         oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum = cpu_to_le16(thisVUC);
         oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum = 0xffff;
 
-        mtd->write_oob(mtd, (nftl->EraseSize * targetEUN) + 8,
+        nftl_write_oob(mtd, (nftl->EraseSize * targetEUN) + 8,
                        8, &retlen, (char *)&oob.u);
 
         /* OK. We've moved the whole lot into the new block. Now we have to free the original blocks. */
@@ -499,7 +560,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 
                         lastEUN = writeEUN;
 
-                        mtd->read_oob(mtd,
+                        nftl_read_oob(mtd,
                                       (writeEUN * nftl->EraseSize) + blockofs,
                                       8, &retlen, (char *)&bci);
 
@@ -588,12 +649,12 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                 nftl->ReplUnitTable[writeEUN] = BLOCK_NIL;
 
                 /* ... and on the flash itself */
-                mtd->read_oob(mtd, writeEUN * nftl->EraseSize + 8, 8,
+                nftl_read_oob(mtd, writeEUN * nftl->EraseSize + 8, 8,
                               &retlen, (char *)&oob.u);
 
                 oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum = cpu_to_le16(thisVUC);
 
-                mtd->write_oob(mtd, writeEUN * nftl->EraseSize + 8, 8,
+                nftl_write_oob(mtd, writeEUN * nftl->EraseSize + 8, 8,
                                &retlen, (char *)&oob.u);
 
                 /* we link the new block to the chain only after the
@@ -603,13 +664,13 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                         /* Both in our cache... */
                         nftl->ReplUnitTable[lastEUN] = writeEUN;
                         /* ... and on the flash itself */
-                        mtd->read_oob(mtd, (lastEUN * nftl->EraseSize) + 8,
+                        nftl_read_oob(mtd, (lastEUN * nftl->EraseSize) + 8,
                                       8, &retlen, (char *)&oob.u);
 
                         oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum
                                 = cpu_to_le16(writeEUN);
 
-                        mtd->write_oob(mtd, (lastEUN * nftl->EraseSize) + 8,
+                        nftl_write_oob(mtd, (lastEUN * nftl->EraseSize) + 8,
                                        8, &retlen, (char *)&oob.u);
                 }
 
@@ -643,9 +704,8 @@ static int nftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,
         memset(&oob, 0xff, sizeof(struct nftl_oob));
         oob.b.Status = oob.b.Status1 = SECTOR_USED;
 
-        nand_write_raw(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) +
-                       blockofs, 512, &retlen, (char *)buffer,
-                       (char *)&oob);
+        nftl_write(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) + blockofs,
+                   512, &retlen, (char *)buffer, (char *)&oob);
         return 0;
 }
 #endif /* CONFIG_NFTL_RW */
@@ -667,7 +727,7 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
 
         if (thisEUN != BLOCK_NIL) {
                 while (thisEUN < nftl->nb_blocks) {
-                        if (mtd->read_oob(mtd, (thisEUN * nftl->EraseSize) +
+                        if (nftl_read_oob(mtd, (thisEUN * nftl->EraseSize) +
                                           blockofs, 8, &retlen,
                                           (char *)&bci) < 0)
                                 status = SECTOR_IGNORE;