summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSteve Rae <srae@broadcom.com>2016-06-07 11:19:38 -0700
committerTom Rini <trini@konsulko.com>2016-06-27 16:37:39 -0400
commit2c72404687f1061d042769cc65ef90e6c3da3f96 (patch)
tree7ccf1a26328276f817dd8c0336ac8b74d911d28b /common
parent9bc34799c8e6d8907b18e02c405576aa6bf9ce15 (diff)
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>
Diffstat (limited to 'common')
-rw-r--r--common/fb_mmc.c7
-rw-r--r--common/fb_nand.c20
-rw-r--r--common/image-sparse.c5
3 files changed, 29 insertions, 3 deletions
diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index 6bafbc675d..c739651009 100644
--- 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 77ca55d435..c8c79e9238 100644
--- 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 b36703b078..9632c6f352 100644
--- 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: