X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fu-boot%2Ffs%2Fyaffs2%2Fyaffs_mtdif2.c;h=78af31edaf153dc39af1e5901a9835a92fa5bccd;hb=1f3d64d1d804fef6715126dead54bf30b176c67e;hp=2f2949187a0093e1834ccf56bc03ed1aef1526af;hpb=80f85303d264f804ea288e1995280345804ec01c;p=yaffs2.git

diff --git a/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c b/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c
index 2f29491..78af31e 100644
--- a/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c
+++ b/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -27,73 +26,66 @@
 #include "linux/time.h"
 
 #include "yaffs_trace.h"
-
 #include "yaffs_packedtags2.h"
 #include "string.h"
 
+#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
+#define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
+
 
-int nandmtd2_WriteChunkWithTagsToNAND(struct yaffs_dev* dev, int chunkInNAND,
-				      const u8 * data,
-				      const struct yaffs_ext_tags * tags)
+/* 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(struct yaffs_dev *dev, int nand_chunk,
+			      const u8 *data,
+			      const struct yaffs_ext_tags *tags)
 {
-	struct mtd_info *mtd = (struct mtd_info *)(dev->driver_context);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 	struct mtd_oob_ops ops;
-#else
-	size_t dummy;
-#endif
+
 	int retval = 0;
 
-	loff_t addr = ((loff_t) chunkInNAND) * dev->data_bytes_per_chunk;
+	loff_t addr;
+	u8 local_spare[128];
 
 	struct yaffs_packed_tags2 pt;
 
-	yaffs_trace(YAFFS_TRACE_MTD,
-		"nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p",
-		chunkInNAND, data, tags);
+	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;
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	if (tags)
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"nandmtd2_write_chunk_tags chunk %d data %p tags %p",
+		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) {
+		struct yaffs_packed_tags2_tags_only *pt2tp;
+		pt2tp =
+		    (struct 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);
-	else
-		BUG(); /* both tags and data should always be present */
-
-	if (data) {
-		ops.mode = MTD_OOB_AUTO;
-		ops.ooblen = sizeof(pt);
-		ops.len = dev->data_bytes_per_chunk;
-		ops.ooboffs = 0;
-		ops.datbuf = (u8 *)data;
-		ops.oobbuf = (void *)&pt;
-		retval = mtd->write_oob(mtd, addr, &ops);
-	} else
-		BUG(); /* both tags and data should always be present */
-#else
-	if (tags) {
-		yaffs_pack_tags2(&pt, tags);
 	}
 
-	if (data && tags) {
-		if (dev->param.use_nand_ecc)
-			retval =
-			    mtd->write_ecc(mtd, addr, dev->data_bytes_per_chunk,
-					   &dummy, data, (u8 *) & pt, NULL);
-		else
-			retval =
-			    mtd->write_ecc(mtd, addr, dev->data_bytes_per_chunk,
-					   &dummy, data, (u8 *) & pt, NULL);
-	} else {
-		if (data)
-			retval =
-			    mtd->write(mtd, addr, dev->data_bytes_per_chunk, &dummy,
-				       data);
-		if (tags)
-			retval =
-			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
-					   (u8 *) & pt);
-
-	}
-#endif
+	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);
 
 	if (retval == 0)
 		return YAFFS_OK;
@@ -101,81 +93,85 @@ int nandmtd2_WriteChunkWithTagsToNAND(struct yaffs_dev* dev, int chunkInNAND,
 		return YAFFS_FAIL;
 }
 
-int nandmtd2_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int chunkInNAND,
-				       u8 * data, struct yaffs_ext_tags * tags)
+int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
+			     u8 *data, struct yaffs_ext_tags *tags)
 {
-	static u8 *spare_buffer = NULL;
-
-	struct mtd_info *mtd = (struct mtd_info *)(dev->driver_context);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	u8 local_spare[128];
 	struct mtd_oob_ops ops;
-#endif
 	size_t dummy;
 	int retval = 0;
-
-	loff_t addr = ((loff_t) chunkInNAND) * dev->data_bytes_per_chunk;
-
+	int local_data = 0;
 	struct yaffs_packed_tags2 pt;
-	
-	if(!spare_buffer)
-		spare_buffer = kmalloc(mtd->oobsize, GFP_NOFS);
+	loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+	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;
 
 	yaffs_trace(YAFFS_TRACE_MTD,
-		"nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p",
-		chunkInNAND, data, tags);
+		"nandmtd2_read_chunk_tags chunk %d data %p tags %p",
+		nand_chunk, data, tags);
+
+	if (dev->param.inband_tags) {
+
+		if (!data) {
+			local_data = 1;
+			data = yaffs_get_temp_buffer(dev);
+		}
+
+	}
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	if (data && !tags)
-		retval = mtd->read(mtd, addr, dev->data_bytes_per_chunk,
-				&dummy, data);
+	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 = sizeof(pt);
-		ops.len = data ? dev->data_bytes_per_chunk : sizeof(pt);
+		ops.ooblen = packed_tags_size;
+		ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size;
 		ops.ooboffs = 0;
 		ops.datbuf = data;
-		ops.oobbuf = spare_buffer;
+		ops.oobbuf = local_spare;
 		retval = mtd->read_oob(mtd, addr, &ops);
 	}
-#else
-	if (data && tags) {
-		if (dev->useNANDECC) {
-			retval =
-			    mtd->read_ecc(mtd, addr, dev->data_bytes_per_chunk,
-					  &dummy, data, dev->spare_buffer,
-					  NULL);
-		} else {
-			retval =
-			    mtd->read_ecc(mtd, addr, dev->data_bytes_per_chunk,
-					  &dummy, data, dev->spare_buffer,
-					  NULL);
+
+	if (dev->param.inband_tags) {
+		if (tags) {
+			struct yaffs_packed_tags2_tags_only *pt2tp;
+			pt2tp =
+				(struct yaffs_packed_tags2_tags_only *)
+				&data[dev->data_bytes_per_chunk];
+			yaffs_unpack_tags2_tags_only(tags, pt2tp);
 		}
 	} else {
-		if (data)
-			retval =
-			    mtd->read(mtd, addr, dev->data_bytes_per_chunk, &dummy,
-				      data);
-		if (tags)
-			retval =
-			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
-					  dev->spare_buffer);
+		if (tags) {
+			memcpy(packed_tags_ptr,
+			       local_spare,
+			       packed_tags_size);
+			yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
+		}
 	}
-#endif
-
-	memcpy(&pt, spare_buffer, sizeof(pt));
 
-	if (tags)
-		yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
+	if (local_data)
+		yaffs_release_temp_buffer(dev, data);
 
-	if(tags && retval == -EBADMSG && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR)
+	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_dev *dev, int blockNo)
 {
 	struct mtd_info *mtd = (struct mtd_info *)(dev->driver_context);
@@ -197,7 +193,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_dev *dev, int blockNo)
 }
 
 int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int blockNo,
-			    enum yaffs_block_state * state, int *sequenceNumber)
+			    enum yaffs_block_state *state, u32 *sequenceNumber)
 {
 	struct mtd_info *mtd = (struct mtd_info *)(dev->driver_context);
 	int retval;
@@ -215,10 +211,10 @@ int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int blockNo,
 		*sequenceNumber = 0;
 	} else {
 		struct yaffs_ext_tags t;
-		nandmtd2_ReadChunkWithTagsFromNAND(dev,
-						   blockNo *
-						   dev->param.chunks_per_block, NULL,
-						   &t);
+		nandmtd2_read_chunk_tags(dev,
+					   blockNo *
+					   dev->param.chunks_per_block, NULL,
+					   &t);
 
 		if (t.chunk_used) {
 			*sequenceNumber = t.seq_number;
@@ -228,7 +224,8 @@ int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int blockNo,
 			*state = YAFFS_BLOCK_STATE_EMPTY;
 		}
 	}
-	yaffs_trace(YAFFS_TRACE_MTD, "block is bad seq %d state %d", *sequenceNumber, *state);
+	yaffs_trace(YAFFS_TRACE_MTD, "block is bad seq %d state %d",
+			*sequenceNumber, *state);
 
 	if (retval == 0)
 		return YAFFS_OK;