X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=2f658e68aadacf37eca09f30e34bb584e018cd5a;hp=f56b311bbae4a814a4aeb836feccbad3bec214e5;hb=e1ac494e05a5dc7ab61d799af815d103a11d318c;hpb=b9d0902ef84af3e242f6a95fb7a1b79e1eb94aa8 diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c index f56b311..2f658e6 100644 --- a/yaffs_checkptrw.c +++ b/yaffs_checkptrw.c @@ -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 @@ -9,11 +9,10 @@ * 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_checkptrw_c_version = - "$Id: yaffs_checkptrw.c,v 1.3 2006-05-21 09:39:12 charles Exp $"; + "$Id: yaffs_checkptrw.c,v 1.13 2007-02-14 01:09:06 wookey Exp $"; #include "yaffs_checkptrw.h" @@ -43,13 +42,13 @@ static int yaffs_CheckpointErase(yaffs_Device *dev) if(!dev->eraseBlockInNAND) return 0; T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR), - dev->startBlock,dev->endBlock)); + dev->internalStartBlock,dev->internalEndBlock)); - for(i = dev->startBlock; i <= dev->endBlock; i++) { - yaffs_BlockInfo *bi = &dev->blockInfo[i]; + for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) { + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i); if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){ T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i)); - if(dev->eraseBlockInNAND(dev,i)){ + if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){ bi->blockState = YAFFS_BLOCK_STATE_EMPTY; dev->nErasedBlocks++; dev->nFreeChunks += dev->nChunksPerBlock; @@ -71,16 +70,18 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev) { int i; int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks; + T(YAFFS_TRACE_CHECKPOINT, + (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR), + dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock)); if(dev->checkpointNextBlock >= 0 && - dev->checkpointNextBlock <= dev->endBlock && + dev->checkpointNextBlock <= dev->internalEndBlock && blocksAvailable > 0){ - for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){ - yaffs_BlockInfo *bi = &dev->blockInfo[i]; + for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){ + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i); if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){ dev->checkpointNextBlock = i + 1; - dev->nErasedBlocks--; dev->checkpointCurrentBlock = i; T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i)); return; @@ -98,11 +99,17 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev) int i; yaffs_ExtendedTags tags; + T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start: blocks %d next %d" TENDSTR), + dev->blocksInCheckpoint, dev->checkpointNextBlock)); + if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks) - for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){ + for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){ int chunk = i * dev->nChunksPerBlock; + int realignedChunk = chunk - dev->chunkOffset; - dev->readChunkWithTagsFromNAND(dev,chunk,NULL,&tags); + dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags); + T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR), + i, tags.objectId,tags.sequenceNumber,tags.eccResult)); if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){ /* Right kind of block */ @@ -136,7 +143,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting) return 0; if(!dev->checkpointBuffer) - dev->checkpointBuffer = YMALLOC(dev->nBytesPerChunk); + dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk); if(!dev->checkpointBuffer) return 0; @@ -148,11 +155,11 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting) dev->checkpointByteCount = 0; dev->checkpointCurrentBlock = -1; dev->checkpointCurrentChunk = -1; - dev->checkpointNextBlock = dev->startBlock; + dev->checkpointNextBlock = dev->internalStartBlock; /* Erase all the blocks in the checkpoint area */ if(forWriting){ - memset(dev->checkpointBuffer,0,dev->nBytesPerChunk); + memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk); dev->checkpointByteOffset = 0; return yaffs_CheckpointErase(dev); @@ -160,11 +167,11 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting) } else { int i; /* Set to a value that will kick off a read */ - dev->checkpointByteOffset = dev->nBytesPerChunk; + dev->checkpointByteOffset = dev->nDataBytesPerChunk; /* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully) * going to be way more than we need */ dev->blocksInCheckpoint = 0; - dev->checkpointMaxBlocks = (dev->endBlock - dev->startBlock)/16 + 2; + dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2; dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks); for(i = 0; i < dev->checkpointMaxBlocks; i++) dev->checkpointBlockList[i] = -1; @@ -177,6 +184,7 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) { int chunk; + int realignedChunk; yaffs_ExtendedTags tags; @@ -192,11 +200,24 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */ tags.chunkId = dev->checkpointPageSequence + 1; tags.sequenceNumber = YAFFS_SEQUENCE_CHECKPOINT_DATA; - tags.byteCount = dev->nBytesPerChunk; + tags.byteCount = dev->nDataBytesPerChunk; + if(dev->checkpointCurrentChunk == 0){ + /* First chunk we write for the block? Set block state to + checkpoint */ + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock); + bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT; + dev->blocksInCheckpoint++; + } chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk; - - dev->writeChunkWithTagsToNAND(dev,chunk,dev->checkpointBuffer,&tags); + + + T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR), + chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId)); + + realignedChunk = chunk - dev->chunkOffset; + + dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags); dev->checkpointByteOffset = 0; dev->checkpointPageSequence++; dev->checkpointCurrentChunk++; @@ -204,7 +225,7 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) dev->checkpointCurrentChunk = 0; dev->checkpointCurrentBlock = -1; } - memset(dev->checkpointBuffer,0,dev->nBytesPerChunk); + memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk); return 1; } @@ -235,7 +256,7 @@ int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes) if(dev->checkpointByteOffset < 0 || - dev->checkpointByteOffset >= dev->nBytesPerChunk) + dev->checkpointByteOffset >= dev->nDataBytesPerChunk) ok = yaffs_CheckpointFlushBuffer(dev); } @@ -251,6 +272,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) int chunk; + int realignedChunk; __u8 *dataBytes = (__u8 *)data; @@ -261,7 +283,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) if(dev->checkpointByteOffset < 0 || - dev->checkpointByteOffset >= dev->nBytesPerChunk) { + dev->checkpointByteOffset >= dev->nDataBytesPerChunk) { if(dev->checkpointCurrentBlock < 0){ yaffs_CheckpointFindNextCheckpointBlock(dev); @@ -275,9 +297,11 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk; + realignedChunk = chunk - dev->chunkOffset; + /* read in the next chunk */ /* printf("read checkpoint page %d\n",dev->checkpointPage); */ - dev->readChunkWithTagsFromNAND(dev, chunk, + dev->readChunkWithTagsFromNAND(dev, realignedChunk, dev->checkpointBuffer, &tags); @@ -315,7 +339,7 @@ int yaffs_CheckpointClose(yaffs_Device *dev) } else { int i; for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){ - yaffs_BlockInfo *bi = &dev->blockInfo[dev->checkpointBlockList[i]]; + yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]); if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY) bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT; else {