X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=f5c3be869565822a70b5101ee50c434a2ab945dc;hp=d8970449b04812de994f85737f749fe6120c0e7b;hb=HEAD;hpb=662466a25f6c97bba330ad5d9e9ba215ca8874ee

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index d897044..f5c3be8 100644
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 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>
  *
@@ -13,6 +12,7 @@
 
 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
+#include "yaffs_endian.h"
 
 struct yaffs_checkpt_chunk_hdr {
 	int version;
@@ -21,6 +21,29 @@ struct yaffs_checkpt_chunk_hdr {
 	u32 xor;
 } ;
 
+
+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
+{
+	return chunk - dev->chunk_offset;
+}
+
+static int apply_block_offset(struct yaffs_dev *dev, int block)
+{
+	return block - dev->block_offset;
+}
+
+
+static void yaffs2_do_endian_hdr(struct yaffs_dev *dev,
+				 struct yaffs_checkpt_chunk_hdr *hdr)
+{
+	if (!dev->swap_endian)
+		return;
+	hdr->version = swap_s32(hdr->version);
+	hdr->seq     = swap_s32(hdr->seq);
+	hdr->sum     = swap_u32(hdr->sum);
+	hdr->xor     = swap_u32(hdr->xor);
+}
+
 static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev)
 {
 	struct yaffs_checkpt_chunk_hdr hdr;
@@ -32,6 +55,7 @@ static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev)
 
 	dev->checkpt_byte_offs = sizeof(hdr);
 
+	yaffs2_do_endian_hdr(dev, &hdr);
 	memcpy(dev->checkpt_buffer, &hdr, sizeof(hdr));
 }
 
@@ -40,6 +64,7 @@ static int yaffs2_checkpt_check_chunk_hdr(struct yaffs_dev *dev)
 	struct yaffs_checkpt_chunk_hdr hdr;
 
 	memcpy(&hdr, dev->checkpt_buffer, sizeof(hdr));
+	yaffs2_do_endian_hdr(dev, &hdr);
 
 	dev->checkpt_byte_offs = sizeof(hdr);
 
@@ -61,9 +86,9 @@ static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
 
 static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 
-	if (!dev->param.erase_fn)
+	if (!dev->drv.drv_erase_fn)
 		return 0;
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
 		"checking blocks %d to %d",
@@ -71,21 +96,23 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
 	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
 		struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
+		int offset_i = apply_block_offset(dev, i);
+		int result;
+
 		if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
 			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
 			"erasing checkpt block %d", i);
 
 			dev->n_erasures++;
 
-			if (dev->param.
-			    erase_fn(dev,
-				     i - dev->block_offset /* realign */)) {
+			result = dev->drv.drv_erase_fn(dev, offset_i);
+			if(result) {
 				bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
 				dev->n_erased_blocks++;
 				dev->n_free_chunks +=
 				    dev->param.chunks_per_block;
 			} else {
-				dev->param.bad_block_fn(dev, i);
+				dev->drv.drv_mark_bad_fn(dev, offset_i);
 				bi->block_state = YAFFS_BLOCK_STATE_DEAD;
 			}
 		}
