yaffs: Improve debug chunk erased checking, change refreshPeriod
[yaffs2.git] / yaffs_mtdif2.c
index 9cf9828ed749e8d30dc6b039c226f6e33f5f020e..c1d447819970e7ccab5a81bc0e7b576ae807b233 100644 (file)
@@ -1,8 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * yaffs_mtdif.c  NAND mtd wrapper functions.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  * 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
  * published by the Free Software Foundation.
- *
  */
 
-// mtd interface for YAFFS2
+/* mtd interface for YAFFS2 */
 
-const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.6 2005-08-01 20:52:35 luc Exp $";
 #include "yportenv.h"
-
-#ifdef CONFIG_YAFFS_YAFFS1
+#include "yaffs_trace.h"
 
 #include "yaffs_mtdif2.h"
 
@@ -29,148 +24,234 @@ const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.6 2005-08-01 20:52
 
 #include "yaffs_packedtags2.h"
 
+#include "yaffs_linux.h"
 
-
-
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+/* NB For use with inband tags....
+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
+ * use it to load the tags.
+ */
+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
+                                     const __u8 *data,
+                                     const yaffs_ExtendedTags *tags)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+#else
        size_t dummy;
+#endif
        int retval = 0;
 
-
-       loff_t addr = ((loff_t)chunkInNAND) * dev->nBytesPerChunk;
+       loff_t addr;
 
        yaffs_PackedTags2 pt;
-       
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p" TENDSTR),chunkInNAND,data,tags));  
 
-       if(tags)
-       {
-               yaffs_PackTags2(&pt,tags);
-       }
+       int packed_tags_size = dev->param.noTagsECC ? sizeof(pt.t) : sizeof(pt);
+       void * packed_tags_ptr = dev->param.noTagsECC ? (void *) &pt.t : (void *)&pt;
 
-       if(data && tags)
-       {
-               if(dev->useNANDECC)
-                 retval = mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,(__u8 *)&pt,NULL);
-               else
-                 retval = mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,(__u8 *)&pt,NULL);
-       }
-       else
-       {
-       if(data)
-               retval = mtd->write(mtd,addr,dev->nBytesPerChunk,&dummy,data);
-       if(tags)
-               retval = mtd->write_oob(mtd,addr,mtd->oobsize,&dummy,(__u8 *)&pt);
-               
+       T(YAFFS_TRACE_MTD,
+         (TSTR
+          ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
+           TENDSTR), chunkInNAND, data, tags));
+
+
+       addr  = ((loff_t) chunkInNAND) * dev->param.totalBytesPerChunk;
+
+       /* For yaffs2 writing there must be both data and tags.
+        * If we're using inband tags, then the tags are stuffed into
+        * the end of the data buffer.
+        */
+       if (!data || !tags)
+               BUG();
+       else if (dev->param.inbandTags) {
+               yaffs_PackedTags2TagsPart *pt2tp;
+               pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
+               yaffs_PackTags2TagsPart(pt2tp, tags);
+       } else
+               yaffs_PackTags2(&pt, tags, !dev->param.noTagsECC);
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+       ops.mode = MTD_OOB_AUTO;
+       ops.ooblen = (dev->param.inbandTags) ? 0 : packed_tags_size;
+       ops.len = dev->param.totalBytesPerChunk;
+       ops.ooboffs = 0;
+       ops.datbuf = (__u8 *)data;
+       ops.oobbuf = (dev->param.inbandTags) ? NULL : packed_tags_ptr;
+       retval = mtd->write_oob(mtd, addr, &ops);
+
+#else
+       if (!dev->param.inbandTags) {
+               retval =
+                   mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
+                                  &dummy, data, (__u8 *) packed_tags_ptr, NULL);
+       } else {
+               retval =
+                   mtd->write(mtd, addr, dev->param.totalBytesPerChunk, &dummy,
+                              data);
        }
+#endif
 
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
+                                      __u8 *data, yaffs_ExtendedTags *tags)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+#endif
        size_t dummy;
-        int retval = 0;
-       
+       int retval = 0;
+       int localData = 0;
+
+       loff_t addr = ((loff_t) chunkInNAND) * dev->param.totalBytesPerChunk;
 
-       loff_t addr = ((loff_t)chunkInNAND) * dev->nBytesPerChunk;
-       
        yaffs_PackedTags2 pt;
 
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p" TENDSTR),chunkInNAND,data,tags));   
+       int packed_tags_size = dev->param.noTagsECC ? sizeof(pt.t) : sizeof(pt);
+       void * packed_tags_ptr = dev->param.noTagsECC ? (void *) &pt.t: (void *)&pt;
 
-       if(data && tags)
-       {
-               if(dev->useNANDECC)
-               {
-                       retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,dev->spareBuffer,NULL);            
-               }
-               else
-               {
-                       retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,dev->spareBuffer,NULL);
+       T(YAFFS_TRACE_MTD,
+         (TSTR
+          ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
+           TENDSTR), chunkInNAND, data, tags));
+
+       if (dev->param.inbandTags) {
+
+               if (!data) {
+                       localData = 1;
+                       data = yaffs_GetTempBuffer(dev, __LINE__);
                }
+
+
        }
-       else
-       {
-       if(data)
-               retval = mtd->read(mtd,addr,dev->nBytesPerChunk,&dummy,data);
-       if(tags)
-               retval = mtd->read_oob(mtd,addr,mtd->oobsize,&dummy,dev->spareBuffer);
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+       if (dev->param.inbandTags || (data && !tags))
+               retval = mtd->read(mtd, addr, dev->param.totalBytesPerChunk,
+                               &dummy, data);
+       else if (tags) {
+               ops.mode = MTD_OOB_AUTO;
+               ops.ooblen = packed_tags_size;
+               ops.len = data ? dev->nDataBytesPerChunk : packed_tags_size;
+               ops.ooboffs = 0;
+               ops.datbuf = data;
+               ops.oobbuf = yaffs_DeviceToContext(dev)->spareBuffer;
+               retval = mtd->read_oob(mtd, addr, &ops);
+       }
+#else
+       if (!dev->param.inbandTags && data && tags) {
+
+               retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
+                                         &dummy, data, dev->spareBuffer,
+                                         NULL);
+       } else {
+               if (data)
+                       retval =
+                           mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
+                                     data);
+               if (!dev->param.inbandTags && tags)
+                       retval =
+                           mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
+                                         dev->spareBuffer);
+       }
+#endif
+
+
+       if (dev->param.inbandTags) {
+               if (tags) {
+                       yaffs_PackedTags2TagsPart *pt2tp;
+                       pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
+                       yaffs_UnpackTags2TagsPart(tags, pt2tp);
+               }
+       } else {
+               if (tags) {
+                       memcpy(packed_tags_ptr, yaffs_DeviceToContext(dev)->spareBuffer, packed_tags_size);
+                       yaffs_UnpackTags2(tags, &pt, !dev->param.noTagsECC);
+               }
        }
 
-    memcpy(&pt,dev->spareBuffer,sizeof(pt));
-    
-    if(tags)
-       yaffs_UnpackTags2(tags,&pt);
-    
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       if (localData)
+               yaffs_ReleaseTempBuffer(dev, data, __LINE__);
+
+       if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) {
+               tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+               dev->eccUnfixed++;
+       }
+       if(tags && retval == -EUCLEAN && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) {
+               tags->eccResult = YAFFS_ECC_RESULT_FIXED;
+               dev->eccFixed++;
+       }
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
 int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
        int retval;
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR),blockNo));      
-       
-       
-       retval = mtd->block_markbad(mtd,blockNo * dev->nChunksPerBlock * dev->nBytesPerChunk);
+       T(YAFFS_TRACE_MTD,
+         (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo));
 
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       retval =
+           mtd->block_markbad(mtd,
+                              blockNo * dev->param.nChunksPerBlock *
+                              dev->param.totalBytesPerChunk);
+
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 
 }
 
-int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, int *sequenceNumber)
+int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+                           yaffs_BlockState *state, __u32 *sequenceNumber)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
        int retval;
-       
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR),blockNo));        
-       retval = mtd->block_isbad(mtd,blockNo* dev->nChunksPerBlock * dev->nBytesPerChunk);
-       
-       if(retval)
-       {
-               T(YAFFS_TRACE_MTD,(TSTR("block is bad" TENDSTR)));
-       
+
+       T(YAFFS_TRACE_MTD,
+         (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), blockNo));
+       retval =
+           mtd->block_isbad(mtd,
+                            blockNo * dev->param.nChunksPerBlock *
+                            dev->param.totalBytesPerChunk);
+
+       if (retval) {
+               T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
+
                *state = YAFFS_BLOCK_STATE_DEAD;
                *sequenceNumber = 0;
-       }
-       else
-       {
+       } else {
                yaffs_ExtendedTags t;
-               nandmtd2_ReadChunkWithTagsFromNAND(dev,blockNo * dev->nChunksPerBlock,NULL, &t);
-               
-               if(t.chunkUsed)
-               {
-                 *sequenceNumber = t.sequenceNumber;
-                 *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-               }
-               else
-               {
-                 *sequenceNumber = 0;
-                 *state = YAFFS_BLOCK_STATE_EMPTY;
+               nandmtd2_ReadChunkWithTagsFromNAND(dev,
+                                                  blockNo *
+                                                  dev->param.nChunksPerBlock, NULL,
+                                                  &t);
+
+               if (t.chunkUsed) {
+                       *sequenceNumber = t.sequenceNumber;
+                       *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+               } else {
+                       *sequenceNumber = 0;
+                       *state = YAFFS_BLOCK_STATE_EMPTY;
                }
        }
-               T(YAFFS_TRACE_MTD,(TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,*state));
+       T(YAFFS_TRACE_MTD,
+         (TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,
+          *state));
 
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
-#endif
-
-
-