From patchwork Wed Jan 4 16:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2610 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 138323F047 for ; Wed, 4 Jan 2023 17:47:04 +0100 (CET) Received: by mail-ej1-f72.google.com with SMTP id oz11-20020a1709077d8b00b007c0dd8018b6sf21477964ejc.17 for ; Wed, 04 Jan 2023 08:47:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672850823; cv=pass; d=google.com; s=arc-20160816; b=fG+yBnc9NrQ10c66ABxS/QNsGT+B2u9lrUMgxde+yJGiqcIAgapmhVPaSGCflA/w0N CqfnQD8+ApdcN3ZOBJQHJLA1ZD+Es1h0AyvYnrDhvnUgxo+dGSzL6qBX+9JeAq+hAZfk OsIKd1YTotqGDYwOb+X0Hwysn9U/MQyO9XO5id7suHZU5/To4wQcXktfZsfnGTWn9wCW dWGt+GGZjitZVUzJldjJ7NtRwWLKJQIudRY+/RiCJWO+S9yLTXJYVV+GPwlxGvtdYv3u aO8/Ed45zNv3ALf1efHSx0dlj8duBBj+FgaWSZ8L9rm/aMaVwYFLDnj69BEkWUM3WoVA 4+xQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=KWO990sjYmfVWnnG+aE+Id6LCkKcxFtL6Q4eYoCQY5w=; b=H9yGmwDyZwEY2VsIaLV1wImOsqf7U6cBJlWcV4e9gIQUDduqeBdRwJ+7HcO3zg87qV iYY/MYsbdqMWjLLXLU0jvgGjEdtTHYDHdoKuiBBC+POXyHjJ4YsnxxjpMiSVzOQEtN17 cXWlw3pXDQYScajTm7xo67Hnz9ug3mpsnVM9jKMNkT2pn+rn74tllW9Gh7UxT0GsnW05 4T/xvArLd3fcrLyAGOx4BBeRsqV46QR4K+XdcOCO95hiWemfwsFZnD2JnUalGrlzkFVv t1mYL1bkuTGUXh2mVn5ij0I1n2VwQjGzcADZTjCZOQFReCAKjpeVcJTQLQsqF3H1yamW Ww6w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IQBQrJXM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=KWO990sjYmfVWnnG+aE+Id6LCkKcxFtL6Q4eYoCQY5w=; b=LvlNv98vP+KpJRWkQqXWbFVlQiNsKEWh+UlXWtdebmmEIBk27wwCRRKngO/5A9fsHD +3r74bKoa7RvdoBYK6ut44FL+ZMgQJ9h5nwYchSkku6XAZ9Cb8c13/B4Zay0EketNJBl uVrNijKsZx2mFm2VBEoqw/dLA0XmvBh//v12k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KWO990sjYmfVWnnG+aE+Id6LCkKcxFtL6Q4eYoCQY5w=; b=hO41iSqj5UbC+CLheCl8bjlRgKKBBBk09D2tg7+VUCNhvaHunCWzEx0qWB1jJ8mNMT /i8LQTcwA7IjFxICgCnm5g0oADf0yrT4yHVXNaRRYTjb8fm+d/tm8sCG/Asse1hubLcP UJjExtsP9nllXgnG/1q28ChYhj4GCLv7gHuvRhUvLRuS2hsYfgDrexfiMQ/J5ErpCLYO OGRbPOvfjeXiWRMUPzRqscc7WOPyHJC6zig4Mt3i6poe4E+OiaOti+Ja3OprunXjPlNj ywTPtmm3fkI3ryjSxdzbgv98+KWdWtuqwpPQ5NDAOxZC3dx875UotkK02wZJAjRH4hiT 9hFA== X-Gm-Message-State: AFqh2kqzu6PSBBfiY3v9pFExXxOch44lUFqk+DOawNot3C34ngvAFWDo WYf2w8Rid6z3w5O3Lb5tX8Z9FqMq X-Google-Smtp-Source: AMrXdXtEK0MOvsl9tM9L8OSB9aFxWSICtinrD/ViYF/IDMr5aVnD0mq8dQ/voMZq4vjSBO5b9To7/g== X-Received: by 2002:a05:6402:34f:b0:45c:a9d3:d535 with SMTP id r15-20020a056402034f00b0045ca9d3d535mr4066749edw.0.1672850823702; Wed, 04 Jan 2023 08:47:03 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:34c9:b0:488:1679:c417 with SMTP id w9-20020a05640234c900b004881679c417ls1536826edc.1.-pod-prod-gmail; Wed, 04 Jan 2023 08:47:02 -0800 (PST) X-Received: by 2002:aa7:cd04:0:b0:46b:a28a:8783 with SMTP id b4-20020aa7cd04000000b0046ba28a8783mr36644967edw.38.1672850822589; Wed, 04 Jan 2023 08:47:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672850822; cv=none; d=google.com; s=arc-20160816; b=MxvjkaEpZ0TtKoLJZAycdTURJFtadcwNu1ijizhLPZ15wpW8/vMt9X/tvBU11Tv71G g0Wu3+89ojedUbWfIKRsVG9Nptx26gsGKPpJeffZHh2n0nWZ1iTTfLlpkwhvr1P4A0or dYiN6MEQ4B2Ba3pxWOaH8WOQTFSh1JVxX17sHxUKwtXkeBmKR1zGzwIxsjwcHwmv1eAu jgCjQGaQwMZXxXSX94n3XSudlMgWwLk8t2tyl2eYaw7vM//YxNTyCYZc5VLnaYZ0VZ39 hSa7525ATo8j7Zdj/yDB9EXXjftSCX65gCg/9gj+e7oNjOCtQt0vVJtjCzWfeRPkn6iP lUrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=TDSuh0tnoYkatV4iAQUAG5FOcKLlSU7gTuXuD2u848I=; b=uCy8khVboTWbnxAMkCBBwMmgj2vCgBn7ippn2dwjU+e2nZvQCiWMjaXtErIvLRTezg XG+WN5+M2KlZdyBr8QTyPQkQxs4JhgJevqWDKk2uq+IZ0Q5j8OgScjM5qbkPdgfsRY3c SCAMXtg8HQjGGXgg7wmUK/bRCGHL3AT8sz/i323vgrm2z9b7I5rtGmhBCxT+l+qnbLl6 69zOl0DK5VoDPMgB+8VmJ9lXLc05PlgdFLHQpt/mnYaBystChbeARrUBsTClWEh9gnYM hGQYcI8ldqhBJ4RmveuyL5f6Zjjpt+VReKM7ffLLmlVQu0BtDCCSfZ4xIDK8WkrQFez3 BbmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IQBQrJXM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id k3-20020a50c8c3000000b0046b42cbdd55sor4779100edh.67.2023.01.04.08.47.02 for (Google Transport Security); Wed, 04 Jan 2023 08:47:02 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6402:4006:b0:479:1fab:430f with SMTP id d6-20020a056402400600b004791fab430fmr42667153eda.39.1672850822369; Wed, 04 Jan 2023 08:47:02 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-80-180-23-57.retail.telecomitalia.it. [80.180.23.57]) by smtp.gmail.com with ESMTPSA id p25-20020aa7cc99000000b004678b543163sm14928049edt.0.2023.01.04.08.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 08:47:02 -0800 (PST) From: Dario Binacchi To: u-boot@lists.denx.de Cc: Dario Binacchi , Mattijs Korpershoek , Michael Trimarchi , Lukasz Majewski , Marek Vasut , linux-amarula@amarulasolutions.com Subject: [PATCH v2] usb: gadget: fastboot: detach usb just before rebooting Date: Wed, 4 Jan 2023 17:46:58 +0100 Message-Id: <20230104164658.2734718-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IQBQrJXM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Fixes: 5f7e01e9d5d800 ("usb: gadget: fastboot: detach usb on reboot commands") Suggested-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v2: - Add 'Suggested-by' tag. 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: