usb: gadget: fastboot: detach usb on reboot commands

When host issues "fastboot reboot fastboot", it's expected that the
board drops the USB connection before resetting.

On some boards, such as Khadas VIM3L and SEI610, this is not the case.

We observe the following error:
$ fastboot reboot fastboot
Rebooting into fastboot                            OKAY [  0.004s]
fastboot: error: Failed to boot into userspace fastboot; one or more components might be unbootable.

This does not happen when we use the RST button on the board.
It can be reproduced in linux with:
  # echo b > /proc/sysrq-trigger

In this case, we hit a undefined hardware behavior, where D+ and D-
are in an unknown state. Therefore the host can't detect usb
disconnection.

Make sure we always call usb_gadget_release() when a "fastboot reboot"
command is issued.

Note: usb_gadget_release() should be called before g_dnl_unregister()
because g_dnl_unregister() triggers a complete() call on each
endpoint (thus calling do_reset()).

Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index dd223b1554dadba5271c51b17bdc2bea172efae6..b498e4b22bb3f085dc6856518ab8303e87f20272 100644 (file)
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -83,9 +83,9 @@ static int do_fastboot_usb(int argc, char *const argv[],
        ret = CMD_RET_SUCCESS;
 
 exit:
+       usb_gadget_release(controller_index);
        g_dnl_unregister();
        g_dnl_clear_detach();
-       usb_gadget_release(controller_index);
 
        return ret;
 #else

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index d0e92c7a071fc66db78822246bb674bbb6e6c631..07b1681c8a9abbc300e3084ed6d45e1dc23f7068 100644 (file)
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -544,6 +544,7 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)
                case FASTBOOT_COMMAND_REBOOT_FASTBOOTD:
                case FASTBOOT_COMMAND_REBOOT_RECOVERY:
                        fastboot_func->in_req->complete = compl_do_reset;
+                       g_dnl_trigger_detach();
                        break;
 #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT)
                case FASTBOOT_COMMAND_ACMD: