diff mbox series

usb: gadget: fastboot: detach usb just before rebooting

Message ID 20230104161643.2730063-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series usb: gadget: fastboot: detach usb just before rebooting |

Commit Message

Dario Binacchi Jan. 4, 2023, 4:16 p.m. UTC 
The patch fixes the following error when updating a BSH SMM S2 board:
3:72>Start Cmd:FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize}
3:72>Okay (0.023s)
3:72>Start Cmd:FB: reboot
3:72>Fail Bulk(R):LIBUSB_ERROR_IO(0s)

The "fastboot reboot" command detaches the USB when it still needs to be
used. So let's detach the USB just before the reset.

CC: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Fixes: 5f7e01e9d5d800 ("usb: gadget: fastboot: detach usb on reboot commands")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/usb/gadget/f_fastboot.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Marek Vasut Jan. 4, 2023, 4:27 p.m. UTC | #1 
On 1/4/23 17:16, Dario Binacchi wrote:
> The patch fixes the following error when updating a BSH SMM S2 board:
> 3:72>Start Cmd:FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize}
> 3:72>Okay (0.023s)
> 3:72>Start Cmd:FB: reboot
> 3:72>Fail Bulk(R):LIBUSB_ERROR_IO(0s)
> 
> The "fastboot reboot" command detaches the USB when it still needs to be
> used. So let's detach the USB just before the reset.
> 
> CC: Mattijs Korpershoek <mkorpershoek@baylibre.com>
> Fixes: 5f7e01e9d5d800 ("usb: gadget: fastboot: detach usb on reboot commands")
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> 
>   drivers/usb/gadget/f_fastboot.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
> index 07b1681c8a9a..0b3fae564d0a 100644
> --- a/drivers/usb/gadget/f_fastboot.c
> +++ b/drivers/usb/gadget/f_fastboot.c
> @@ -419,11 +419,6 @@ static int fastboot_tx_write_str(const char *buffer)
>   	return fastboot_tx_write(buffer, strlen(buffer));
>   }
>   
> -static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
> -{
> -	do_reset(NULL, 0, 0, NULL);
> -}
> -
>   static unsigned int rx_bytes_expected(struct usb_ep *ep)
>   {
>   	int rx_remain = fastboot_data_remaining();
> @@ -495,6 +490,12 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)
>   	do_exit_on_complete(ep, req);
>   }
>   
> +static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
> +{
> +	do_exit_on_complete(ep, req);
> +	do_reset(NULL, 0, 0, NULL);
> +}
> +
>   #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT)
>   static void do_acmd_complete(struct usb_ep *ep, struct usb_request *req)
>   {
> @@ -544,7 +545,6 @@ 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:

If Mattijs could have a look, that would be real nice.

If there is no activity in say a week or two, please let me know and 
I'll pick it up via USB tree.
Mattijs Korpershoek Jan. 5, 2023, 9:07 a.m. UTC | #2 
On Wed, Jan 04, 2023 at 17:27, Marek Vasut <marex@denx.de> wrote:

> On 1/4/23 17:16, Dario Binacchi wrote:
>> The patch fixes the following error when updating a BSH SMM S2 board:
>> 3:72>Start Cmd:FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize}
>> 3:72>Okay (0.023s)
>> 3:72>Start Cmd:FB: reboot
>> 3:72>Fail Bulk(R):LIBUSB_ERROR_IO(0s)
>> 
>> The "fastboot reboot" command detaches the USB when it still needs to be
>> used. So let's detach the USB just before the reset.
>> 
>> CC: Mattijs Korpershoek <mkorpershoek@baylibre.com>
>> Fixes: 5f7e01e9d5d800 ("usb: gadget: fastboot: detach usb on reboot commands")
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> ---
>> 
>>   drivers/usb/gadget/f_fastboot.c | 12 ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>> 
>> diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
>> index 07b1681c8a9a..0b3fae564d0a 100644
>> --- a/drivers/usb/gadget/f_fastboot.c
>> +++ b/drivers/usb/gadget/f_fastboot.c
>> @@ -419,11 +419,6 @@ static int fastboot_tx_write_str(const char *buffer)
>>   	return fastboot_tx_write(buffer, strlen(buffer));
>>   }
>>   
>> -static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
>> -{
>> -	do_reset(NULL, 0, 0, NULL);
>> -}
>> -
>>   static unsigned int rx_bytes_expected(struct usb_ep *ep)
>>   {
>>   	int rx_remain = fastboot_data_remaining();
>> @@ -495,6 +490,12 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)
>>   	do_exit_on_complete(ep, req);
>>   }
>>   
>> +static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
>> +{
>> +	do_exit_on_complete(ep, req);
>> +	do_reset(NULL, 0, 0, NULL);
>> +}
>> +
>>   #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT)
>>   static void do_acmd_complete(struct usb_ep *ep, struct usb_request *req)
>>   {
>> @@ -544,7 +545,6 @@ 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:
>
> If Mattijs could have a look, that would be real nice.

I've answered on v2. Let's continue the discussion there.

>
> If there is no activity in say a week or two, please let me know and 
> I'll pick it up via USB tree.
diff mbox series

Patch

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 07b1681c8a9a..0b3fae564d0a 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -419,11 +419,6 @@  static int fastboot_tx_write_str(const char *buffer)
 	return fastboot_tx_write(buffer, strlen(buffer));
 }
 
-static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
-{
-	do_reset(NULL, 0, 0, NULL);
-}
-
 static unsigned int rx_bytes_expected(struct usb_ep *ep)
 {
 	int rx_remain = fastboot_data_remaining();
@@ -495,6 +490,12 @@  static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)
 	do_exit_on_complete(ep, req);
 }
 
+static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
+{
+	do_exit_on_complete(ep, req);
+	do_reset(NULL, 0, 0, NULL);
+}
+
 #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT)
 static void do_acmd_complete(struct usb_ep *ep, struct usb_request *req)
 {
@@ -544,7 +545,6 @@  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: