fastboot: sparse: implement reserve()

In order to process the CHUNK_TYPE_DONT_CARE properly, there is
a requirement to be able to 'reserve' a specified number of blocks
in the storage media. Because of the special handling of "bad blocks"
in NAND devices, this is implemented in a storage abstraction function.

Signed-off-by: Steve Rae <srae@broadcom.com>
Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index 6bafbc675d1fb39ba5194b83f9a111dca9f0ecd7..c739651009b0f806b68bcc998f96d7fa3bd6a757 100644 (file)
--- a/common/fb_mmc.c
+++ b/common/fb_mmc.c
@@ -53,6 +53,12 @@ static lbaint_t fb_mmc_sparse_write(struct sparse_storage *info,
        return blk_dwrite(dev_desc, blk, blkcnt, buffer);
 }
 
+static lbaint_t fb_mmc_sparse_reserve(struct sparse_storage *info,
+               lbaint_t blk, lbaint_t blkcnt)
+{
+       return blkcnt;
+}
+
 static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,
                const char *part_name, void *buffer,
                unsigned int download_bytes)
@@ -131,6 +137,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
                sparse.start = info.start;
                sparse.size = info.size;
                sparse.write = fb_mmc_sparse_write;
+               sparse.reserve = fb_mmc_sparse_reserve;
 
                printf("Flashing sparse image at offset " LBAFU "\n",
                       sparse.start);

diff --git a/common/fb_nand.c b/common/fb_nand.c
index 77ca55d4354a67a775d333a755f4f4d96c7571cd..c8c79e92383762138294f1124c58ade2cb329902 100644 (file)
--- a/common/fb_nand.c
+++ b/common/fb_nand.c
@@ -126,6 +126,25 @@ static lbaint_t fb_nand_sparse_write(struct sparse_storage *info,
        return written / info->blksz;
 }
 
+static lbaint_t fb_nand_sparse_reserve(struct sparse_storage *info,
+               lbaint_t blk, lbaint_t blkcnt)
+{
+       int bad_blocks = 0;
+
+/*
+ * TODO - implement a function to determine the total number
+ * of blocks which must be used in order to reserve the specified
+ * number ("blkcnt") of "good-blocks", starting at "blk"...
+ * ( possibly something like the "check_skip_len()" function )
+ */
+
+       /*
+        * the return value must be 'blkcnt' ("good-blocks") plus the
+        * number of "bad-blocks" encountered within this space...
+        */
+       return blkcnt + bad_blocks;
+}
+
 void fb_nand_flash_write(const char *cmd, void *download_buffer,
                         unsigned int download_bytes)
 {
@@ -155,6 +174,7 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
                sparse.start = part->offset / sparse.blksz;
                sparse.size = part->size / sparse.blksz;
                sparse.write = fb_nand_sparse_write;
+               sparse.reserve = fb_nand_sparse_reserve;
 
                printf("Flashing sparse image at offset " LBAFU "\n",
                       sparse.start);

diff --git a/common/image-sparse.c b/common/image-sparse.c
index b36703b07898de7d7e8f6539f0fa2e03aac05452..9632c6f352942029232ebdfb24ac086a08e02568 100644 (file)
--- a/common/image-sparse.c
+++ b/common/image-sparse.c
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2009, Google Inc.
  * All rights reserved.
@@ -210,10 +211,8 @@ void write_sparse_image(
                        break;
 
                case CHUNK_TYPE_DONT_CARE:
-#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
-                       blk += blkcnt;
+                       blk += info->reserve(info, blk, blkcnt);
                        total_blocks += chunk_header->chunk_sz;
-#endif
                        break;
 
                case CHUNK_TYPE_CRC32:

diff --git a/include/image-sparse.h b/include/image-sparse.h
index f6869d62c031cd51a56eda2309a1eabce283f49f..b0cc5007f78a3fae5f7fd7721368f5ce07fbeed6 100644 (file)
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -19,6 +19,10 @@ struct sparse_storage {
                                 lbaint_t blk,
                                 lbaint_t blkcnt,
                                 const void *buffer);
+
+       lbaint_t        (*reserve)(struct sparse_storage *info,
+                                lbaint_t blk,
+                                lbaint_t blkcnt);
 };
 
 static inline int is_sparse_image(void *buf)