fastboot: add UUU command UCmd and ACmd support
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
add support for the UUU commands ACmd and UCmd.
Enable them through the Kconfig optionCONFIG_FASTBOOT_UUU_SUPPORT
base was commit in NXP kernel9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")
and ported it to current mainline. Tested this patch on imx6ul based board.
---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=results
version uuu tool used for tests:
commit 3870fb781b35: ("fastboot: default to logical-block-size 4096")
doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)
doc/android/fastboot-protocol.rst +5 -0
@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and wait until it + finishs. + + "acmd" execute any bootloader command, do not wait. + Client Variables ----------------
doc/android/fastboot.rst +2 -0
@@ -19,6 +19,8 @@ The current implementation supports the following standard commands: - ``reboot`` - ``reboot-bootloader`` - ``set_active`` (only a stub implementation which always succeeds) +- ``ucmd`` (if enabled) +- ``acmd`` (if enabled) The following OEM commands are supported (if enabled):
drivers/fastboot/Kconfig +7 -0
@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd" command + choice prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASH
drivers/fastboot/fb_command.c +62 -0
80 lines not on this page · raw message
drivers/usb/gadget/f_fastboot.c +17 -0
@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)do_exit_on_complete (ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;
@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)case FASTBOOT_COMMAND_REBOOT_RECOVERY : fastboot_func->in_req->complete = compl_do_reset;break ; +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete = do_acmd_complete; +break ; +#endif } }
include/fastboot.h +7 -0
@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };
@@ -172,4 +176,7 @@ void fastboot_data_download(const void *fastboot_data,*/ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */
Signature · 1 line
2.25.4
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Hi Heiko,
Quoted 20 lines · Heiko Schocher
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")
Quoted 7 lines
doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)
You can try to use if() for the CONFIG options here. See for example vid_console_color().
It is sometimes possible to do this, too, but it is a bit riskier:
switch (xxx) {
case SOMETHING:
if (CONFIG_IS_ENABLED...) {
do stuff if this feature is enabled
break;
}
/* no break */
default:
/* not supported */
}Regards,
Simon
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
In reply to Heiko SchocherHello Tom,
this patch is assigned to you ... any issues with it, or can it go into master?
Thanks!
bye,
Heiko
Am 11.01.21 um 11:19 schrieb Heiko Schocher:
Quoted 220 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)doc/android/fastboot-protocol.rst +5
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and wait until it + finishs. + + "acmd" execute any bootloader command, do not wait. + Client Variables ----------------doc/android/fastboot.rst +2
-0@@ -19,6 +19,8 @@ The current implementation supports the following standard commands: - ``reboot`` - ``reboot-bootloader`` - ``set_active`` (only a stub implementation which always succeeds) +- ``ucmd`` (if enabled) +- ``acmd`` (if enabled) The following OEM commands are supported (if enabled):drivers/fastboot/Kconfig +7
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd" command + choice prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASHdrivers/fastboot/fb_command.c +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *);static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void run_ucmd (char *,char *); +static void run_acmd (char *,char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif };/** @@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) }#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +/** +* run_ucmd() - Execute the UCmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_ucmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +if (run_command (cmd_parameter,0 )) +fastboot_fail ("" , response); +else +fastboot_okay (NULL , response); +} + +static char g_a_cmd_buff[64 ]; + +void fastboot_acmd_complete (void ) +{ +run_command (g_a_cmd_buff,0 ); +} + +/** +* run_acmd() - Execute the ACmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_acmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +strcpy (g_a_cmd_buff, cmd_parameter); +fastboot_okay (NULL , response); +} +#endif +/** * reboot_bootloader() - Sets reboot bootloader flag. * drivers/usb/gadget/f_fastboot.c +17
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)do_exit_on_complete (ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)case FASTBOOT_COMMAND_REBOOT_RECOVERY : fastboot_func->in_req->complete = compl_do_reset;break ; +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete = do_acmd_complete; +break ; +#endif } }include/fastboot.h +7
-0@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void *fastboot_data,*/ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Quoted 4 lines · Heiko Schocher
Hello Tom,
this patch is assigned to you ... any issues with it, or can it go into master?
As Lukasz is back and reviewing code and making PRs, he should take it. Thanks.
Quoted 232 lines
Thanks!
bye,
HeikoAm 11.01.21 um 11:19 schrieb Heiko Schocher:
Quoted 220 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)doc/android/fastboot-protocol.rst +5
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and wait until it + finishs. + + "acmd" execute any bootloader command, do not wait. + Client Variables ----------------doc/android/fastboot.rst +2
-0@@ -19,6 +19,8 @@ The current implementation supports the following standard commands: - ``reboot`` - ``reboot-bootloader`` - ``set_active`` (only a stub implementation which always succeeds) +- ``ucmd`` (if enabled) +- ``acmd`` (if enabled) The following OEM commands are supported (if enabled):drivers/fastboot/Kconfig +7
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd" command + choice prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASHdrivers/fastboot/fb_command.c +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *);static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void run_ucmd (char *,char *); +static void run_acmd (char *,char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif };/** @@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) }#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +/** +* run_ucmd() - Execute the UCmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_ucmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +if (run_command (cmd_parameter,0 )) +fastboot_fail ("" , response); +else +fastboot_okay (NULL , response); +} + +static char g_a_cmd_buff[64 ]; + +void fastboot_acmd_complete (void ) +{ +run_command (g_a_cmd_buff,0 ); +} + +/** +* run_acmd() - Execute the ACmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_acmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +strcpy (g_a_cmd_buff, cmd_parameter); +fastboot_okay (NULL , response); +} +#endif +/** * reboot_bootloader() - Sets reboot bootloader flag. * drivers/usb/gadget/f_fastboot.c +17
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)do_exit_on_complete (ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)case FASTBOOT_COMMAND_REBOOT_RECOVERY : fastboot_func->in_req->complete = compl_do_reset;break ; +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete = do_acmd_complete; +break ; +#endif } }include/fastboot.h +7
-0@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void *fastboot_data,*/ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210126/560b1cba/attachment.sig>
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Hello Tom,
Am 26.01.21 um 12:46 schrieb Tom Rini:
Quoted 9 lines · Heiko Schocher
Quoted 5 lines
Hello Tom,
this patch is assigned to you ... any issues with it, or can it go into master?
As Lukasz is back and reviewing code and making PRs, he should take it. Thanks.
Ok, so I moved the patch in patchwork to Lukasz.
Thanks!
bye,
Heiko
Quoted 234 lines
Quoted 233 lines
Thanks!
bye,
HeikoAm 11.01.21 um 11:19 schrieb Heiko Schocher:
Quoted 220 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)doc/android/fastboot-protocol.rst +5
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and wait until it + finishs. + + "acmd" execute any bootloader command, do not wait. + Client Variables ----------------doc/android/fastboot.rst +2
-0@@ -19,6 +19,8 @@ The current implementation supports the following standard commands: - ``reboot`` - ``reboot-bootloader`` - ``set_active`` (only a stub implementation which always succeeds) +- ``ucmd`` (if enabled) +- ``acmd`` (if enabled) The following OEM commands are supported (if enabled):drivers/fastboot/Kconfig +7
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd" command + choice prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASHdrivers/fastboot/fb_command.c +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *);static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void run_ucmd (char *,char *); +static void run_acmd (char *,char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif };/** @@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) }#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +/** +* run_ucmd() - Execute the UCmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_ucmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +if (run_command (cmd_parameter,0 )) +fastboot_fail ("" , response); +else +fastboot_okay (NULL , response); +} + +static char g_a_cmd_buff[64 ]; + +void fastboot_acmd_complete (void ) +{ +run_command (g_a_cmd_buff,0 ); +} + +/** +* run_acmd() - Execute the ACmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_acmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +strcpy (g_a_cmd_buff, cmd_parameter); +fastboot_okay (NULL , response); +} +#endif +/** * reboot_bootloader() - Sets reboot bootloader flag. * drivers/usb/gadget/f_fastboot.c +17
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)do_exit_on_complete (ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)case FASTBOOT_COMMAND_REBOOT_RECOVERY : fastboot_func->in_req->complete = compl_do_reset;break ; +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete = do_acmd_complete; +break ; +#endif } }include/fastboot.h +7
-0@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void *fastboot_data,*/ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Hi Heiko,
Quoted 13 lines
Hello Tom,
Am 26.01.21 um 12:46 schrieb Tom Rini:
Quoted 9 lines · Heiko Schocher
Quoted 5 lines
Hello Tom,
this patch is assigned to you ... any issues with it, or can it go into master?
As Lukasz is back and reviewing code and making PRs, he should take it. Thanks.
Quoted 250 lines
Ok, so I moved the patch in patchwork to Lukasz.
Thanks!
bye,
HeikoQuoted 241 lines
Quoted 240 lines
Thanks!
bye,
HeikoAm 11.01.21 um 11:19 schrieb Heiko Schocher:
Quoted 226 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)(quoted diff) +0
-0
b/doc/android/fastboot-protocol.rstindexe723659e49c..e8cbd7f24ea100644 ---a/doc/android/fastboot-protocol.rst+++b/doc/android/fastboot-protocol.rst@@ -144,6 +144,11 @@ Command Reference
"powerdown" Power off the device.+ "ucmd" execute any bootloader command and wait
until itdoc/android/fastboot-protocol.rst +3
-0+ finishs. + + "acmd" execute any bootloader command, do notwait. +
Client Variables
----------------doc/android/fastboot.rst +0
-0@@ -19,6 +19,8 @@ The current implementation supports thefollowing standard commands:
- ``reboot``
- ``reboot-bootloader``
- ``set_active`` (only a stub implementation which always
succeeds) +- ``ucmd`` (if enabled)
+- ``acmd`` (if enabled)The following OEM commands are supported (if enabled):
drivers/fastboot/Kconfig +0
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device.Define this to enable the "fastboot flash" command.
drivers/fastboot/Kconfig +3
-0+config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 ||
ARCH_IMX8M||ARCH_MX7ULPdrivers/fastboot/Kconfig +3
-0+ select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and"ACmd" command +
choicedrivers/fastboot/Kconfig +0
-0prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASH(quoted diff) +0
-0
b/drivers/fastboot/fb_command.cindexd3c578672dc..31a47e46386100644 ---a/drivers/fastboot/fb_command.c
+++b/drivers/fastboot/fb_command.cdrivers/fastboot/fb_command.c +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *);static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void run_ucmd (char *,char *); +static void run_acmd (char *,char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif };/** @@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) }#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +/** +* run_ucmd() - Execute the UCmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_ucmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +if (run_command (cmd_parameter,0 )) +fastboot_fail ("" , response); +else +fastboot_okay (NULL , response); +} + +static char g_a_cmd_buff[64 ]; + +void fastboot_acmd_complete (void ) +{ +run_command (g_a_cmd_buff,0 ); +} + +/** +* run_acmd() - Execute the ACmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_acmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +strcpy (g_a_cmd_buff, cmd_parameter); +fastboot_okay (NULL , response); +} +#endif +/** * reboot_bootloader() - Sets reboot bootloader flag. * (quoted diff) +0
-0
b/drivers/usb/gadget/f_fastboot.cindexd1d087e12b2..bf52d2505f4100644 ---a/drivers/usb/gadget/f_fastboot.c
+++b/drivers/usb/gadget/f_fastboot.cdrivers/usb/gadget/f_fastboot.c +11
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) do_exit_on_complete(ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) case
FASTBOOT_COMMAND_REBOOT_RECOVERY:fastboot_func->in_req->complete=compl_do_reset; break;drivers/usb/gadget/f_fastboot.c +3
-0+#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete =
do_acmd_complete;drivers/usb/gadget/f_fastboot.c +2
-0+break ; +#endif } }include/fastboot.h +7
-0@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void*fastboot_data, */ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ Signature · 4 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
As Roman has re-send the cmd:bcb:* patches I will take this one and prepare PR in a few days time.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210127/1bc1b486/attachment.sig>
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
In reply to Heiko SchocherHello Heiko,
Looks like these commands will provide full access to any u-boot commands, including working with memory.
It can be used to read/set any registers/data which is not in the trust zone, thus opening a huge backdoor.
This command could be useful for debug/CI purposes, but do you really want this in release builds?
Best regards,
Roman
??, 11 ???. 2021 ?. ? 12:19, Heiko Schocher <[email protected]>:
Quoted 223 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)doc/android/fastboot-protocol.rst +5
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and wait until it + finishs. + + "acmd" execute any bootloader command, do not wait. + Client Variables ----------------doc/android/fastboot.rst +2
-0@@ -19,6 +19,8 @@ The current implementation supports the following standard commands: - ``reboot`` - ``reboot-bootloader`` - ``set_active`` (only a stub implementation which always succeeds) +- ``ucmd`` (if enabled) +- ``acmd`` (if enabled) The following OEM commands are supported (if enabled):drivers/fastboot/Kconfig +7
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd" command + choice prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASHdrivers/fastboot/fb_command.c +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *);static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void run_ucmd (char *,char *); +static void run_acmd (char *,char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif };/** @@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) }#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +/** +* run_ucmd() - Execute the UCmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_ucmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +if (run_command (cmd_parameter,0 )) +fastboot_fail ("" , response); +else +fastboot_okay (NULL , response); +} + +static char g_a_cmd_buff[64 ]; + +void fastboot_acmd_complete (void ) +{ +run_command (g_a_cmd_buff,0 ); +} + +/** +* run_acmd() - Execute the ACmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_acmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +strcpy (g_a_cmd_buff, cmd_parameter); +fastboot_okay (NULL , response); +} +#endif +/** * reboot_bootloader() - Sets reboot bootloader flag. * drivers/usb/gadget/f_fastboot.c +17
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)do_exit_on_complete (ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)case FASTBOOT_COMMAND_REBOOT_RECOVERY : fastboot_func->in_req->complete = compl_do_reset;break ; +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete = do_acmd_complete; +break ; +#endif } }include/fastboot.h +7
-1@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void *fastboot_data,*/ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ --2.25.4
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Hello Roman,
Am 27.01.21 um 10:34 schrieb Roman Stratiienko:
Quoted 9 lines
Hello Heiko,
Looks like these commands will provide full access to any u-boot commands, including working with memory.
It can be used to read/set any registers/data which is not in the trust zone, thus opening a huge backdoor.This command could be useful for debug/CI purposes, but do you really want this in release builds?
Hmm.. indeed.
I set the default to no not to yes, so you need
to enable it, and add a comment in Kconfig.
Thanks!
bye,
Heiko
Quoted 228 lines
Best regards,
Roman??, 11 ???. 2021 ?. ? 12:19, Heiko Schocher <[email protected]>:
Quoted 223 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)doc/android/fastboot-protocol.rst +5
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and wait until it + finishs. + + "acmd" execute any bootloader command, do not wait. + Client Variables ----------------doc/android/fastboot.rst +2
-0@@ -19,6 +19,8 @@ The current implementation supports the following standard commands: - ``reboot`` - ``reboot-bootloader`` - ``set_active`` (only a stub implementation which always succeeds) +- ``ucmd`` (if enabled) +- ``acmd`` (if enabled) The following OEM commands are supported (if enabled):drivers/fastboot/Kconfig +7
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7ULP + select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd" command + choice prompt "Flash provider for FASTBOOT" depends on FASTBOOT_FLASHdrivers/fastboot/fb_command.c +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *);static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void run_ucmd (char *,char *); +static void run_acmd (char *,char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif };/** @@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) }#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +/** +* run_ucmd() - Execute the UCmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_ucmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +if (run_command (cmd_parameter,0 )) +fastboot_fail ("" , response); +else +fastboot_okay (NULL , response); +} + +static char g_a_cmd_buff[64 ]; + +void fastboot_acmd_complete (void ) +{ +run_command (g_a_cmd_buff,0 ); +} + +/** +* run_acmd() - Execute the ACmd command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void run_acmd (char *cmd_parameter,char *response) +{ +if (!cmd_parameter) { +pr_err ("missing slot suffix\n" ); +fastboot_fail ("missing command" , response); +return ; + } + +strcpy (g_a_cmd_buff, cmd_parameter); +fastboot_okay (NULL , response); +} +#endif +/** * reboot_bootloader() - Sets reboot bootloader flag. * drivers/usb/gadget/f_fastboot.c +17
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)do_exit_on_complete (ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)case FASTBOOT_COMMAND_REBOOT_RECOVERY : fastboot_func->in_req->complete = compl_do_reset;break ; +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete = do_acmd_complete; +break ; +#endif } }include/fastboot.h +7
-1@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void *fastboot_data,*/ void fastboot_data_complete (char *response); +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ --2.25.4
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Hi Heiko,
Quoted 10 lines
Hello Roman,
Am 27.01.21 um 10:34 schrieb Roman Stratiienko:
Quoted 7 lines
Hello Heiko,
Looks like these commands will provide full access to any u-boot commands, including working with memory.
It can be used to read/set any registers/data which is not in the trust zone, thus opening a huge backdoor.
Quoted 7 lines
Quoted 2 lines
This command could be useful for debug/CI purposes, but do you really want this in release builds?
Hmm.. indeed.
I set the default to no not to yes, so you need
to enable it, and add a comment inKconfig.
Do you plan to send another version of this patch? Or is it ready for being pull?
Quoted 232 lines
Thanks!
bye,
HeikoQuoted 227 lines
Best regards,
Roman??, 11 ???. 2021 ?. ? 12:19, Heiko Schocher <[email protected]>:
Quoted 222 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)(quoted diff) +0
-0
b/doc/android/fastboot-protocol.rstindexe723659e49c..e8cbd7f24ea100644 ---a/doc/android/fastboot-protocol.rst
+++b/doc/android/fastboot-protocol.rstdoc/android/fastboot-protocol.rst +1
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and waituntil it
doc/android/fastboot-protocol.rst +3
-0+ finishs. + + "acmd" execute any bootloader command, do notwait. +
Client Variables
----------------doc/android/fastboot.rst +0
-0@@ -19,6 +19,8 @@ The current implementation supports thefollowing standard commands:
- ``reboot``
- ``reboot-bootloader``
- ``set_active`` (only a stub implementation which always
succeeds) +- ``ucmd`` (if enabled)
+- ``acmd`` (if enabled)The following OEM commands are supported (if enabled):
drivers/fastboot/Kconfig +0
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device.Define this to enable the "fastboot flash" command.
drivers/fastboot/Kconfig +3
-0+config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 ||
ARCH_IMX8M||ARCH_MX7ULPdrivers/fastboot/Kconfig +3
-0+ select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd"command +
choice
prompt "Flash provider for FASTBOOT"
depends onFASTBOOT_FLASH(quoted diff) +0
-0
b/drivers/fastboot/fb_command.cindexd3c578672dc..31a47e46386100644 ---a/drivers/fastboot/fb_command.c
+++b/drivers/fastboot/fb_command.cdrivers/fastboot/Kconfig +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *); static void oem_format(char *, char *); #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) +static void run_ucmd(char *, char *); +static void run_acmd(char *, char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, }, #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif }; /**@@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) } #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) +/** + * run_ucmd() - Execute the UCmd command + * + * @cmd_parameter: Pointer to command parameter + * @response: Pointer to fastboot response buffer + */ +static void run_ucmd(char *cmd_parameter, char *response) +{ + if (!cmd_parameter) { + pr_err("missing slot suffix\n"); + fastboot_fail("missing command", response); + return; + } + + if (run_command(cmd_parameter, 0)) + fastboot_fail("", response); + else + fastboot_okay(NULL, response); +} + +static char g_a_cmd_buff[64]; + +void fastboot_acmd_complete(void) +{ + run_command(g_a_cmd_buff, 0); +} + +/** + * run_acmd() - Execute the ACmd command + * + * @cmd_parameter: Pointer to command parameter + * @response: Pointer to fastboot response buffer + */ +static void run_acmd(char *cmd_parameter, char *response) +{ + if (!cmd_parameter) { + pr_err("missing slot suffix\n"); + fastboot_fail("missing command", response); + return; + } + + strcpy(g_a_cmd_buff, cmd_parameter); + fastboot_okay(NULL, response); +} +#endif + /** * reboot_bootloader() - Sets reboot bootloader flag. *(quoted diff) +0
-0
b/drivers/usb/gadget/f_fastboot.cindexd1d087e12b2..bf52d2505f4100644 ---a/drivers/usb/gadget/f_fastboot.c
+++b/drivers/usb/gadget/f_fastboot.cdrivers/usb/gadget/f_fastboot.c +11
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) do_exit_on_complete(ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) case
FASTBOOT_COMMAND_REBOOT_RECOVERY:fastboot_func->in_req->complete=compl_do_reset; break;drivers/usb/gadget/f_fastboot.c +3
-0+#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete =
do_acmd_complete;drivers/usb/gadget/f_fastboot.c +2
-0+break ; +#endif } }include/fastboot.h +4
-0@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void*fastboot_data, */ void fastboot_data_complete (char *response);
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
include/fastboot.h +3
-1+#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ --2.25.4
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210201/58f983c5/attachment.sig>
PATCH 1/1 fastboot: add UUU command UCmd and ACmd support
Hello Lukasz,
Am 01.02.21 um 08:56 schrieb Lukasz Majewski:
Quoted 15 lines
Hi Heiko,
Quoted 13 lines
Hello Roman,
Am 27.01.21 um 10:34 schrieb Roman Stratiienko:
Quoted 9 lines
Hello Heiko,
Looks like these commands will provide full access to any u-boot commands, including working with memory.
It can be used to read/set any registers/data which is not in the trust zone, thus opening a huge backdoor.This command could be useful for debug/CI purposes, but do you really want this in release builds?
Quoted 7 lines
Quoted 4 lines
Hmm.. indeed.
I set the default to no not to yes, so you need
to enable it, and add a comment inKconfig.Do you plan to send another version of this patch? Or is it ready for being pull?
I send a v2 ... sorry, had not the time yet for it.
bye,
Heiko
Quoted 255 lines
Quoted 233 lines
Thanks!
bye,
HeikoQuoted 227 lines
Best regards,
Roman??, 11 ???. 2021 ?. ? 12:19, Heiko Schocher <[email protected]>:
Quoted 222 lines
add support for the UUU commands ACmd and UCmd.
Enable them through the
KconfigoptionCONFIG_FASTBOOT_UUU_SUPPORTbase was commit in NXP kernel
9b149c2a2882: ("MLK-18591-3 android: Add FSL android fastboot support")and ported it to current mainline. Tested this patch on imx6ul based board.
Signed-off-by Heiko Schocher <[email protected]>---
azure build:
https://dev.azure.com/hs0298/hs/_build/results?buildId=57&view=resultsversion uuu tool used for tests:
commit3870fb781b35: ("fastboot: default to logical-block-size 4096")doc/android/fastboot-protocol.rst | 5 +++ doc/android/fastboot.rst | 2 + drivers/fastboot/Kconfig | 7 ++++ drivers/fastboot/fb_command.c | 62 +++++++++++++++++++++++++++++++ drivers/usb/gadget/f_fastboot.c | 17 +++++++++ include/fastboot.h | 7 ++++ 6 files changed, 100 insertions(+)(quoted diff) +0
-0
b/doc/android/fastboot-protocol.rstindexe723659e49c..e8cbd7f24ea100644 ---a/doc/android/fastboot-protocol.rst
+++b/doc/android/fastboot-protocol.rstdoc/android/fastboot-protocol.rst +1
-0@@ -144,6 +144,11 @@ Command Reference "powerdown" Power off the device. + "ucmd" execute any bootloader command and waituntil it
doc/android/fastboot-protocol.rst +3
-0+ finishs. + + "acmd" execute any bootloader command, do notwait. +
Client Variables
----------------doc/android/fastboot.rst +0
-0@@ -19,6 +19,8 @@ The current implementation supports thefollowing standard commands:
- ``reboot``
- ``reboot-bootloader``
- ``set_active`` (only a stub implementation which always
succeeds) +- ``ucmd`` (if enabled)
+- ``acmd`` (if enabled)The following OEM commands are supported (if enabled):
drivers/fastboot/Kconfig +0
-0@@ -72,6 +72,13 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device.Define this to enable the "fastboot flash" command.
drivers/fastboot/Kconfig +3
-0+config FASTBOOT_UUU_SUPPORT + bool "Enable FASTBOOT i.MX UUU special command" + default y if ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 ||
ARCH_IMX8M||ARCH_MX7ULPdrivers/fastboot/Kconfig +3
-0+ select FSL_FASTBOOT + help + The fastboot protocol includes "UCmd" command and "ACmd"command +
choice
prompt "Flash provider for FASTBOOT"
depends onFASTBOOT_FLASH(quoted diff) +0
-0
b/drivers/fastboot/fb_command.cindexd3c578672dc..31a47e46386100644 ---a/drivers/fastboot/fb_command.c
+++b/drivers/fastboot/fb_command.cdrivers/fastboot/Kconfig +62
-0@@ -43,6 +43,11 @@ static void reboot_recovery(char *, char *); static void oem_format(char *, char *); #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) +static void run_ucmd(char *, char *); +static void run_acmd(char *, char *); +#endif + static const struct { const char *command; void (*dispatch)(char *cmd_parameter, char *response);@@ -99,6 +104,16 @@ static const struct { .dispatch = oem_format, }, #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) + [FASTBOOT_COMMAND_UCMD] = { + .command = "UCmd", + .dispatch = run_ucmd, + }, + [FASTBOOT_COMMAND_ACMD] = { + .command = "ACmd", + .dispatch = run_acmd, + }, +#endif }; /**@@ -309,6 +324,53 @@ static void erase(char *cmd_parameter, char *response) } #endif +#if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) +/** + * run_ucmd() - Execute the UCmd command + * + * @cmd_parameter: Pointer to command parameter + * @response: Pointer to fastboot response buffer + */ +static void run_ucmd(char *cmd_parameter, char *response) +{ + if (!cmd_parameter) { + pr_err("missing slot suffix\n"); + fastboot_fail("missing command", response); + return; + } + + if (run_command(cmd_parameter, 0)) + fastboot_fail("", response); + else + fastboot_okay(NULL, response); +} + +static char g_a_cmd_buff[64]; + +void fastboot_acmd_complete(void) +{ + run_command(g_a_cmd_buff, 0); +} + +/** + * run_acmd() - Execute the ACmd command + * + * @cmd_parameter: Pointer to command parameter + * @response: Pointer to fastboot response buffer + */ +static void run_acmd(char *cmd_parameter, char *response) +{ + if (!cmd_parameter) { + pr_err("missing slot suffix\n"); + fastboot_fail("missing command", response); + return; + } + + strcpy(g_a_cmd_buff, cmd_parameter); + fastboot_okay(NULL, response); +} +#endif + /** * reboot_bootloader() - Sets reboot bootloader flag. *(quoted diff) +0
-0
b/drivers/usb/gadget/f_fastboot.cindexd1d087e12b2..bf52d2505f4100644 ---a/drivers/usb/gadget/f_fastboot.c
+++b/drivers/usb/gadget/f_fastboot.cdrivers/usb/gadget/f_fastboot.c +11
-0@@ -419,6 +419,18 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) do_exit_on_complete(ep, req); } +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +static void do_acmd_complete (struct usb_ep *ep,struct usb_request *req) +{ +/* When usb dequeue complete will be called +* Need status value before call run_command. +* otherwise, host can't get last message. +*/ +if (req->status ==0 ) +fastboot_acmd_complete (); +} +#endif +static void rx_handler_command (struct usb_ep *ep,struct usb_request *req) {char *cmdbuf = req->buf;@@ -457,6 +469,11 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) case
FASTBOOT_COMMAND_REBOOT_RECOVERY:fastboot_func->in_req->complete=compl_do_reset; break;drivers/usb/gadget/f_fastboot.c +3
-0+#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +case FASTBOOT_COMMAND_ACMD : + fastboot_func->in_req->complete =
do_acmd_complete;drivers/usb/gadget/f_fastboot.c +2
-0+break ; +#endif } }include/fastboot.h +4
-0@@ -38,6 +38,10 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +FASTBOOT_COMMAND_ACMD , +FASTBOOT_COMMAND_UCMD , +#endifFASTBOOT_COMMAND_COUNT };@@ -172,4 +176,7 @@ void fastboot_data_download(const void*fastboot_data, */ void fastboot_data_complete (char *response);Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
include/fastboot.h +3
-1+#if CONFIG_IS_ENABLED (FASTBOOT_UUU_SUPPORT ) +void fastboot_acmd_complete (void ); +#endif #endif /* _FASTBOOT_H_ */ --2.25.4
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de