From 65ce15f68b6113230a68d6e0c8f3a9ba9afb6fb3 Mon Sep 17 00:00:00 2001 From: charles Date: Thu, 25 May 2006 01:37:27 +0000 Subject: [PATCH] Add Sergey's patch --- patches/yaffs_mtdif2.c | 260 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 patches/yaffs_mtdif2.c diff --git a/patches/yaffs_mtdif2.c b/patches/yaffs_mtdif2.c new file mode 100644 index 0000000..bc6fc70 --- /dev/null +++ b/patches/yaffs_mtdif2.c @@ -0,0 +1,260 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * yaffs_mtdif.c NAND mtd wrapper functions. + * + * Copyright (C) 2002 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Charles Manning + * + * 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 */ + +const char *yaffs_mtdif2_c_version = + "$Id: yaffs_mtdif2.c,v 1.1 2006-05-25 01:37:27 charles Exp $"; + +#include "yportenv.h" + + +#include "yaffs_mtdif2.h" + +#include "linux/mtd/mtd.h" +#include "linux/types.h" +#include "linux/time.h" + +#include "yaffs_packedtags2.h" + + +void nandmtd2_pt2buf(yaffs_Device *dev, yaffs_PackedTags2 *pt, int is_raw) +{ + struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); + __u8 *ptab = (__u8 *)pt; /* packed tags as bytes */ + + int i, j = 0, k, n; + + /* Pack buffer with 0xff */ + for (i = 0; i < mtd->oobsize; i++) + dev->spareBuffer[i] = 0xff; + + if(!is_raw){ + memcpy(dev->spareBuffer,pt,sizeof(yaffs_PackedTags2)); + } else { + j = 0; + k = mtd->oobinfo.oobfree[j][0]; + n = mtd->oobinfo.oobfree[j][1]; + + if (n == 0) { + T(YAFFS_TRACE_ERROR, (TSTR("No OOB space for tags" TENDSTR))); + YBUG(); + } + + for (i = 0; i < sizeof(yaffs_PackedTags2); i++) { + if (n == 0) { + j++; + k = mtd->oobinfo.oobfree[j][0]; + n = mtd->oobinfo.oobfree[j][1]; + if (n == 0) { + T(YAFFS_TRACE_ERROR, (TSTR("No OOB space for tags" TENDSTR))); + YBUG(); + } + } + dev->spareBuffer[k] = ptab[i]; + k++; + n--; + } + } + +} + +void nandmtd2_buf2pt(yaffs_Device *dev, yaffs_PackedTags2 *pt, int is_raw) +{ + struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); + int i, j = 0, k, n; + __u8 *ptab = (__u8 *)pt; /* packed tags as bytes */ + + + if (!is_raw) { + + memcpy(pt,dev->spareBuffer,sizeof(yaffs_PackedTags2)); + } else { + j = 0; + k = mtd->oobinfo.oobfree[j][0]; + n = mtd->oobinfo.oobfree[j][1]; + + if (n == 0) { + T(YAFFS_TRACE_ERROR, (TSTR("No space in OOB for tags" TENDSTR))); + YBUG(); + } + + for (i = 0; i < sizeof(yaffs_PackedTags2); i++) { + if (n == 0) { + j++; + k = mtd->oobinfo.oobfree[j][0]; + n = mtd->oobinfo.oobfree[j][1]; + if (n == 0) { + T(YAFFS_TRACE_ERROR, (TSTR("No space in OOB for tags" TENDSTR))); + YBUG(); + } + } + ptab[i] = dev->spareBuffer[k]; + k++; + n--; + } + } + +} + +int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND, + const __u8 * data, + const yaffs_ExtendedTags * tags) +{ + struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); + size_t dummy; + int retval = 0; + + loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk; + + 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); + } + + if (data && tags) { + nandmtd2_pt2buf(dev, &pt, 0); + retval = + mtd->write_ecc(mtd, addr, dev->nBytesPerChunk, + &dummy, data, dev->spareBuffer, + NULL); + + } else { + + T(YAFFS_TRACE_ALWAYS, + (TSTR + ("Write chunk with null tags or data!" TENDSTR))); + YBUG(); + } + + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; +} + +int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, + __u8 * data, yaffs_ExtendedTags * tags) +{ + struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); + size_t dummy; + int retval = 0; + + 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)); + + if (0 && data && tags) { + retval = + mtd->read_ecc(mtd, addr, dev->nBytesPerChunk, + &dummy, data, dev->spareBuffer, + NULL); + nandmtd2_buf2pt(dev, &pt, 0); + } 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); + nandmtd2_buf2pt(dev, &pt, 1); + } + } + + if (tags) + yaffs_UnpackTags2(tags, &pt); + + 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); + int retval; + T(YAFFS_TRACE_MTD, + (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo)); + + retval = + mtd->block_markbad(mtd, + blockNo * dev->nChunksPerBlock * + dev->nBytesPerChunk); + + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; + +} + +int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, + yaffs_BlockState * state, int *sequenceNumber) +{ + struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice); + 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))); + + *state = YAFFS_BLOCK_STATE_DEAD; + *sequenceNumber = 0; + } 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; + } + + T(YAFFS_TRACE_MTD, + (TSTR("block is OK seq %d state %d" TENDSTR), *sequenceNumber, + *state)); + } + + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; +} + -- 2.30.2