@@ -98,7 +125,7 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
 static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
 
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -107,13 +134,14 @@ static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 		blocks_avail, dev->checkpt_next_block);
 
 	if (dev->checkpt_next_block >= 0 &&
-	    dev->checkpt_next_block <= dev->internal_end_block &&
+	    dev->checkpt_next_block <= (int)dev->internal_end_block &&
 	    blocks_avail > 0) {
 
 		for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
 		     i++) {
-			struct yaffs_block_info *bi =
-			    yaffs_get_block_info(dev, i);
+			struct yaffs_block_info *bi;
+
+			bi = yaffs_get_block_info(dev, i);
 			if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
 				dev->checkpt_next_block = i + 1;
 				dev->checkpt_cur_block = i;
@@ -131,7 +159,7 @@ static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 
 static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 	struct yaffs_ext_tags tags;
 
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -142,12 +170,12 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 		for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
 		     i++) {
 			int chunk = i * dev->param.chunks_per_block;
-			int realigned_chunk = chunk - dev->chunk_offset;
 			enum yaffs_block_state state;
 			u32 seq;
 
-			dev->param.read_chunk_tags_fn(dev, realigned_chunk,
-						      NULL, &tags);
+			dev->tagger.read_chunk_tags_fn(dev,
+					apply_chunk_offset(dev, chunk),
+					NULL, &tags);
 			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
 				"find next checkpt block: search: block %d state %d oid %d seq %d eccr %d",
 				i, (int) state,
@@ -157,7 +185,9 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 			if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
 				continue;
 
-			dev->param.query_block_fn(dev, i, &state, &seq);
+			dev->tagger.query_block_fn(dev,
+						apply_block_offset(dev, i),
+						&state, &seq);
 			if (state == YAFFS_BLOCK_STATE_DEAD)
 				continue;
 
@@ -179,14 +209,15 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 
 int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 {
-	int i;
+	u32 i;
 
 	dev->checkpt_open_write = writing;
 
 	/* Got the functions we need? */
-	if (!dev->param.write_chunk_tags_fn ||
-	    !dev->param.read_chunk_tags_fn ||
-	    !dev->param.erase_fn || !dev->param.bad_block_fn)
+	if (!dev->tagger.write_chunk_tags_fn ||
+	    !dev->tagger.read_chunk_tags_fn ||
+	    !dev->drv.drv_erase_fn ||
+	    !dev->drv.drv_mark_bad_fn)
 		return 0;
 
 	if (writing && !yaffs2_checkpt_space_ok(dev))
@@ -220,8 +251,9 @@ int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 	dev->blocks_in_checkpt = 0;
 	dev->checkpt_max_blocks =
 	    (dev->internal_end_block - dev->internal_start_block) / 16 + 2;
-	dev->checkpt_block_list =
-	    kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
+	if (!dev->checkpt_block_list)
+		dev->checkpt_block_list =
+		      kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
 
 	if (!dev->checkpt_block_list)
 		return 0;
@@ -244,7 +276,7 @@ int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
 static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 {
 	int chunk;
-	int realigned_chunk;
+	int offset_chunk;
 	struct yaffs_ext_tags tags;
 
 	if (dev->checkpt_cur_block < 0) {
@@ -278,15 +310,15 @@ static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 		chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk,
 		tags.obj_id, tags.chunk_id);
 
-	realigned_chunk = chunk - dev->chunk_offset;
+	offset_chunk = apply_chunk_offset(dev, chunk);
 
 	dev->n_page_writes++;
 
-	dev->param.write_chunk_tags_fn(dev, realigned_chunk,
+	dev->tagger.write_chunk_tags_fn(dev, offset_chunk,
 				       dev->checkpt_buffer, &tags);
 	dev->checkpt_page_seq++;
 	dev->checkpt_cur_chunk++;
-	if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
+	if (dev->checkpt_cur_chunk >= (int)dev->param.chunks_per_block) {
 		dev->checkpt_cur_chunk = 0;
 		dev->checkpt_cur_block = -1;
 	}
@@ -321,7 +353,7 @@ int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
 		dev->checkpt_byte_count++;
 
 		if (dev->checkpt_byte_offs < 0 ||
-		    dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
+		    dev->checkpt_byte_offs >= (int)dev->data_bytes_per_chunk)
 			ok = yaffs2_checkpt_flush_buffer(dev);
 	}
 
@@ -331,10 +363,9 @@ int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
 int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 {
 	int i = 0;
-	int ok = 1;
 	struct yaffs_ext_tags tags;
 	int chunk;
-	int realigned_chunk;
+	int offset_chunk;
 	u8 *data_bytes = (u8 *) data;
 
 	if (!dev->checkpt_buffer)
@@ -343,50 +374,48 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 	if (dev->checkpt_open_write)
 		return -1;
 
-	while (i < n_bytes && ok) {
+	while (i < n_bytes) {
 
 		if (dev->checkpt_byte_offs < 0 ||
-		    dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
+		    dev->checkpt_byte_offs >= (int)dev->data_bytes_per_chunk) {
 
 			if (dev->checkpt_cur_block < 0) {
 				yaffs2_checkpt_find_block(dev);
 				dev->checkpt_cur_chunk = 0;
 			}
 
-			if (dev->checkpt_cur_block < 0) {
-				ok = 0;
+			/* Bail out if we can't find a checpoint block */
+			if (dev->checkpt_cur_block < 0)
 				break;
-			}
 
 			chunk = dev->checkpt_cur_block *
 			    dev->param.chunks_per_block +
 			    dev->checkpt_cur_chunk;
 
-			realigned_chunk = chunk - dev->chunk_offset;
+			offset_chunk = apply_chunk_offset(dev, chunk);
 			dev->n_page_reads++;
 
-			/* read in the next chunk */
-			dev->param.read_chunk_tags_fn(dev,
-						realigned_chunk,
+			/* Read in the next chunk */
+			dev->tagger.read_chunk_tags_fn(dev,
+						offset_chunk,
 						dev->checkpt_buffer,
 						&tags);
 
-			if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
+			/* Bail out if the chunk is corrupted. */
+			if (tags.chunk_id != (u32)(dev->checkpt_page_seq + 1) ||
 			    tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
-			    tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) {
-				ok = 0;
+			    tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
 				break;
-			}
-			if(!yaffs2_checkpt_check_chunk_hdr(dev)) {
-				ok = 0;
+
+			/* Bail out if it is not a checkpoint chunk. */
+			if(!yaffs2_checkpt_check_chunk_hdr(dev))
 				break;
-			}
 
 			dev->checkpt_page_seq++;
 			dev->checkpt_cur_chunk++;
 
 			if (dev->checkpt_cur_chunk >=
-					dev->param.chunks_per_block)
+					(int)dev->param.chunks_per_block)
 				dev->checkpt_cur_block = -1;
 
 		}
@@ -400,16 +429,16 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 		dev->checkpt_byte_count++;
 	}
 
-	return i;
+	return i; /* Number of bytes read */
 }
 
 int yaffs_checkpt_close(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 
 	if (dev->checkpt_open_write) {
 		if (dev->checkpt_byte_offs !=
-			sizeof(sizeof(struct yaffs_checkpt_chunk_hdr)))
+			sizeof(struct yaffs_checkpt_chunk_hdr))
 			yaffs2_checkpt_flush_buffer(dev);
 	} else if (dev->checkpt_block_list) {
 		for (i = 0;
@@ -418,14 +447,12 @@ int yaffs_checkpt_close(struct yaffs_dev *dev)
 			int blk = dev->checkpt_block_list[i];
 			struct yaffs_block_info *bi = NULL;
 
-			if (dev->internal_start_block <= blk &&
-			    blk <= dev->internal_end_block)
+			if ((int)dev->internal_start_block <= blk &&
+			    blk <= (int)dev->internal_end_block)
 				bi = yaffs_get_block_info(dev, blk);
 			if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
 				bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
 		}
-		kfree(dev->checkpt_block_list);
-		dev->checkpt_block_list = NULL;
 	}
 
 	dev->n_free_chunks -=
@@ -435,14 +462,10 @@ int yaffs_checkpt_close(struct yaffs_dev *dev)
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
 		dev->checkpt_byte_count);
 
-	if (dev->checkpt_buffer) {
-		/* free the buffer */
-		kfree(dev->checkpt_buffer);
-		dev->checkpt_buffer = NULL;
+	if (dev->checkpt_buffer)
 		return 1;
-	} else {
+	else
 		return 0;
-	}
 }
 
 int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)