Add automatic detection for inband tags and bad block marking supression

Inband tags is now selected automatically if there is insufficient space
in oob for the tags.

Also add a development feature that supresses bad block marking during development.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/Kconfig_multi b/Kconfig_multi
index 658feea5ff55ef43a692b33c38f3aefa73b21524..408570fc7a5ea3d534a57c9a28def1ac45fb2989 100644 (file)
--- a/Kconfig_multi
+++ b/Kconfig_multi
@@ -152,6 +152,16 @@ config YAFFS_DISABLE_BACKGROUND
 
         If unsure, say N.
 
+config YAFFS_DISABLE_BAD_BLOCK_MARKING
+       bool "Disable yaffs2 bad block marking"
+       depends on YAFFS_FS
+       default n
+       help
+        Useful during early flash bring up to prevent problems causing
+        lots of bad block marking.
+
+        If unsure, say N.
+
 config YAFFS_XATTR
        bool "Enable yaffs2 xattr support"
        depends on YAFFS_FS

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 79cec3333ec000fe241e656b23350345276c762d..2225fb27bb5055367e3d6680ad872b5b4211cf36 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -592,6 +592,7 @@ struct yaffs_param {
        int always_check_erased;        /* Force chunk erased check always on */
 
        int disable_summary;
+       int disable_bad_block_marking;
 
 };
 

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 9afd5ec8e1c6cdf2233fc81264a69cf79cae4d28..0d8499bdc63007490533528b74174e84cd28ea96 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -80,6 +80,10 @@ int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
 {
        block_no -= dev->block_offset;
        dev->n_bad_markings++;
+
+       if (dev->param.disable_bad_block_marking)
+               return YAFFS_OK;
+
        return dev->tagger.mark_bad_fn(dev, block_no);
 }
 

diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index 92d2f5fd1ed87bbbe5228630d0239d9a41fcec62..b06743608364134a1b1df7c61b3a798055e569a1 100644 (file)
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -176,6 +176,7 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 #include "yaffs_linux.h"
 
 #include "yaffs_mtdif.h"
+#include "yaffs_packedtags2.h"
 
 unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS;
 unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
@@ -2743,7 +2744,10 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
        param->n_reserved_blocks = 5;
        param->n_caches = (options.no_cache) ? 0 : 10;
-       param->inband_tags = options.inband_tags;
+
+       if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) ||
+           options.inband_tags)
+               param->inband_tags = 1;
 
        param->enable_xattr = 1;
        if (options.lazy_loading_overridden)
@@ -2758,6 +2762,10 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        param->refresh_period = 500;
        param->disable_summary = options.disable_summary;
 
+
+#ifdef CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING
+       param->disable_bad_block_marking  = 1;
+#endif
        if (options.empty_lost_and_found_overridden)
                param->empty_lost_n_found = options.empty_lost_and_found;
 
@@ -3001,6 +3009,8 @@ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
                                param->empty_lost_n_found);
        buf += sprintf(buf, "disable_lazy_load.... %d\n",
                                param->disable_lazy_load);
+       buf += sprintf(buf, "disable_bad_block_mrk %d\n",
+                               param->disable_bad_block_marking);
        buf += sprintf(buf, "refresh_period....... %d\n",
                                param->refresh_period);
        buf += sprintf(buf, "n_caches............. %d\n", param->n_caches);