usb: gadget: fastboot: Add fastboot erase
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
---
Note: The changes are on top of oem command support added by robh at kernel.org
common/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)
common/fb_mmc.c +58 -0
@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME
@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */ + grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev); +fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}
drivers/usb/gadget/f_fastboot.c +23 -0
@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } } +static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);
@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };
include/fb_mmc.h +1 -0
@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);
Signature · 1 line
1.8.3.2
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Hi, Dileep
Quoted 33 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +2
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } +
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 124
Quoted 10 lines
common/fb_mmc.c +10
-0+void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" );
no newline with error()
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 134
Quoted 10 lines
common/fb_mmc.c +10
-0+fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );
no newline with error()
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 141
Quoted 7 lines
common/fb_mmc.c +7
-0+fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);
no newline with error()
Quoted 4 lines
common/fb_mmc.c +4
-0+fastboot_fail ("cannot find partition" ); +return ; + } +
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 155
Quoted 10 lines
common/fb_mmc.c +10
-0+puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */ + grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ;
Is this logic correct??? Isn't the "erase_grp_size" in bytes? and the info.start & info.size in LBA's?
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 162
Quoted 7 lines
common/fb_mmc.c +7
-0+ +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev);
no newline with error()
Quoted 14 lines
common/fb_mmc.c +8
-0+fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) }
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req) · line 545
Quoted 10 lines
drivers/usb/gadget/f_fastboot.c +8
-0} +static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" );
no newline with error()
Quoted 35 lines
drivers/usb/gadget/f_fastboot.c +15
-0+fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };include/fb_mmc.h +1
-0@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Hi Steve,
Quoted 43 lines · Steve Rae
Hi, Dileep
Quoted 38 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +6
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc;
Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 124
Quoted 6 lines
common/fb_mmc.c +6
-0+disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" );no newline with
error()
Will remove
Quoted 13 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 134
Quoted 11 lines
common/fb_mmc.c +10
-0+fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );no newline with
error()
Will remove
Quoted 11 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 141
Quoted 9 lines
common/fb_mmc.c +7
-0+fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);no newline with
error()
Will remove
Quoted 10 lines
Quoted 10 lines
common/fb_mmc.c +9
-0+fastboot_fail ("cannot find partition" ); +return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */ + grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 );
Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 155
Quoted 5 lines
common/fb_mmc.c +5
-0+if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ;Is this logic correct??? Isn't the "
erase_grp_size" in bytes? and the info.start & info.size in LBA's?
Yes, the math will take care of it. Ref: mmc_berase()
Quoted 11 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 162
Quoted 9 lines
common/fb_mmc.c +7
-0+ +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev);no newline with
error()
Will remove
Quoted 17 lines
Quoted 17 lines
common/fb_mmc.c +8
-0+fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }
Quoted 10 lines
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req) · line 545
Quoted 8 lines
drivers/usb/gadget/f_fastboot.c +8
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" );no newline with
error()
Will remove
Quoted 32 lines
Quoted 32 lines
drivers/usb/gadget/f_fastboot.c +15
-0+fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };include/fb_mmc.h +0
-0@@ -6,3 +6,4 @@
Quoted 4 lines
include/fb_mmc.h line 9
Quoted 4 lines
include/fb_mmc.h +1
-0void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);
Thanks for the review. Will send v2 with changes.
Regards,
Dileep
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Quoted 99 lines · Dileep Katta
Hi Steve,
Quoted 43 lines · Steve Rae
Hi, Dileep
Quoted 38 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +6
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc;Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 124
Quoted 6 lines
common/fb_mmc.c +6
-0+disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
Quoted 13 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 134
Quoted 11 lines
common/fb_mmc.c +10
-0+fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
Quoted 11 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 141
Quoted 9 lines
common/fb_mmc.c +7
-0+fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);no newline with
error()Will remove
Quoted 10 lines
Quoted 10 lines
common/fb_mmc.c +9
-0+fastboot_fail ("cannot find partition" ); +return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */ + grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 );Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 155
Quoted 5 lines
common/fb_mmc.c +5
-0+if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ;Is this logic correct??? Isn't the "
erase_grp_size" in bytes? and the info.start & info.size in LBA's?
Quoted 1 line
Yes, the math will take care of it. Ref:
mmc_berase()
So, I have a partition:
2 0x00000300 0x000003ff "test"
attrs: 0x0000000000000000
type: 9e312af1-18fe-fa41-45f3-37b3bb1d1061
guid: 18a5d0db-d23a-aac1-0d4c-692c7ba9ab1cand 'fastboot erase test' produces:
Erasing blocks 1024 to 1024 due to alignment
........ erased 0 bytes from 'test'
which is not correct!
Furthermore, doesn't the mmc_berase() already handle the "erase_grp_size"....
If I remove your alignment logic, then it produces:
Erasing blocks 768 to 1024 due to alignment
Caution! Your devices Erase group is 0x400
The erase range would be change to 0x0~0x7ff
........ erased 131072 bytes from 'test'
which looks correct (except for the "Caution" message)....
Thanks, Steve
Quoted 82 lines
Quoted 11 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 162
Quoted 9 lines
common/fb_mmc.c +7
-0+ +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev);no newline with
error()Will remove
Quoted 17 lines
Quoted 17 lines
common/fb_mmc.c +8
-0+fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }Quoted 10 lines
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req) · line 545
Quoted 8 lines
drivers/usb/gadget/f_fastboot.c +8
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" );no newline with
error()Will remove
Quoted 32 lines
Quoted 32 lines
drivers/usb/gadget/f_fastboot.c +15
-0+fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };include/fb_mmc.h +0
-0@@ -6,3 +6,4 @@Quoted 4 lines
include/fb_mmc.h line 9
Quoted 4 lines
include/fb_mmc.h +1
-0void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);Thanks for the review. Will send v2 with changes.
Regards,
Dileep
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Hi Steve,
Quoted 132 lines · Steve Rae
Quoted 118 lines · Dileep Katta
Hi Steve,
Quoted 49 lines · Steve Rae
Hi, Dileep
Quoted 43 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 ++++++++++++++++++++++++++++++ +++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +8
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size;Quoted 9 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 124
Quoted 6 lines
+ struct mmc *mmc = find_mmc_device(CONFIG_
FASTBOOT_FLASH_MMC_DEV);common/fb_mmc.c +3
-0+ +if (mmc ==NULL ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
Quoted 15 lines
+
fastboot_fail("invalid mmc device");common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 134
Quoted 10 lines
common/fb_mmc.c +9
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
Quoted 11 lines
+
fastboot_fail("invalid mmc device");common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 141
Quoted 7 lines
common/fb_mmc.c +6
-0+return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);Quoted 2 lines
no newline with
error()Will remove
Quoted 13 lines
+
fastboot_fail("cannot find partition");Quoted 11 lines
common/fb_mmc.c +6
-0+return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */
common/fb_mmc.c +4
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) &Quoted 9 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 155
Quoted 4 lines
common/fb_mmc.c +3
-0+ (~(grp_size -1 )); + else + blks_size =0 ;Is this logic correct??? Isn't the "
erase_grp_size" in bytes? and the info.start & info.size in LBA's?Quoted 2 lines
Yes, the math will take care of it. Ref:
mmc_berase()So, I have a partition:
2
0x000003000x000003ff"test"attrs: 0x0000000000000000 type: 9e312af1-18fe-fa41-45f3-37b3bb1d1061 guid: 18a5d0db-d23a-aac1-0d4c-692c7ba9ab1c
Quoted 8 lines
and 'fastboot erase test' produces:
Erasing blocks 1024 to 1024 due to alignment
........ erased 0 bytes from 'test'
which is not correct!Furthermore, doesn't the
mmc_berase()already handle the "erase_grp_size"....
It does handle it, in a way, but the way it handles it is to erase more blocks than requested if the request isn't aligned. In your example, you requested the "test" partition to be erased (0x300 to 0x3ff), but what was actually erased (as printed in the "Caution" message from mmc_berase) was 0x0 to 0x7ff.
If I remove your alignment logic, then it produces:
Quoted 9 lines
Erasing blocks 768 to 1024 due to alignment
Caution! Your devices Erase group is
0x400
The erase range would be change to 0x0~0x7ff........ erased 131072 bytes from 'test'
which looks correct (except for the "Caution" message)....Thanks, Steve
Except that this one has now erased 0x0 to 0x300 and 0x400 to 0x7ff also, which you did not want to erase, right?
Aligning the start address is meant to protect this data from being erased unintentionally. The trade-off is that some small partitions won't get erased at all, if they are too small and not aligned.
Regards, Dileep
Quoted 96 lines
Quoted 96 lines
Quoted 15 lines
+
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 162
Quoted 9 lines
+ printf("Erasing blocks " LBAFU " to " LBAFU " due to
alignment\n",common/fb_mmc.c +3
-0+ blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase(dev_desc->dev, blks_start,
blks_size);common/fb_mmc.c +2
-0+if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev);Quoted 2 lines
no newline with
error()Will remove
Quoted 19 lines
+
fastboot_fail("failed erasing from device");Quoted 17 lines
common/fb_mmc.c +7
-0+return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_ renamed from drivers/usb/gadget/f_fastboot.c +0
-0
fastboot.c
index f7d84bf..a8d8205 100644drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }Quoted 12 lines
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req)
Quoted 9 lines
drivers/usb/gadget/f_fastboot.c +8
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" );no newline with
error()Will remove
Quoted 33 lines
+
fastboot_tx_write_str("FAILmissing partition name");Quoted 31 lines
drivers/usb/gadget/f_fastboot.c +14
-0+return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd ="oem" , .cb = cb_oem, + }, { + .cmd ="erase" , + .cb = cb_erase, }, };include/fb_mmc.h +0
-0@@ -6,3 +6,4 @@Quoted 5 lines
include/fb_mmc.h line 9
Quoted 5 lines
include/fb_mmc.h +1
-0void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);Thanks for the review. Will send v2 with changes.
Regards,
Dileep
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Quoted 163 lines · Dileep Katta
Hi Steve,
Quoted 132 lines · Steve Rae
Quoted 118 lines · Dileep Katta
Hi Steve,
Quoted 49 lines · Steve Rae
Hi, Dileep
Quoted 43 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 ++++++++++++++++++++++++++++++ +++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +8
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size;Quoted 9 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 124
Quoted 6 lines
+ struct mmc *mmc = find_mmc_device(CONFIG_
FASTBOOT_FLASH_MMC_DEV);common/fb_mmc.c +3
-0+ +if (mmc ==NULL ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
Quoted 15 lines
+
fastboot_fail("invalid mmc device");common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 134
Quoted 10 lines
common/fb_mmc.c +9
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
Quoted 11 lines
+
fastboot_fail("invalid mmc device");common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 141
Quoted 7 lines
common/fb_mmc.c +6
-0+return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);Quoted 2 lines
no newline with
error()Will remove
Quoted 13 lines
+
fastboot_fail("cannot find partition");Quoted 11 lines
common/fb_mmc.c +6
-0+return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */
common/fb_mmc.c +4
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) &Quoted 9 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 155
Quoted 4 lines
common/fb_mmc.c +3
-0+ (~(grp_size -1 )); + else + blks_size =0 ;Is this logic correct??? Isn't the "
erase_grp_size" in bytes? and the info.start & info.size in LBA's?Quoted 2 lines
Yes, the math will take care of it. Ref:
mmc_berase()So, I have a partition:
2 0x00000300 0x000003ff "test" attrs: 0x0000000000000000 type: 9e312af1-18fe-fa41-45f3-37b3bb1d1061 guid: 18a5d0db-d23a-aac1-0d4c-692c7ba9ab1cQuoted 8 lines
and 'fastboot erase test' produces:
Erasing blocks 1024 to 1024 due to alignment
........ erased 0 bytes from 'test'
which is not correct!Furthermore, doesn't the
mmc_berase()already handle the "erase_grp_size"....It does handle it, in a way, but the way it handles it is to erase more blocks than requested if the request isn't aligned. In your example, you requested the "test" partition to be erased (
0x300to0x3ff), but what was actually erased (as printed in the "Caution" message frommmc_berase) was0x0to0x7ff.If I remove your alignment logic, then it produces:
Quoted 9 lines
Erasing blocks 768 to 1024 due to alignment
Caution! Your devices Erase group is
0x400
The erase range would be change to 0x0~0x7ff........ erased 131072 bytes from 'test'which looks correct (except for the "Caution" message)....
Thanks, Steve
Quoted 8 lines
Except that this one has now erased
0x0to0x300and0x400to0x7ffalso, which you did not want to erase, right?
Aligning the start address is meant to protect this data from being erased unintentionally. The trade-off is that some small partitions won't get erased at all, if they are too small and not aligned.Regards, Dileep
I'm sorry, but I am really confused....
-- 131072 bytes agrees with 0x300 to 0x3ff...
-- I'm suspicious that the Caution message and the actual erased bytes do not match....
-- I'm not certain that the existing mmc_berase() code is correct... -- If this "erase_grp_size" is a method to erase large sections "quickly", then it would seem that it needs to be combined with erasing (by writing "0" or "1" appropriately) to the smaller sections to erase the "exact specified size". And this should be handled in the mmc_berase() code!
Additionally, because it is not necessary to "erase before writing", I personally do not have any need for this "fastboot erase" command at all. So I think that I am going to withdraw from this conversation.... Thanks, Steve
Quoted 97 lines
Quoted 96 lines
Quoted 96 lines
Quoted 15 lines
+
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 162
Quoted 9 lines
+ printf("Erasing blocks " LBAFU " to " LBAFU " due to
alignment\n",common/fb_mmc.c +3
-0+ blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase(dev_desc->dev, blks_start,
blks_size);common/fb_mmc.c +2
-0+if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev);Quoted 2 lines
no newline with
error()Will remove
Quoted 19 lines
+
fastboot_fail("failed erasing from device");Quoted 17 lines
common/fb_mmc.c +7
-0+return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_ renamed from drivers/usb/gadget/f_fastboot.c +0
-0
fastboot.c
index f7d84bf..a8d8205 100644drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }Quoted 12 lines
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req)
Quoted 9 lines
drivers/usb/gadget/f_fastboot.c +8
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" );no newline with
error()Will remove
Quoted 33 lines
+
fastboot_tx_write_str("FAILmissing partition name");Quoted 31 lines
drivers/usb/gadget/f_fastboot.c +14
-0+return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd ="oem" , .cb = cb_oem, + }, { + .cmd ="erase" , + .cb = cb_erase, }, };include/fb_mmc.h +0
-0@@ -6,3 +6,4 @@Quoted 5 lines
include/fb_mmc.h line 9
Quoted 5 lines
include/fb_mmc.h +1
-0void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);Thanks for the review. Will send v2 with changes.
Regards,
Dileep
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Quoted 183 lines · Steve Rae
Quoted 176 lines · Dileep Katta
Hi Steve,
Quoted 136 lines · Steve Rae
On 15-02-12 12:29 AM, Dileep Katta wrote:
Hi Steve,
Quoted 122 lines · Steve Rae
Quoted 120 lines
Hi, Dileep
Quoted 48 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 ++++++++++++++++++++++++++++++ +++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +9
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; + struct mmc *mmc = find_mmc_device(CONFIG_
FASTBOOT_FLASH_MMC_DEV);common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 124
Quoted 3 lines
common/fb_mmc.c +3
-0+ +if (mmc ==NULL ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
+
fastboot_fail("invalid mmc device");common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 134
Quoted 11 lines
common/fb_mmc.c +9
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
+
fastboot_fail("invalid mmc device");common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 141
Quoted 8 lines
common/fb_mmc.c +6
-0+return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);no newline with
error()Will remove
+
fastboot_fail("cannot find partition");Quoted 9 lines
common/fb_mmc.c +6
-0+return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 155
Quoted 7 lines
common/fb_mmc.c +7
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ;Is this logic correct??? Isn't the "
erase_grp_size" in bytes? and the info.start & info.size in LBA's?Quoted 3 lines
Quoted 1 line
Yes, the math will take care of it. Ref:
mmc_berase()So, I have a partition:
2 0x00000300 0x000003ff "test" attrs: 0x0000000000000000 type: 9e312af1-18fe-fa41-45f3-37b3bb1d1061 guid: 18a5d0db-d23a-aac1-0d4c-692c7ba9ab1cQuoted 9 lines
and 'fastboot erase test' produces:
Erasing blocks 1024 to 1024 due to alignment
........ erased 0 bytes from 'test'
which is not correct!Furthermore, doesn't the
mmc_berase()already handle the "erase_grp_size"....It does handle it, in a way, but the way it handles it is to erase more blocks than requested if the request isn't aligned. In your example, you requested the "test" partition to be erased (
0x300to0x3ff), but what was actually erased (as printed in the "Caution" message frommmc_berase) was0x0to0x7ff.If I remove your alignment logic, then it produces:
Quoted 10 lines
Erasing blocks 768 to 1024 due to alignment
Caution! Your devices Erase group is
0x400
The erase range would be change to 0x0~0x7ff........ erased 131072 bytes from 'test'which looks correct (except for the "Caution" message)....
Thanks, Steve
Except that this one has now erased
0x0to0x300and0x400to0x7ffalso, which you did not want to erase, right?
Aligning the start address is meant to protect this data from being erased unintentionally. The trade-off is that some small partitions won't get erased at all, if they are too small and not aligned.Quoted 3 lines
Regards, Dileep
I'm sorry, but I am really confused....
Quoted 9 lines
-- 131072 bytes agrees with
0x300to0x3ff...
-- I'm suspicious that the Caution message and the actual erased bytes do not match....
-- I'm not certain that the existingmmc_berase()code is correct... -- If this "erase_grp_size" is a method to erase large sections "quickly", then it would seem that it needs to be combined with erasing (by writing "0" or "1" appropriately) to the smaller sections to erase the "exact specified size". And this should be handled in themmc_berase()code!
Thanks for your suggestions Steve. I will try to send a separate patch for mmc_berase() if required, after validating all the scenarios.
Quoted 4 lines
Additionally, because it is not necessary to "erase before writing", I personally do not have any need for this "fastboot erase" command at all. So I think that I am going to withdraw from this conversation.... Thanks, Steve
We wish fastboot to be complete with all the commands of the protocol supported in u-boot.
Regards,
Dileep
Quoted 105 lines
Quoted 105 lines
Quoted 104 lines
Quoted 104 lines
Quoted 91 lines
+
Quoted 11 lines
+ printf("Erasing blocks " LBAFU " to " LBAFU " due to
alignment\n",common/fb_mmc.c +3
-0+ blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase(dev_desc->dev, blks_start,
blks_size);common/fb_mmc.c +2
-0+if (blks != blks_size) { + error("failed erasing from device %d\n",
dev_desc->dev);no newline with
error()Will remove
+
fastboot_fail("failed erasing from device");Quoted 17 lines
common/fb_mmc.c +7
-0+return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_ renamed from drivers/usb/gadget/f_fastboot.c +0
-0
fastboot.c
index f7d84bf..a8d8205 100644drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct · line 548
Quoted 10 lines
drivers/usb/gadget/f_fastboot.c +8
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" );no newline with
error()Will remove
+
fastboot_tx_write_str("FAILmissing partition name");Quoted 31 lines
drivers/usb/gadget/f_fastboot.c +14
-0+return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd ="oem" , .cb = cb_oem, + }, { + .cmd ="erase" , + .cb = cb_erase, }, };include/fb_mmc.h +0
-0@@ -6,3 +6,4 @@Quoted 7 lines
Quoted 7 lines
include/fb_mmc.h +0
-0void fb_mmc_flash_write (const char *cmd,void *download_buffer, unsigned int download_bytes, char*response);
+voidfb_mmc_erase(const char *cmd, char *response);Thanks for the review. Will send v2 with changes.
Regards,
Dileep
PATCH v2 1/1 usb: gadget: fastboot: Add fastboot erase
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
---
Changes in v2:
- Removed unnecessary newline for error() messages
- Made the command conditional on CONFIG_FASTBOOT_FLASH
- Updated doc/README.android-fastboot to reflect the support
common/fb_mmc.c | 56 +++++++++++++++++++++++++++++++++++++++++ doc/README.android-fastboot | 5 ++-- drivers/usb/gadget/f_fastboot.c | 25 ++++++++++++++++++ include/fb_mmc.h | 1 + 4 files changed, 84 insertions(+), 3 deletions(-)
common/fb_mmc.c +56 -0
@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME
@@ -110,3 +111,58 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +/* Align blocks to erase group size to avoid erasing other partitions */ + grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d" , dev_desc->dev); +fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}
doc/README.android-fastboot +2 -3
@@ -6,9 +6,8 @@ Overview The protocol that is used over USB is described in README.android-fastboot-protocol in same directory. -The current implementation does not yet support the erase command or the -"oem format" command, and there is minimal support for the flash command; -it only supports eMMC devices. +The current implementation is a minimal support of the erase command,the +"oem format" command and flash command;it only supports eMMC devices. Client installation ===================
drivers/usb/gadget/f_fastboot.c +25 -0
@@ -535,6 +535,28 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } } +#ifdef CONFIG_FASTBOOT_FLASH +static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +#endif +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);
@@ -561,6 +583,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "flash", .cb = cb_flash, + }, { + .cmd = "erase", + .cb = cb_erase, }, #endif {
include/fb_mmc.h +1 -0
@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);
Signature · 1 line
1.8.3.2
PATCH v2 1/1 usb: gadget: fastboot: Add fastboot erase
Hi Dileep,
Quoted 159 lines
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Changes in v2:
- Removed unnecessary newline forerror()messages
- Made the command conditional onCONFIG_FASTBOOT_FLASH
- Updated doc/README.android-fastboot to reflect the supportcommon/fb_mmc.c | 56 +++++++++++++++++++++++++++++++++++++++++ doc/README.android-fastboot | 5 ++-- drivers/usb/gadget/f_fastboot.c | 25 ++++++++++++++++++ include/fb_mmc.h | 1 + 4 files changed, 84insertions(+), 3 deletions(-)
common/fb_mmc.c +9
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,58 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; + struct mmc *mmc =
find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); +common/fb_mmc.c +24
-0+if (mmc ==NULL ) { +error ("invalid mmc device" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +/* Align blocks to erase group size to avoid erasing other partitions */
common/fb_mmc.c +9
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + + printf("Erasing blocks " LBAFU " to " LBAFU " due toalignment\n",
common/fb_mmc.c +3
-0+ blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase(dev_desc->dev, blks_start,
blks_size);common/fb_mmc.c +2
-0+if (blks != blks_size) { + error("failed erasing from device %d",
dev_desc->dev);common/fb_mmc.c +8
-0+fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}doc/README.android-fastboot +0
-1@@ -6,9 +6,8 @@ Overview The protocol that is used over USB is described in README.android-fastboot-protocol in same directory. -The current implementation does not yet support the erase command orthe -"oem format" command, and there is minimal support for the flash command; -it only supports eMMC devices.
+The current implementation is a minimal support of the erase command,the +"oem format" command and flash command;it only supports eMMC devices.
Client installation
===================(quoted diff) +0
-0
b/drivers/usb/gadget/f_fastboot.cindex f7d84bf..6138906 100644drivers/usb/gadget/f_fastboot.c +25
-0@@ -535,6 +535,28 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } } +#ifdef CONFIG_FASTBOOT_FLASH +static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +#endif +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -561,6 +583,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "flash", .cb = cb_flash, + }, { + .cmd = "erase", + .cb = cb_erase, },#endif {include/fb_mmc.h +0
-0
include/fb_mmc.h line 9
Quoted 4 lines
include/fb_mmc.h +1
-0@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);
I'm going to apply this patch to -dfu tree.
Thanks Dileep!
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH v2 1/1 usb: gadget: fastboot: Add fastboot erase
Thanks Lukasz.
Regards,
Dileep
Quoted 179 lines · Lukasz Majewski
Hi Dileep,
Quoted 159 lines
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Changes in v2:
- Removed unnecessary newline forerror()messages
- Made the command conditional onCONFIG_FASTBOOT_FLASH
- Updated doc/README.android-fastboot to reflect the supportcommon/fb_mmc.c | 56 +++++++++++++++++++++++++++++++++++++++++ doc/README.android-fastboot | 5 ++-- drivers/usb/gadget/f_fastboot.c | 25 ++++++++++++++++++ include/fb_mmc.h | 1 + 4 files changed, 84insertions(+), 3 deletions(-)
common/fb_mmc.c +9
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,58 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; + struct mmc *mmc =
find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); +common/fb_mmc.c +24
-0+if (mmc ==NULL ) { +error ("invalid mmc device" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +/* Align blocks to erase group size to avoid erasing other partitions */
common/fb_mmc.c +9
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + + printf("Erasing blocks " LBAFU " to " LBAFU " due toalignment\n",
common/fb_mmc.c +3
-0+ blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase(dev_desc->dev, blks_start,
blks_size);common/fb_mmc.c +2
-0+if (blks != blks_size) { + error("failed erasing from device %d",
dev_desc->dev);common/fb_mmc.c +8
-0+fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}doc/README.android-fastboot +0
-1@@ -6,9 +6,8 @@ Overview The protocol that is used over USB is described in README.android-fastboot-protocol in same directory. -The current implementation does not yet support the erase command orthe -"oem format" command, and there is minimal support for the flash command; -it only supports eMMC devices.
+The current implementation is a minimal support of the erase command,the +"oem format" command and flash command;it only supports eMMC devices.
Client installation
===================(quoted diff) +0
-0
b/drivers/usb/gadget/f_fastboot.cindex f7d84bf..6138906 100644drivers/usb/gadget/f_fastboot.c +25
-0@@ -535,6 +535,28 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } } +#ifdef CONFIG_FASTBOOT_FLASH +static void cb_erase (struct usb_ep *ep,struct usb_request *req) +{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +#endif +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -561,6 +583,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "flash", .cb = cb_flash, + }, { + .cmd = "erase", + .cb = cb_erase, },#endif {include/fb_mmc.h +0
-0include/fb_mmc.h line 9
Quoted 4 lines
include/fb_mmc.h +1
-0@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response);Reviewed-by Lukasz Majewski <[email protected]>I'm going to apply this patch to -dfu tree.
Thanks Dileep!
--
Best regards,Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
In reply to Dileep KattaQuoted 207 lines · Dileep Katta
Quoted 115 lines · Steve Rae
Quoted 111 lines · Dileep Katta
Hi Steve,
Quoted 106 lines · Steve Rae
On 15-02-12 12:29 AM, Dileep Katta wrote:
Hi Steve,
Quoted 102 lines · Steve Rae
Quoted 100 lines
Hi, Dileep
Quoted 48 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 ++++++++++++++++++++++++++++++ +++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +9
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; + struct mmc *mmc = find_mmc_device(CONFIG_
FASTBOOT_FLASH_MMC_DEV);common/fb_mmc.c
Quoted 3 lines
common/fb_mmc.c +3
-0+ +if (mmc ==NULL ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
+
fastboot_fail("invalid mmc device");common/fb_mmc.c
Quoted 11 lines
common/fb_mmc.c +9
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" );no newline with
error()Will remove
+
fastboot_fail("invalid mmc device");common/fb_mmc.c
Quoted 8 lines
common/fb_mmc.c +6
-0+return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd);no newline with
error()Will remove
+
fastboot_fail("cannot find partition");Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
common/fb_mmc.c
Quoted 11 lines
common/fb_mmc.c +6
-0+return ; + } + +puts ("Erasing partition\n" ); + +/* Align blocks to erase group size to avoid erasing other partitions */
common/fb_mmc.c +4
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start))&
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
common/fb_mmc.c +3
-0+ (~(grp_size -1 )); + else + blks_size =0 ;Quoted 6 lines
Quoted 4 lines
Is this logic correct??? Isn't the "
erase_grp_size" in bytes? and the info.start & info.size in LBA's?Yes, the math will take care of it. Ref:
mmc_berase()So, I have a partition:
2 0x00000300 0x000003ff "test" attrs: 0x0000000000000000 type: 9e312af1-18fe-fa41-45f3-37b3bb1d1061 guid: 18a5d0db-d23a-aac1-0d4c-692c7ba9ab1cand 'fastboot erase test' produces:
Erasing blocks 1024 to 1024 due to alignment
........ erased 0 bytes from 'test'
which is not correct!Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
Furthermore, doesn't the
mmc_berase()already handle the "erase_grp_size"....It does handle it, in a way, but the way it handles it is to erase more blocks than requested if the request isn't aligned. In your example, you requested the "test" partition to be erased (
0x300to0x3ff), but whatwas
Quoted 1 line
Quoted 1 line
actually erased (as printed in the "Caution" message from
mmc_berase)was
Quoted 9 lines
Quoted 9 lines
0x0to0x7ff.If I remove your alignment logic, then it produces:
Quoted 5 lines
Erasing blocks 768 to 1024 due to alignment
Caution! Your devices Erase group is
0x400
The erase range would be change to 0x0~0x7ffQuoted 8 lines
Quoted 8 lines
Quoted 5 lines
........ erased 131072 bytes from 'test'which looks correct (except for the "Caution" message)....
Thanks, Steve
Except that this one has now erased
0x0to0x300and0x400to0x7ffalso,
Quoted 2 lines
Quoted 2 lines
which you did not want to erase, right?
Aligning the start address is meant to protect this data from beingerased
Quoted 8 lines
Quoted 6 lines
unintentionally. The trade-off is that some small partitions won't get erased at all, if they are too small and not aligned.
Regards, Dileep
I'm sorry, but I am really confused....
-- 131072 bytes agrees with
0x300to0x3ff...
-- I'm suspicious that the Caution message and the actual erased bytesdo
Quoted 4 lines
not match....
-- I'm not certain that the existingmmc_berase()code is correct... -- If this "erase_grp_size" is a method to erase large sections "quickly", then it would seem that it needs to be combined with erasing(by
Quoted 2 lines
writing "0" or "1" appropriately) to the smaller sections to erase the "exact specified size". And this should be handled in the
mmc_berase()code!
Quoted 1 line
Thanks for your suggestions Steve. I will try to send a separate patch for
mmc_berase()if required, after validating all the scenarios.
Quoted 9 lines
Quoted 4 lines
Additionally, because it is not necessary to "erase before writing", I personally do not have any need for this "fastboot erase" command at all. So I think that I am going to withdraw from this conversation.... Thanks, Steve
We wish fastboot to be complete with all the commands of the protocol supported in u-boot.
Actually according to this comment from fastboot (system/core/fastboot/fastboot.c), sometimes it is necessary to erase before flashing:
/* Until we get lazy inode table init working in make_ext4fs, we need to
* erase partitions of type ext4 before flashing a filesystem so no stale
* inodes are left lying around. Otherwise, e2fsck gets very upset. */
In order for fastboot to know that it needs to erase the partition first, we'll also need to implement a fastboot var "partition-type" that will return "ext4" for ext4 partitions. See system/core/fastboot/engine.c:fb_format_supported().
Matt
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
In reply to Dileep KattaQuoted 34 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +3
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response)
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 125
Quoted 10 lines
common/fb_mmc.c +10
-0+{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info; +lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" );
Perhaps fastboot_fail should also call error().
Quoted 11 lines
common/fb_mmc.c +11
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" ); +return ;
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 146
Quoted 10 lines
common/fb_mmc.c +10
-0+ } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) { +error ("cannot find partition: '%s'\n" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +puts ("Erasing partition\n" );
This can probably be dropped since you have a print below.
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 148
Quoted 2 lines
common/fb_mmc.c +2
-0+ +/* Align blocks to erase group size to avoid erasing other partitions */
The partitioning could should probably enforce optimal alignment, but I guess that's a separate patch.
Quoted 27 lines
common/fb_mmc.c +22
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev); +fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_fastboot.c +0
-0
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req) · line 538
Quoted 4 lines
drivers/usb/gadget/f_fastboot.c +1
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } } +static void cb_erase (struct usb_ep *ep,struct usb_request *req)
This should be conditional on CONFIG_FASTBOOT_FLASH
Quoted 48 lines
drivers/usb/gadget/f_fastboot.c +22
-0+{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };include/fb_mmc.h +1
-1@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response); --1.8.3.2
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Hi Rob,
Quoted 39 lines · Rob Herring
Quoted 38 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +7
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info;
Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 125
Quoted 6 lines
common/fb_mmc.c +6
-0+lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" );Perhaps
fastboot_failshould also callerror().
There is error() before every fastboot_fail(). You mean to move error() inside fastboot_fail()? If yes, I will do it.
Quoted 16 lines
Quoted 16 lines
common/fb_mmc.c +15
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) {
Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 146
Quoted 6 lines
common/fb_mmc.c +6
-0+error ("cannot find partition: '%s'\n" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +puts ("Erasing partition\n" );This can probably be dropped since you have a print below.
Will remove.
Quoted 5 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 148
Quoted 2 lines
common/fb_mmc.c +2
-0+ +/* Align blocks to erase group size to avoid erasing other partitions */ The partitioning could should probably enforce optimal alignment, but I guess that's a separate patch.
Fine. Will do it as a separate patch.
Quoted 31 lines
Quoted 31 lines
common/fb_mmc.c +22
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev); +fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }
Quoted 3 lines
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req) · line 538
Quoted 1 line
drivers/usb/gadget/f_fastboot.c +1
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req)This should be conditional on
CONFIG_FASTBOOT_FLASH
Will make it conditional as in cb_oem().
Quoted 45 lines
Quoted 45 lines
drivers/usb/gadget/f_fastboot.c +22
-0+{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };include/fb_mmc.h +1
-1@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response); --1.8.3.2
Quoted 4 lines
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Thanks for the comments. Will send v2 once I get your input on fastboot_fail().
Regards,
Dileep
PATCH 1/1 usb: gadget: fastboot: Add fastboot erase
Quoted 50 lines · Dileep Katta
Hi Rob,
Quoted 39 lines · Rob Herring
Quoted 38 lines · Dileep Katta
Adds the fastboot erase functionality, to erase a partition specified by name. The erase is performed based on erase group size, to avoid erasing other partitions. The start address and the size is aligned to the erase group size for this.
Currently only supports erasing from eMMC.
Signed-off-by Dileep Katta <[email protected]>---
Note: The changes are on top of oem command support added by robh at kernel.orgcommon/fb_mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 23 ++++++++++++++++ include/fb_mmc.h | 1 + 3 files changed, 82 insertions(+)common/fb_mmc.c +7
-0@@ -10,6 +10,7 @@#include <part.h> #include <aboot.h> #include <sparse_format.h> +#include <mmc.h> #ifndef CONFIG_FASTBOOT_GPT_NAME #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME@@ -110,3 +111,60 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,write_raw_image (dev_desc, &info, cmd, download_buffer, download_bytes); } + +void fb_mmc_erase (const char *cmd,char *response) +{ +int ret; +block_dev_desc_t *dev_desc; +disk_partition_t info;Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 125
Quoted 6 lines
common/fb_mmc.c +6
-0+lbaint_t blks, blks_start, blks_size, grp_size; +struct mmc *mmc =find_mmc_device (CONFIG_FASTBOOT_FLASH_MMC_DEV ); + +if (mmc ==NULL ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" );Perhaps
fastboot_failshould also callerror().
Quoted 2 lines
There is
error()before everyfastboot_fail(). You mean to moveerror()insidefastboot_fail()? If yes, I will do it.
I disagree - most of the error() report more information about the issue; and the fastboot_fail() just informs the host that it was unsuccessful -- I don't think that we should force these to be the same....
Thanks, Steve
Quoted 125 lines
Quoted 16 lines
Quoted 16 lines
common/fb_mmc.c +15
-0+return ; + } + +/* initialize the response buffer */ + response_str = response; + + dev_desc =get_dev ("mmc" ,CONFIG_FASTBOOT_FLASH_MMC_DEV ); +if (!dev_desc || dev_desc->type ==DEV_TYPE_UNKNOWN ) { +error ("invalid mmc device\n" ); +fastboot_fail ("invalid mmc device" ); +return ; + } + + ret =get_partition_info_efi_by_name (dev_desc, cmd, &info); +if (ret) {Quoted 8 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 146
Quoted 6 lines
common/fb_mmc.c +6
-0+error ("cannot find partition: '%s'\n" , cmd); +fastboot_fail ("cannot find partition" ); +return ; + } + +puts ("Erasing partition\n" );This can probably be dropped since you have a print below.
Will remove.
Quoted 5 lines
common/fb_mmc.c void fb_mmc_flash_write(const char *cmd, void *download_buffer, · line 148
Quoted 2 lines
common/fb_mmc.c +2
-0+ +/* Align blocks to erase group size to avoid erasing other partitions */ The partitioning could should probably enforce optimal alignment, but I guess that's a separate patch.
Fine. Will do it as a separate patch.
Quoted 31 lines
Quoted 31 lines
common/fb_mmc.c +22
-0+ grp_size = mmc->erase_grp_size; + blks_start = (info.start + grp_size -1 ) & ~(grp_size -1 ); +if (info.size >= grp_size) + blks_size = (info.size - (blks_start - info.start)) & + (~(grp_size -1 )); +else + blks_size =0 ; + +printf ("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n" , + blks_start, blks_start + blks_size); + + blks = dev_desc->block_erase (dev_desc->dev, blks_start, blks_size); +if (blks != blks_size) { +error ("failed erasing from device %d\n" , dev_desc->dev); +fastboot_fail ("failed erasing from device" ); +return ; + } + +printf ("........ erased " LBAFU " bytes from '%s'\n" , + blks_size * info.blksz, cmd); +fastboot_okay ("" ); +}drivers/usb/gadget/f_fastboot.c +0
-0@@ -535,6 +535,26 @@ static void cb_oem(struct usb_ep *ep, struct usb_request *req) } }Quoted 3 lines
drivers/usb/gadget/f_fastboot.c static void cb_oem(struct usb_ep *ep, struct usb_request *req) · line 538
Quoted 1 line
drivers/usb/gadget/f_fastboot.c +1
-0+static void cb_erase (struct usb_ep *ep,struct usb_request *req)This should be conditional on
CONFIG_FASTBOOT_FLASHWill make it conditional as in
cb_oem().Quoted 45 lines
Quoted 45 lines
drivers/usb/gadget/f_fastboot.c +22
-0+{ +char *cmd = req->buf; +char response[RESPONSE_LEN ]; + +strsep (&cmd,":" ); +if (!cmd) { +error ("missing partition name\n" ); +fastboot_tx_write_str ("FAILmissing partition name" ); +return ; + } + +strcpy (response,"FAILno flash device defined" ); + +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV +fb_mmc_erase (cmd, response); +#endif +fastboot_tx_write_str (response); +} +struct cmd_dispatch_info {char *cmd;void (*cb)(struct usb_ep *ep,struct usb_request *req);@@ -566,6 +586,9 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd = "oem", .cb = cb_oem, + }, { + .cmd = "erase", + .cb = cb_erase, }, };include/fb_mmc.h +1
-1@@ -6,3 +6,4 @@void fb_mmc_flash_write (const char *cmd,void *download_buffer,unsigned int download_bytes,char *response); +void fb_mmc_erase (const char *cmd,char *response); --1.8.3.2
Quoted 4 lines
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-bootThanks for the comments. Will send v2 once I get your input on
fastboot_fail().Regards,
Dileep
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot