Looks good. Tested on my side. This patch fixes some of VtsFastbootVerification.
вт, 23 июн. 2020 г. в 03:28, Roman Kovalivskyi <roman.kovalivs...@globallogic.com>: > > Android 10 adds support for dynamic partitions and in order to support > this userspace fastboot must be used[1]. New tool fastbootd is > included into recovery. > > Userspace fastboot works from recovery and is launched if: > 1) - Dynamic partitioning is enabled > 2) - Boot control block has 'boot-fastboot' value into command field > The bootloader is expected to load and boot into the recovery image > upon seeing boot-fastboot in the BCB command. Recovery then parses the > BCB message and switches to fastbootd mode[2]. > > Please note that boot script is expected to handle 'boot-fastboot' > command in BCB and load into recovery mode. > > Bootloader must support 'reboot fastboot' command which should reboot > device into userspace fastboot to accomodate those changes[3]. > > Another command that bootloader must support[3] is 'reboot recovery'. This > command should simply reboot device into recovery mode. > > [1] - https://source.android.com/devices/bootloader/fastbootd > [2] - > https://source.android.com/devices/bootloader/fastbootd#unified_fastboot_and_recovery > [3] - > https://source.android.com/devices/bootloader/fastbootd#modifications_to_the_bootloader > > Signed-off-by: Roman Kovalivskyi <roman.kovalivs...@globallogic.com> > Signed-off-by: Roman Stratiienko <r.stratiie...@gmail.com> > Change-Id: I9d2bdc9a6f6f31ea98572fe155e1cc8341e9af76 > --- > drivers/fastboot/fb_command.c | 38 +++++++++++++++++++++++++++++++++ > drivers/usb/gadget/f_fastboot.c | 2 ++ > include/fastboot.h | 4 ++++ > net/fastboot.c | 2 ++ > 4 files changed, 46 insertions(+) > > diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c > index 8ce5d32fb2ba..d3c578672dc6 100644 > --- a/drivers/fastboot/fb_command.c > +++ b/drivers/fastboot/fb_command.c > @@ -37,6 +37,8 @@ static void flash(char *, char *); > static void erase(char *, char *); > #endif > static void reboot_bootloader(char *, char *); > +static void reboot_fastbootd(char *, char *); > +static void reboot_recovery(char *, char *); > #if CONFIG_IS_ENABLED(FASTBOOT_CMD_OEM_FORMAT) > static void oem_format(char *, char *); > #endif > @@ -79,6 +81,14 @@ static const struct { > .command = "reboot-bootloader", > .dispatch = reboot_bootloader > }, > + [FASTBOOT_COMMAND_REBOOT_FASTBOOTD] = { > + .command = "reboot-fastboot", > + .dispatch = reboot_fastbootd > + }, > + [FASTBOOT_COMMAND_REBOOT_RECOVERY] = { > + .command = "reboot-recovery", > + .dispatch = reboot_recovery > + }, > [FASTBOOT_COMMAND_SET_ACTIVE] = { > .command = "set_active", > .dispatch = okay > @@ -313,6 +323,34 @@ static void reboot_bootloader(char *cmd_parameter, char > *response) > fastboot_okay(NULL, response); > } > > +/** > + * reboot_fastbootd() - Sets reboot fastboot flag. > + * > + * @cmd_parameter: Pointer to command parameter > + * @response: Pointer to fastboot response buffer > + */ > +static void reboot_fastbootd(char *cmd_parameter, char *response) > +{ > + if (fastboot_set_reboot_flag(FASTBOOT_REBOOT_REASON_FASTBOOTD)) > + fastboot_fail("Cannot set fastboot flag", response); > + else > + fastboot_okay(NULL, response); > +} > + > +/** > + * reboot_recovery() - Sets reboot recovery flag. > + * > + * @cmd_parameter: Pointer to command parameter > + * @response: Pointer to fastboot response buffer > + */ > +static void reboot_recovery(char *cmd_parameter, char *response) > +{ > + if (fastboot_set_reboot_flag(FASTBOOT_REBOOT_REASON_RECOVERY)) > + fastboot_fail("Cannot set recovery flag", response); > + else > + fastboot_okay(NULL, response); > +} > + > #if CONFIG_IS_ENABLED(FASTBOOT_CMD_OEM_FORMAT) > /** > * oem_format() - Execute the OEM format command > diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c > index 384c0f6f6e27..30f7a52087fc 100644 > --- a/drivers/usb/gadget/f_fastboot.c > +++ b/drivers/usb/gadget/f_fastboot.c > @@ -455,6 +455,8 @@ static void rx_handler_command(struct usb_ep *ep, struct > usb_request *req) > > case FASTBOOT_COMMAND_REBOOT: > case FASTBOOT_COMMAND_REBOOT_BOOTLOADER: > + case FASTBOOT_COMMAND_REBOOT_FASTBOOTD: > + case FASTBOOT_COMMAND_REBOOT_RECOVERY: > fastboot_func->in_req->complete = compl_do_reset; > break; > } > diff --git a/include/fastboot.h b/include/fastboot.h > index 14f4c68868d8..b86b508e69fd 100644 > --- a/include/fastboot.h > +++ b/include/fastboot.h > @@ -32,6 +32,8 @@ enum { > FASTBOOT_COMMAND_CONTINUE, > FASTBOOT_COMMAND_REBOOT, > FASTBOOT_COMMAND_REBOOT_BOOTLOADER, > + FASTBOOT_COMMAND_REBOOT_FASTBOOTD, > + FASTBOOT_COMMAND_REBOOT_RECOVERY, > FASTBOOT_COMMAND_SET_ACTIVE, > #if CONFIG_IS_ENABLED(FASTBOOT_CMD_OEM_FORMAT) > FASTBOOT_COMMAND_OEM_FORMAT, > @@ -45,6 +47,8 @@ enum { > */ > enum fastboot_reboot_reason { > FASTBOOT_REBOOT_REASON_BOOTLOADER, > + FASTBOOT_REBOOT_REASON_FASTBOOTD, > + FASTBOOT_REBOOT_REASON_RECOVERY, > FASTBOOT_REBOOT_REASONS_COUNT > }; > > diff --git a/net/fastboot.c b/net/fastboot.c > index 0c57fb9947df..7e7a601b9fe6 100644 > --- a/net/fastboot.c > +++ b/net/fastboot.c > @@ -227,6 +227,8 @@ static void fastboot_send(struct fastboot_header header, > char *fastboot_data, > > case FASTBOOT_COMMAND_REBOOT: > case FASTBOOT_COMMAND_REBOOT_BOOTLOADER: > + case FASTBOOT_COMMAND_REBOOT_FASTBOOTD: > + case FASTBOOT_COMMAND_REBOOT_RECOVERY: > do_reset(NULL, 0, 0, NULL); > break; > } > -- > 2.17.1 >
