[v5,4/4] usb/gadget: fastboot: implement sparse format

Message ID 1408823626-12744-5-git-send-email-srae@broadcom.com
State New
Headers show

Commit Message

Steve Rae Aug. 23, 2014, 7:53 p.m.
- add capability to "fastboot flash" with sparse format images

Signed-off-by: Steve Rae <srae@broadcom.com>
---

Changes in v5:
- use the common/aboot.c for the "sparse format" handling

Changes in v4:
- rearranged "sparse format" support in this patchset, in order to isolate...

Changes in v3: None
Changes in v2: None

 common/Makefile |  1 +
 common/fb_mmc.c | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

Comments

Lukasz Majewski Aug. 26, 2014, 11:58 a.m. | #1
Hi Steve,

> - add capability to "fastboot flash" with sparse format images
> 
> Signed-off-by: Steve Rae <srae@broadcom.com>
> ---
> 
> Changes in v5:
> - use the common/aboot.c for the "sparse format" handling
> 
> Changes in v4:
> - rearranged "sparse format" support in this patchset, in order to
> isolate...
> 
> Changes in v3: None
> Changes in v2: None
> 
>  common/Makefile |  1 +
>  common/fb_mmc.c | 33 +++++++++++++++++++++++----------
>  2 files changed, 24 insertions(+), 10 deletions(-)
> 
> diff --git a/common/Makefile b/common/Makefile
> index daebe39..bc53078 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -268,6 +268,7 @@ obj-y += stdio.o
>  
>  # This option is not just y/n - it can have a numeric value
>  ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
> +obj-y += aboot.o
>  obj-y += fb_mmc.o
>  endif
>  
> diff --git a/common/fb_mmc.c b/common/fb_mmc.c
> index e559e2a..c2e896f 100644
> --- a/common/fb_mmc.c
> +++ b/common/fb_mmc.c
> @@ -7,16 +7,24 @@
>  #include <common.h>
>  #include <fb_mmc.h>
>  #include <part.h>
> +#include <aboot.h>
> +#include <sparse_format.h>
>  
>  /* The 64 defined bytes plus the '\0' */
>  #define RESPONSE_LEN	(64 + 1)
>  
>  static char *response_str;
>  
> -static void fastboot_resp(const char *s)
> +void fastboot_fail(const char *s)
>  {
> -	strncpy(response_str, s, RESPONSE_LEN);
> -	response_str[RESPONSE_LEN - 1] = '\0';
> +	strncpy(response_str, "FAIL", 4);
> +	strncat(response_str, s, RESPONSE_LEN - 4 - 1);
> +}
> +
> +void fastboot_okay(const char *s)
> +{
> +	strncpy(response_str, "OKAY", 4);
> +	strncat(response_str, s, RESPONSE_LEN - 4 - 1);
>  }
>  
>  static void write_raw_image(block_dev_desc_t *dev_desc,
> disk_partition_t *info, @@ -33,7 +41,7 @@ static void
> write_raw_image(block_dev_desc_t *dev_desc, disk_partition_t *info,
> if (blkcnt > info->size) { printf("%s: too large for partition:
> '%s'\n", __func__, part_name);
> -		fastboot_resp("FAILtoo large for partition");
> +		fastboot_fail("too large for partition");
>  		return;
>  	}
>  
> @@ -44,13 +52,13 @@ static void write_raw_image(block_dev_desc_t
> *dev_desc, disk_partition_t *info, if (blks != blkcnt) {
>  		printf("%s: failed writing to device %d\n", __func__,
>  		       dev_desc->dev);
> -		fastboot_resp("FAILfailed writing to device");
> +		fastboot_fail("failed writing to device");
>  		return;
>  	}
>  
>  	printf("........ wrote " LBAFU " bytes to '%s'\n", blkcnt *
> info->blksz, part_name);
> -	fastboot_resp("OKAY");
> +	fastboot_okay("");
>  }
>  
>  void fb_mmc_flash_write(const char *cmd, void *download_buffer,
> @@ -66,17 +74,22 @@ void fb_mmc_flash_write(const char *cmd, void
> *download_buffer, dev_desc = get_dev("mmc",
> CONFIG_FASTBOOT_FLASH_MMC_DEV); if (!dev_desc || dev_desc->type ==
> DEV_TYPE_UNKNOWN) { printf("%s: invalid mmc device\n", __func__);
> -		fastboot_resp("FAILinvalid mmc device");
> +		fastboot_fail("invalid mmc device");
>  		return;
>  	}
>  
>  	ret = get_partition_info_efi_by_name(dev_desc, cmd, &info);
>  	if (ret) {
>  		printf("%s: cannot find partition: '%s'\n",
> __func__, cmd);
> -		fastboot_resp("FAILcannot find partition");
> +		fastboot_fail("cannot find partition");
>  		return;
>  	}
>  
> -	write_raw_image(dev_desc, &info, cmd, download_buffer,
> -			download_bytes);
> +	if (is_sparse_image(download_buffer)) {
> +		write_sparse_image(dev_desc, &info, cmd,
> download_buffer,
> +				   download_bytes);
> +	} else {
> +		write_raw_image(dev_desc, &info, cmd,
> download_buffer,
> +				download_bytes);
> +	}

In the above if parenthesis are not needed.

>  }

Despite of this,
Acked-by: Lukasz Majewski <l.majewski@samsung.com>

Patch

diff --git a/common/Makefile b/common/Makefile
index daebe39..bc53078 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -268,6 +268,7 @@  obj-y += stdio.o
 
 # This option is not just y/n - it can have a numeric value
 ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
+obj-y += aboot.o
 obj-y += fb_mmc.o
 endif
 
diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index e559e2a..c2e896f 100644
--- a/common/fb_mmc.c
+++ b/common/fb_mmc.c
@@ -7,16 +7,24 @@ 
 #include <common.h>
 #include <fb_mmc.h>
 #include <part.h>
+#include <aboot.h>
+#include <sparse_format.h>
 
 /* The 64 defined bytes plus the '\0' */
 #define RESPONSE_LEN	(64 + 1)
 
 static char *response_str;
 
-static void fastboot_resp(const char *s)
+void fastboot_fail(const char *s)
 {
-	strncpy(response_str, s, RESPONSE_LEN);
-	response_str[RESPONSE_LEN - 1] = '\0';
+	strncpy(response_str, "FAIL", 4);
+	strncat(response_str, s, RESPONSE_LEN - 4 - 1);
+}
+
+void fastboot_okay(const char *s)
+{
+	strncpy(response_str, "OKAY", 4);
+	strncat(response_str, s, RESPONSE_LEN - 4 - 1);
 }
 
 static void write_raw_image(block_dev_desc_t *dev_desc, disk_partition_t *info,
@@ -33,7 +41,7 @@  static void write_raw_image(block_dev_desc_t *dev_desc, disk_partition_t *info,
 	if (blkcnt > info->size) {
 		printf("%s: too large for partition: '%s'\n", __func__,
 		       part_name);
-		fastboot_resp("FAILtoo large for partition");
+		fastboot_fail("too large for partition");
 		return;
 	}
 
@@ -44,13 +52,13 @@  static void write_raw_image(block_dev_desc_t *dev_desc, disk_partition_t *info,
 	if (blks != blkcnt) {
 		printf("%s: failed writing to device %d\n", __func__,
 		       dev_desc->dev);
-		fastboot_resp("FAILfailed writing to device");
+		fastboot_fail("failed writing to device");
 		return;
 	}
 
 	printf("........ wrote " LBAFU " bytes to '%s'\n", blkcnt * info->blksz,
 	       part_name);
-	fastboot_resp("OKAY");
+	fastboot_okay("");
 }
 
 void fb_mmc_flash_write(const char *cmd, void *download_buffer,
@@ -66,17 +74,22 @@  void fb_mmc_flash_write(const char *cmd, void *download_buffer,
 	dev_desc = get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
 	if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
 		printf("%s: invalid mmc device\n", __func__);
-		fastboot_resp("FAILinvalid mmc device");
+		fastboot_fail("invalid mmc device");
 		return;
 	}
 
 	ret = get_partition_info_efi_by_name(dev_desc, cmd, &info);
 	if (ret) {
 		printf("%s: cannot find partition: '%s'\n", __func__, cmd);
-		fastboot_resp("FAILcannot find partition");
+		fastboot_fail("cannot find partition");
 		return;
 	}
 
-	write_raw_image(dev_desc, &info, cmd, download_buffer,
-			download_bytes);
+	if (is_sparse_image(download_buffer)) {
+		write_sparse_image(dev_desc, &info, cmd, download_buffer,
+				   download_bytes);
+	} else {
+		write_raw_image(dev_desc, &info, cmd, download_buffer,
+				download_bytes);
+	}
 }