gc part of the block at a time to reduce latency
[yaffs2.git] / yaffs_nand.c
index 989e8d9..af42157 100644 (file)
@@ -1,7 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -9,25 +9,30 @@
  * 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.
- *
  */
+
 const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.2 2006-09-21 08:13:59 charles Exp $";
+    "$Id: yaffs_nand.c,v 1.9 2008-05-05 07:58:58 charles Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_tagsvalidity.h"
 
+#include "yaffs_getblockinfo.h"
 
 int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                                           __u8 * buffer,
                                           yaffs_ExtendedTags * tags)
 {
        int result;
-       
+       yaffs_ExtendedTags localTags;
+
        int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
 
+       /* If there are no tags provided, use local tags to get prioritised gc working */
+       if(!tags)
+               tags = &localTags;
+
        if (dev->readChunkWithTagsFromNAND)
                result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
                                                      tags);
@@ -35,14 +40,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
                                                                        realignedChunkInNAND,
                                                                        buffer,
-                                                                       tags);  
-       if(tags && 
+                                                                       tags);
+       if(tags &&
           tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-       
+
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-               bi->gcPrioritise = 1;
+                yaffs_HandleChunkError(dev,bi);
        }
-                                                               
+
        return result;
 }
 
@@ -53,7 +58,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
 {
        chunkInNAND -= dev->chunkOffset;
 
-       
+
        if (tags) {
                tags->sequenceNumber = dev->sequenceNumber;
                tags->chunkUsed = 1;
@@ -94,7 +99,7 @@ int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
 int yaffs_QueryInitialBlockState(yaffs_Device * dev,
                                                 int blockNo,
                                                 yaffs_BlockState * state,
-                                                unsigned *sequenceNumber)
+                                                __u32 *sequenceNumber)
 {
        blockNo -= dev->blockOffset;
 
@@ -118,9 +123,6 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
        dev->nBlockErasures++;
        result = dev->eraseBlockInNAND(dev, blockInNAND);
 
-       /* If at first we don't succeed, try again *once*.*/
-       if (!result)
-               result = dev->eraseBlockInNAND(dev, blockInNAND);       
        return result;
 }
 
@@ -130,4 +132,4 @@ int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
 }
 
 
+