yaffs: Fix some 64-bit issues
[yaffs2.git] / yaffs_mtdif2.c
index ee46296964bb47f1cc0ba509d3584eaeb5f55c92..1c60a444ca8597c2896f232760aa9913ab01167a 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 */
 
-const char *yaffs_mtdif2_c_version =
-    "$Id: yaffs_mtdif2.c,v 1.8 2005-09-20 05:23:41 charles Exp $";
-
 #include "yportenv.h"
-
+#include "yaffs_trace.h"
 
 #include "yaffs_mtdif2.h"
 
@@ -29,47 +24,72 @@ const char *yaffs_mtdif2_c_version =
 
 #include "yaffs_packedtags2.h"
 
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
-                                     const __u8 * data,
-                                     const yaffs_ExtendedTags * tags)
+#include "yaffs_linux.h"
+
+/* NB For use with inband tags....
+ * We assume that the data buffer is of size total_bytes_per_chunk so that we can also
+ * use it to load the tags.
+ */
+int nandmtd2_write_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
+                                     const __u8 *data,
+                                     const yaffs_ext_tags *tags)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+#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;
+       yaffs_packed_tags2 pt;
+
+       int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
+       void * packed_tags_ptr = dev->param.no_tags_ecc ? (void *) &pt.t : (void *)&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) {
-               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);
+          ("nandmtd2_write_chunk_tags chunk %d data %p tags %p"
+           TENDSTR), nand_chunk, data, tags));
+
+
+       addr  = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+
+       /* 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.inband_tags) {
+               yaffs_packed_tags2_tags_only *pt2tp;
+               pt2tp = (yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk);
+               yaffs_pack_tags2_tags_only(pt2tp, tags);
+       } else
+               yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+       ops.mode = MTD_OOB_AUTO;
+       ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size;
+       ops.len = dev->param.total_bytes_per_chunk;
+       ops.ooboffs = 0;
+       ops.datbuf = (__u8 *)data;
+       ops.oobbuf = (dev->param.inband_tags) ? NULL : packed_tags_ptr;
+       retval = mtd->write_oob(mtd, addr, &ops);
+
+#else
+       if (!dev->param.inband_tags) {
+               retval =
+                   mtd->write_ecc(mtd, addr, dev->data_bytes_per_chunk,
+                                  &dummy, data, (__u8 *) packed_tags_ptr, 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);
-
+               retval =
+                   mtd->write(mtd, addr, dev->param.total_bytes_per_chunk, &dummy,
+                              data);
        }
+#endif
 
        if (retval == 0)
                return YAFFS_OK;
@@ -77,67 +97,113 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
                return YAFFS_FAIL;
 }
 
-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-                                      __u8 * data, yaffs_ExtendedTags * tags)
+int nandmtd2_read_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
+                                      __u8 *data, yaffs_ext_tags *tags)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
+       struct mtd_oob_ops ops;
+#endif
        size_t dummy;
        int retval = 0;
+       int local_data = 0;
 
-       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+       loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
 
-       yaffs_PackedTags2 pt;
+       yaffs_packed_tags2 pt;
+
+       int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
+       void * packed_tags_ptr = dev->param.no_tags_ecc ? (void *) &pt.t: (void *)&pt;
 
        T(YAFFS_TRACE_MTD,
          (TSTR
-          ("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p"
-           TENDSTR), chunkInNAND, data, tags));
+          ("nandmtd2_read_chunk_tags chunk %d data %p tags %p"
+           TENDSTR), nand_chunk, data, tags));
 
-       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);
+       if (dev->param.inband_tags) {
+
+               if (!data) {
+                       local_data = 1;
+                       data = yaffs_get_temp_buffer(dev, __LINE__);
                }
+
+
+       }
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+       if (dev->param.inband_tags || (data && !tags))
+               retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk,
+                               &dummy, data);
+       else if (tags) {
+               ops.mode = MTD_OOB_AUTO;
+               ops.ooblen = packed_tags_size;
+               ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size;
+               ops.ooboffs = 0;
+               ops.datbuf = data;
+               ops.oobbuf = yaffs_dev_to_lc(dev)->spare_buffer;
+               retval = mtd->read_oob(mtd, addr, &ops);
+       }
+#else
+       if (!dev->param.inband_tags && data && tags) {
+
+               retval = mtd->read_ecc(mtd, addr, dev->data_bytes_per_chunk,
+                                         &dummy, data, dev->spare_buffer,
+                                         NULL);
        } else {
                if (data)
                        retval =
-                           mtd->read(mtd, addr, dev->nBytesPerChunk, &dummy,
+                           mtd->read(mtd, addr, dev->data_bytes_per_chunk, &dummy,
                                      data);
-               if (tags)
+               if (!dev->param.inband_tags && tags)
                        retval =
                            mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
-                                         dev->spareBuffer);
+                                         dev->spare_buffer);
        }
+#endif
 
-       memcpy(&pt, dev->spareBuffer, sizeof(pt));
 
-       if (tags)
-               yaffs_UnpackTags2(tags, &pt);
+       if (dev->param.inband_tags) {
+               if (tags) {
+                       yaffs_packed_tags2_tags_only *pt2tp;
+                       pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+                       yaffs_unpack_tags2_tags_only(tags, pt2tp);
+               }
+       } else {
+               if (tags) {
+                       memcpy(packed_tags_ptr, yaffs_dev_to_lc(dev)->spare_buffer, packed_tags_size);
+                       yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
+               }
+       }
+
+       if (local_data)
+               yaffs_release_temp_buffer(dev, data, __LINE__);
 
+       if (tags && retval == -EBADMSG && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
+               tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+               dev->n_ecc_unfixed++;
+       }
+       if(tags && retval == -EUCLEAN && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
+               tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
+               dev->n_ecc_fixed++;
+       }
        if (retval == 0)
                return YAFFS_OK;
        else
                return YAFFS_FAIL;
 }
 
-int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
+int nandmtd2_mark_block_bad(struct yaffs_dev_s *dev, int block_no)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int retval;
        T(YAFFS_TRACE_MTD,
-         (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo));
+         (TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no));
 
        retval =
            mtd->block_markbad(mtd,
-                              blockNo * dev->nChunksPerBlock *
-                              dev->nBytesPerChunk);
+                              block_no * dev->param.chunks_per_block *
+                              dev->param.total_bytes_per_chunk);
 
        if (retval == 0)
                return YAFFS_OK;
@@ -146,41 +212,40 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 
 }
 
-int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-                           yaffs_BlockState * state, int *sequenceNumber)
+int nandmtd2_query_block(struct yaffs_dev_s *dev, int block_no,
+                           yaffs_block_state_t *state, __u32 *seq_number)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int retval;
 
        T(YAFFS_TRACE_MTD,
-         (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), blockNo));
+         (TSTR("nandmtd2_query_block %d" TENDSTR), block_no));
        retval =
            mtd->block_isbad(mtd,
-                            blockNo * dev->nChunksPerBlock *
-                            dev->nBytesPerChunk);
+                            block_no * dev->param.chunks_per_block *
+                            dev->param.total_bytes_per_chunk);
 
        if (retval) {
                T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
 
                *state = YAFFS_BLOCK_STATE_DEAD;
-               *sequenceNumber = 0;
+               *seq_number = 0;
        } else {
-               yaffs_ExtendedTags t;
-               nandmtd2_ReadChunkWithTagsFromNAND(dev,
-                                                  blockNo *
-                                                  dev->nChunksPerBlock, NULL,
+               yaffs_ext_tags t;
+               nandmtd2_read_chunk_tags(dev, block_no *
+                                                  dev->param.chunks_per_block, NULL,
                                                   &t);
 
-               if (t.chunkUsed) {
-                       *sequenceNumber = t.sequenceNumber;
+               if (t.chunk_used) {
+                       *seq_number = t.seq_number;
                        *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
                } else {
-                       *sequenceNumber = 0;
+                       *seq_number = 0;
                        *state = YAFFS_BLOCK_STATE_EMPTY;
                }
        }
        T(YAFFS_TRACE_MTD,
-         (TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,
+         (TSTR("block is bad seq %d state %d" TENDSTR), *seq_number,
           *state));
 
        if (retval == 0)