leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fastboot: sparse: resync common/image-sparse.c (part 2)

Browse Source 
- update fastboot_okay() and fastboot_fail()

This file originally came from upstream code.

While retaining the storage abstraction feature, this is the second
set of the changes required to resync with the
  cmd_flash_mmc_sparse_img()
in the file
  aboot.c
from
  https://us.codeaurora.org/cgit/quic/la/kernel/lk/plain/app/aboot/aboot.c?h=LE.BR.1.2.1

Signed-off-by: Steve Rae <srae@broadcom.com>
This commit is contained in:
Steve Rae 2016-06-07 11:19:37 -07:00 committed by Tom Rini
parent cc0f08cd34
commit 9bc34799c8
8 changed files with 70 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/fb_mmc.c
View File

@ -18,8 +18,6 @@
#define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME
#endif #endif
static char *response_str;
struct fb_mmc_sparse { struct fb_mmc_sparse {
struct blk_desc *dev_desc; struct blk_desc *dev_desc;
}; };
@ -68,7 +66,7 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,
if (blkcnt > info->size) { if (blkcnt > info->size) {
error("too large for partition: '%s'\n", part_name); error("too large for partition: '%s'\n", part_name);
fastboot_fail(response_str, "too large for partition"); fastboot_fail("too large for partition");
return; return;
} }
@ -77,28 +75,25 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,
blks = blk_dwrite(dev_desc, info->start, blkcnt, buffer); blks = blk_dwrite(dev_desc, info->start, blkcnt, buffer);
if (blks != blkcnt) { if (blks != blkcnt) {
error("failed writing to device %d\n", dev_desc->devnum); error("failed writing to device %d\n", dev_desc->devnum);
fastboot_fail(response_str, "failed writing to device"); fastboot_fail("failed writing to device");
return; return;
} }
printf("........ wrote " LBAFU " bytes to '%s'\n", blkcnt * info->blksz, printf("........ wrote " LBAFU " bytes to '%s'\n", blkcnt * info->blksz,
part_name); part_name);
fastboot_okay(response_str, ""); fastboot_okay("");
} }
void fb_mmc_flash_write(const char *cmd, void *download_buffer, void fb_mmc_flash_write(const char *cmd, void *download_buffer,
unsigned int download_bytes, char *response) unsigned int download_bytes)
{ {
struct blk_desc *dev_desc; struct blk_desc *dev_desc;
disk_partition_t info; disk_partition_t info;
/* initialize the response buffer */
response_str = response;
dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
error("invalid mmc device\n"); error("invalid mmc device\n");
fastboot_fail(response_str, "invalid mmc device"); fastboot_fail("invalid mmc device");
return; return;
} }
@ -108,21 +103,21 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
if (is_valid_gpt_buf(dev_desc, download_buffer)) { if (is_valid_gpt_buf(dev_desc, download_buffer)) {
printf("%s: invalid GPT - refusing to write to flash\n", printf("%s: invalid GPT - refusing to write to flash\n",
__func__); __func__);
fastboot_fail(response_str, "invalid GPT partition"); fastboot_fail("invalid GPT partition");
return; return;
} }
if (write_mbr_and_gpt_partitions(dev_desc, download_buffer)) { if (write_mbr_and_gpt_partitions(dev_desc, download_buffer)) {
printf("%s: writing GPT partitions failed\n", __func__); printf("%s: writing GPT partitions failed\n", __func__);
fastboot_fail(response_str, fastboot_fail(
"writing GPT partitions failed"); "writing GPT partitions failed");
return; return;
} }
printf("........ success\n"); printf("........ success\n");
fastboot_okay(response_str, ""); fastboot_okay("");
return; return;
} else if (part_get_info_efi_by_name_or_alias(dev_desc, cmd, &info)) { } else if (part_get_info_efi_by_name_or_alias(dev_desc, cmd, &info)) {
error("cannot find partition: '%s'\n", cmd); error("cannot find partition: '%s'\n", cmd);
fastboot_fail(response_str, "cannot find partition"); fastboot_fail("cannot find partition");
return; return;
} }
@ -142,14 +137,14 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
sparse.priv = &sparse_priv; sparse.priv = &sparse_priv;
write_sparse_image(&sparse, cmd, download_buffer, write_sparse_image(&sparse, cmd, download_buffer,
download_bytes, response_str); download_bytes);
} else { } else {
write_raw_image(dev_desc, &info, cmd, download_buffer, write_raw_image(dev_desc, &info, cmd, download_buffer,
download_bytes); download_bytes);
} }
} }
void fb_mmc_erase(const char *cmd, char *response) void fb_mmc_erase(const char *cmd)
{ {
int ret; int ret;
struct blk_desc *dev_desc; struct blk_desc *dev_desc;
@ -159,24 +154,21 @@ void fb_mmc_erase(const char *cmd, char *response)
if (mmc == NULL) { if (mmc == NULL) {
error("invalid mmc device"); error("invalid mmc device");
fastboot_fail(response_str, "invalid mmc device"); fastboot_fail("invalid mmc device");
return; return;
} }
/* initialize the response buffer */
response_str = response;
dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
error("invalid mmc device"); error("invalid mmc device");
fastboot_fail(response_str, "invalid mmc device"); fastboot_fail("invalid mmc device");
return; return;
} }
ret = part_get_info_efi_by_name_or_alias(dev_desc, cmd, &info); ret = part_get_info_efi_by_name_or_alias(dev_desc, cmd, &info);
if (ret) { if (ret) {
error("cannot find partition: '%s'", cmd); error("cannot find partition: '%s'", cmd);
fastboot_fail(response_str, "cannot find partition"); fastboot_fail("cannot find partition");
return; return;
} }
@ -195,11 +187,11 @@ void fb_mmc_erase(const char *cmd, char *response)
blks = dev_desc->block_erase(dev_desc, blks_start, blks_size); blks = dev_desc->block_erase(dev_desc, blks_start, blks_size);
if (blks != blks_size) { if (blks != blks_size) {
error("failed erasing from device %d", dev_desc->devnum); error("failed erasing from device %d", dev_desc->devnum);
fastboot_fail(response_str, "failed erasing from device"); fastboot_fail("failed erasing from device");
return; return;
} }
printf("........ erased " LBAFU " bytes from '%s'\n", printf("........ erased " LBAFU " bytes from '%s'\n",
blks_size * info.blksz, cmd); blks_size * info.blksz, cmd);
fastboot_okay(response_str, ""); fastboot_okay("");
} }

38
common/fb_nand.c
View File

@ -15,8 +15,6 @@
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#include <nand.h> #include <nand.h>
static char *response_str;
struct fb_nand_sparse { struct fb_nand_sparse {
struct mtd_info *mtd; struct mtd_info *mtd;
struct part_info *part; struct part_info *part;
@ -32,7 +30,7 @@ __weak int board_fastboot_write_partition_setup(char *name)
return 0; return 0;
} }
static int fb_nand_lookup(const char *partname, char *response, static int fb_nand_lookup(const char *partname,
struct mtd_info **mtd, struct mtd_info **mtd,
struct part_info **part) struct part_info **part)
{ {
@ -43,21 +41,21 @@ static int fb_nand_lookup(const char *partname, char *response,
ret = mtdparts_init(); ret = mtdparts_init();
if (ret) { if (ret) {
error("Cannot initialize MTD partitions\n"); error("Cannot initialize MTD partitions\n");
fastboot_fail(response_str, "cannot init mtdparts"); fastboot_fail("cannot init mtdparts");
return ret; return ret;
} }
ret = find_dev_and_part(partname, &dev, &pnum, part); ret = find_dev_and_part(partname, &dev, &pnum, part);
if (ret) { if (ret) {
error("cannot find partition: '%s'", partname); error("cannot find partition: '%s'", partname);
fastboot_fail(response_str, "cannot find partition"); fastboot_fail("cannot find partition");
return ret; return ret;
} }
if (dev->id->type != MTD_DEV_TYPE_NAND) { if (dev->id->type != MTD_DEV_TYPE_NAND) {
error("partition '%s' is not stored on a NAND device", error("partition '%s' is not stored on a NAND device",
partname); partname);
fastboot_fail(response_str, "not a NAND device"); fastboot_fail("not a NAND device");
return -EINVAL; return -EINVAL;
} }
@ -129,19 +127,16 @@ static lbaint_t fb_nand_sparse_write(struct sparse_storage *info,
} }
void fb_nand_flash_write(const char *cmd, void *download_buffer, void fb_nand_flash_write(const char *cmd, void *download_buffer,
unsigned int download_bytes, char *response) unsigned int download_bytes)
{ {
struct part_info *part; struct part_info *part;
struct mtd_info *mtd = NULL; struct mtd_info *mtd = NULL;
int ret; int ret;
/* initialize the response buffer */ ret = fb_nand_lookup(cmd, &mtd, &part);
response_str = response;
ret = fb_nand_lookup(cmd, response, &mtd, &part);
if (ret) { if (ret) {
error("invalid NAND device"); error("invalid NAND device");
fastboot_fail(response_str, "invalid NAND device"); fastboot_fail("invalid NAND device");
return; return;
} }
@ -166,7 +161,7 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
sparse.priv = &sparse_priv; sparse.priv = &sparse_priv;
write_sparse_image(&sparse, cmd, download_buffer, write_sparse_image(&sparse, cmd, download_buffer,
download_bytes, response_str); download_bytes);
} else { } else {
printf("Flashing raw image at offset 0x%llx\n", printf("Flashing raw image at offset 0x%llx\n",
part->offset); part->offset);
@ -179,26 +174,23 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
} }
if (ret) { if (ret) {
fastboot_fail(response_str, "error writing the image"); fastboot_fail("error writing the image");
return; return;
} }
fastboot_okay(response_str, ""); fastboot_okay("");
} }
void fb_nand_erase(const char *cmd, char *response) void fb_nand_erase(const char *cmd)
{ {
struct part_info *part; struct part_info *part;
struct mtd_info *mtd = NULL; struct mtd_info *mtd = NULL;
int ret; int ret;
/* initialize the response buffer */ ret = fb_nand_lookup(cmd, &mtd, &part);
response_str = response;
ret = fb_nand_lookup(cmd, response, &mtd, &part);
if (ret) { if (ret) {
error("invalid NAND device"); error("invalid NAND device");
fastboot_fail(response_str, "invalid NAND device"); fastboot_fail("invalid NAND device");
return; return;
} }
@ -209,9 +201,9 @@ void fb_nand_erase(const char *cmd, char *response)
ret = _fb_nand_erase(mtd, part); ret = _fb_nand_erase(mtd, part);
if (ret) { if (ret) {
error("failed erasing from device %s", mtd->name); error("failed erasing from device %s", mtd->name);
fastboot_fail(response_str, "failed erasing from device"); fastboot_fail("failed erasing from device");
return; return;
} }
fastboot_okay(response_str, ""); fastboot_okay("");
} }

26
common/image-sparse.c
View File

@ -47,7 +47,7 @@
void write_sparse_image( void write_sparse_image(
struct sparse_storage *info, const char *part_name, struct sparse_storage *info, const char *part_name,
void *data, unsigned sz, char *response_str) void *data, unsigned sz)
{ {
lbaint_t blk; lbaint_t blk;
lbaint_t blkcnt; lbaint_t blkcnt;
@ -93,7 +93,7 @@ void write_sparse_image(
if (offset) { if (offset) {
printf("%s: Sparse image block size issue [%u]\n", printf("%s: Sparse image block size issue [%u]\n",
__func__, sparse_header->blk_sz); __func__, sparse_header->blk_sz);
fastboot_fail(response_str, "sparse image block size issue"); fastboot_fail("sparse image block size issue");
return; return;
} }
@ -128,7 +128,7 @@ void write_sparse_image(
case CHUNK_TYPE_RAW: case CHUNK_TYPE_RAW:
if (chunk_header->total_sz != if (chunk_header->total_sz !=
(sparse_header->chunk_hdr_sz + chunk_data_sz)) { (sparse_header->chunk_hdr_sz + chunk_data_sz)) {
fastboot_fail(response_str, fastboot_fail(
"Bogus chunk size for chunk type Raw"); "Bogus chunk size for chunk type Raw");
return; return;
} }
@ -137,7 +137,7 @@ void write_sparse_image(
printf( printf(
"%s: Request would exceed partition size!\n", "%s: Request would exceed partition size!\n",
__func__); __func__);
fastboot_fail(response_str, fastboot_fail(
"Request would exceed partition size!"); "Request would exceed partition size!");
return; return;
} }
@ -148,7 +148,7 @@ void write_sparse_image(
printf("%s: %s" LBAFU " [" LBAFU "]\n", printf("%s: %s" LBAFU " [" LBAFU "]\n",
__func__, "Write failed, block #", __func__, "Write failed, block #",
blk, blks); blk, blks);
fastboot_fail(response_str, fastboot_fail(
"flash write failure"); "flash write failure");
return; return;
} }
@ -161,7 +161,7 @@ void write_sparse_image(
case CHUNK_TYPE_FILL: case CHUNK_TYPE_FILL:
if (chunk_header->total_sz != if (chunk_header->total_sz !=
(sparse_header->chunk_hdr_sz + sizeof(uint32_t))) { (sparse_header->chunk_hdr_sz + sizeof(uint32_t))) {
fastboot_fail(response_str, fastboot_fail(
"Bogus chunk size for chunk type FILL"); "Bogus chunk size for chunk type FILL");
return; return;
} }
@ -171,7 +171,7 @@ void write_sparse_image(
ROUNDUP(info->blksz, ROUNDUP(info->blksz,
ARCH_DMA_MINALIGN)); ARCH_DMA_MINALIGN));
if (!fill_buf) { if (!fill_buf) {
fastboot_fail(response_str, fastboot_fail(
"Malloc failed for: CHUNK_TYPE_FILL"); "Malloc failed for: CHUNK_TYPE_FILL");
return; return;
} }
@ -186,7 +186,7 @@ void write_sparse_image(
printf( printf(
"%s: Request would exceed partition size!\n", "%s: Request would exceed partition size!\n",
__func__); __func__);
fastboot_fail(response_str, fastboot_fail(
"Request would exceed partition size!"); "Request would exceed partition size!");
return; return;
} }
@ -197,7 +197,7 @@ void write_sparse_image(
if (blks < 1) { if (blks < 1) {
printf("%s: %s, block # " LBAFU "\n", printf("%s: %s, block # " LBAFU "\n",
__func__, "Write failed", blk); __func__, "Write failed", blk);
fastboot_fail(response_str, fastboot_fail(
"flash write failure"); "flash write failure");
free(fill_buf); free(fill_buf);
return; return;
@ -219,7 +219,7 @@ void write_sparse_image(
case CHUNK_TYPE_CRC32: case CHUNK_TYPE_CRC32:
if (chunk_header->total_sz != if (chunk_header->total_sz !=
sparse_header->chunk_hdr_sz) { sparse_header->chunk_hdr_sz) {
fastboot_fail(response_str, fastboot_fail(
"Bogus chunk size for chunk type Dont Care"); "Bogus chunk size for chunk type Dont Care");
return; return;
} }
@ -230,7 +230,7 @@ void write_sparse_image(
default: default:
printf("%s: Unknown chunk type: %x\n", __func__, printf("%s: Unknown chunk type: %x\n", __func__,
chunk_header->chunk_type); chunk_header->chunk_type);
fastboot_fail(response_str, "Unknown chunk type"); fastboot_fail("Unknown chunk type");
return; return;
} }
} }
@ -240,9 +240,9 @@ void write_sparse_image(
printf("........ wrote %u bytes to '%s'\n", bytes_written, part_name); printf("........ wrote %u bytes to '%s'\n", bytes_written, part_name);
if (total_blocks != sparse_header->total_blks) if (total_blocks != sparse_header->total_blks)
fastboot_fail(response_str, "sparse image write failure"); fastboot_fail("sparse image write failure");
else else
fastboot_okay(response_str, ""); fastboot_okay("");
return; return;
} }

31
drivers/usb/gadget/f_fastboot.c
View File

@ -151,16 +151,18 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req);
static int strcmp_l1(const char *s1, const char *s2); static int strcmp_l1(const char *s1, const char *s2);
void fastboot_fail(char *response, const char *reason) static char *fb_response_str;
void fastboot_fail(const char *reason)
{ {
strncpy(response, "FAIL\0", 5); strncpy(fb_response_str, "FAIL\0", 5);
strncat(response, reason, FASTBOOT_RESPONSE_LEN - 4 - 1); strncat(fb_response_str, reason, FASTBOOT_RESPONSE_LEN - 4 - 1);
} }
void fastboot_okay(char *response, const char *reason) void fastboot_okay(const char *reason)
{ {
strncpy(response, "OKAY\0", 5); strncpy(fb_response_str, "OKAY\0", 5);
strncat(response, reason, FASTBOOT_RESPONSE_LEN - 4 - 1); strncat(fb_response_str, reason, FASTBOOT_RESPONSE_LEN - 4 - 1);
} }
static void fastboot_complete(struct usb_ep *ep, struct usb_request *req) static void fastboot_complete(struct usb_ep *ep, struct usb_request *req)
@ -588,15 +590,18 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req)
return; return;
} }
strcpy(response, "FAILno flash device defined"); /* initialize the response buffer */
fb_response_str = response;
fastboot_fail("no flash device defined");
#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV #ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
fb_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR, fb_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
download_bytes, response); download_bytes);
#endif #endif
#ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV #ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV
fb_nand_flash_write(cmd, fb_nand_flash_write(cmd,
(void *)CONFIG_FASTBOOT_BUF_ADDR, (void *)CONFIG_FASTBOOT_BUF_ADDR,
download_bytes, response); download_bytes);
#endif #endif
fastboot_tx_write_str(response); fastboot_tx_write_str(response);
} }
@ -637,13 +642,15 @@ static void cb_erase(struct usb_ep *ep, struct usb_request *req)
return; return;
} }
strcpy(response, "FAILno flash device defined"); /* initialize the response buffer */
fb_response_str = response;
fastboot_fail("no flash device defined");
#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV #ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
fb_mmc_erase(cmd, response); fb_mmc_erase(cmd);
#endif #endif
#ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV #ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV
fb_nand_erase(cmd, response); fb_nand_erase(cmd);
#endif #endif
fastboot_tx_write_str(response); fastboot_tx_write_str(response);
} }

4
include/fastboot.h
View File

@ -16,7 +16,7 @@
/* The 64 defined bytes plus \0 */ /* The 64 defined bytes plus \0 */
#define FASTBOOT_RESPONSE_LEN (64 + 1) #define FASTBOOT_RESPONSE_LEN (64 + 1)
void fastboot_fail(char *response, const char *reason); void fastboot_fail(const char *reason);
void fastboot_okay(char *response, const char *reason); void fastboot_okay(const char *reason);
#endif /* _FASTBOOT_H_ */ #endif /* _FASTBOOT_H_ */

4
include/fb_mmc.h
View File

@ -5,5 +5,5 @@
*/ */
void fb_mmc_flash_write(const char *cmd, void *download_buffer, void fb_mmc_flash_write(const char *cmd, void *download_buffer,
unsigned int download_bytes, char *response); unsigned int download_bytes);
void fb_mmc_erase(const char *cmd, char *response); void fb_mmc_erase(const char *cmd);

4
include/fb_nand.h
View File

@ -6,5 +6,5 @@
*/ */
void fb_nand_flash_write(const char *cmd, void *download_buffer, void fb_nand_flash_write(const char *cmd, void *download_buffer,
unsigned int download_bytes, char *response); unsigned int download_bytes);
void fb_nand_erase(const char *cmd, char *response); void fb_nand_erase(const char *cmd);

2
include/image-sparse.h
View File

@ -33,4 +33,4 @@ static inline int is_sparse_image(void *buf)
} }
void write_sparse_image(struct sparse_storage *info, const char *part_name, void write_sparse_image(struct sparse_storage *info, const char *part_name,
void *data, unsigned sz, char *response_str); void *data, unsigned sz);