| Message ID | 20190612095419.29091-1-igor.opaniuk@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Lukasz Majewski |
| Headers | show |
| Series | [U-Boot,1/1] fastboot: check if partition really exist in getvar_has_slot() | expand |
On Wed, Jun 12, 2019 at 12:54 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote: > > From: Igor Opaniuk <igor.opaniuk@toradex.com> > > Currently getvar_has_slot() invocation for "boot" and "system" > partitions always returns affirmative response regardless the fact of > existence of these partitions, which leads to impossibility to flash them > on old non-A/B AOSP setups, where _a/_b suffixes aren't used: > > $ fastboot flash boot boot.img > Sending 'boot__a' (11301 KB) OKAY [ 0.451s] > Writing 'boot__a' FAILED (remote: 'cannot find partition') > fastboot: error: Command failed > > Although partition layout is: > -> part list mmc 0 > Partition Map for MMC device 0 -- Partition Type: EFI > > Part Start LBA End LBA Name > Attributes > Type GUID > Partition GUID > 1 0x00000800 0x000107ff "boot" > attrs: 0x0000000000000000 > type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 > guid: ea2e2470-db4a-d646-b828-10167f736d63 > 2 0x00010800 0x000127ff "environment" > attrs: 0x0000000000000000 > type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 > guid: 10a819d2-6004-3d48-bd87-114e2a796db9 > 3 0x00012800 0x0001a7ff "recovery" > attrs: 0x0000000000000000 > type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 > guid: 9ea116e4-8a34-0c48-8cf5-2fe9480f56cd > 4 0x0001a800 0x0031a7ff "system" > attrs: 0x0000000000000000 > ...... > > This patch adds checks of existence for requested partitions > on eMMC/NAND. > > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> > --- > drivers/fastboot/fb_getvar.c | 37 ++++++++++++++++++++++++++++++++---- > 1 file changed, 33 insertions(+), 4 deletions(-) > > diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c > index 4268628f5e..51e3f13060 100644 > --- a/drivers/fastboot/fb_getvar.c > +++ b/drivers/fastboot/fb_getvar.c > @@ -144,11 +144,40 @@ static void getvar_slot_suffixes(char *var_parameter, char *response) > > static void getvar_has_slot(char *part_name, char *response) > { > - if (part_name && (!strcmp(part_name, "boot") || > - !strcmp(part_name, "system"))) > - fastboot_okay("yes", response); > - else > + char part_name_wslot[PART_NAME_LEN]; > + int r; > + > + if (!part_name) { > fastboot_okay("no", response); > + return; > + } > + > + /* Concatenate _a prefix and check if this partition exist */ > + part_name_wslot[0] = '\0'; > + strcat(part_name_wslot, part_name); > + strcat(part_name_wslot, "_a"); > + > +#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) > + struct blk_desc *dev_desc; > + disk_partition_t part_info; > + > + r = fastboot_mmc_get_part_info(part_name_wslot, &dev_desc, &part_info, > + response); > + if (r >= 0) { > + fastboot_okay("yes", response); > + return; > + } > +#endif > +#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND) > + struct part_info *part_info; > + > + r = fastboot_nand_get_part_info(part_name_wslot, &part_info, response); > + if (r >= 0) { > + fastboot_okay("yes", response); > + return; > + } > +#endif > + fastboot_okay("no", response); > } > > #if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) > -- > 2.17.1 > FYI: v2 patch was included in "Fix getvar "has-slot" and cleanup" [1] patch-series and re-sent by Sam Protsenko <semen.protsenko@linaro.org>. [1] https://patchwork.ozlabs.org/cover/1114844/
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 4268628f5e..51e3f13060 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -144,11 +144,40 @@ static void getvar_slot_suffixes(char *var_parameter, char *response) static void getvar_has_slot(char *part_name, char *response) { - if (part_name && (!strcmp(part_name, "boot") || - !strcmp(part_name, "system"))) - fastboot_okay("yes", response); - else + char part_name_wslot[PART_NAME_LEN]; + int r; + + if (!part_name) { fastboot_okay("no", response); + return; + } + + /* Concatenate _a prefix and check if this partition exist */ + part_name_wslot[0] = '\0'; + strcat(part_name_wslot, part_name); + strcat(part_name_wslot, "_a"); + +#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) + struct blk_desc *dev_desc; + disk_partition_t part_info; + + r = fastboot_mmc_get_part_info(part_name_wslot, &dev_desc, &part_info, + response); + if (r >= 0) { + fastboot_okay("yes", response); + return; + } +#endif +#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND) + struct part_info *part_info; + + r = fastboot_nand_get_part_info(part_name_wslot, &part_info, response); + if (r >= 0) { + fastboot_okay("yes", response); + return; + } +#endif + fastboot_okay("no", response); } #if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)