From patchwork Thu Jul 8 17:14:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1502556 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=c4ssEjbM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GLNGh3mW5z9sWc for ; Fri, 9 Jul 2021 03:15:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 540DA831DA; Thu, 8 Jul 2021 19:15:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="c4ssEjbM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0937E831B8; Thu, 8 Jul 2021 19:15:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0603.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::603]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A1BE3831B8 for ; Thu, 8 Jul 2021 19:15:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZmHMULatfpx9gnBCYMhkMKIpf8/WHa6ZCthJvdVaq0tjG/dq3sNi8+q1IoM+At+6L8yS1ndnPuHruOaUAx3Q+ZN2O5smMUey873f/LIL5bA8NXuRe2mOmLlttkRMxfCDSbM8MyzunJF2KjA8JPDigMNNwLH1ta8IUYmACYKaUhPRB+J7tgAlvCnpIXEzeW4KHJq+Mo61r9qUYgJbdwTLgJf+0ZVzteSLbjPvdF57zxU8w2EhgvhIb6T4kh4MHP7fJKdG0hr7VUE4Zfx9UmBSQzJF//MEdM1BRfIw9ozkAucg9kC1ycF6fNlqVo6inPZ55Vq89+vHaUf1EGqDqvKnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e0Upe43rJpWwG/qlRE0nG1AeDC+dbNDa2vChmBKHs/o=; b=BuLLwjXKYD17rcj1f6Ao0U6eWJmt2IKXdQuuOCRpFAeZof+R+Gg7cvAnSAAsG3aEVZKigJHbkKbgnFA2yY6aikYjG4HY7KiA8dMTtyaEgJFdw+l2iz9ku6bB7k+RvoUw/blQfymUMx2bbFPr9Z1X9TG+nLnDyQekBj9VkgfRwoL01MHPW4WUZ22jfNfyv5vsjv9HPBT7I3stCRSFVns1e1HHYwjbA3CuVQzBUDlSaWTNEUrhbKVoO+kePDkYZe4W99r8f3mrfXFMbDdgCkQanlKAXQ1p16m78Iq1lw95QCdHJt57Waa53tsndQQD9ktOaJlUV/B8KamI4UUmZcsszA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e0Upe43rJpWwG/qlRE0nG1AeDC+dbNDa2vChmBKHs/o=; b=c4ssEjbMLLtbN2y+kiedIpejuxFUqA6e+Xz9C6gVpbybFMSo7mjd4pZCYa+y+YDyPkq77g3d7E+3ZMOLF5YN8O2o8F4I85DsXOA5BdfGWZ1V0MThqCKqaQJf94Z/i1i+e/1wSSeoISBxvYmCz4ytzvuzmZky3Son2cMKSmjlXlU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DBBPR03MB6762.eurprd03.prod.outlook.com (2603:10a6:10:20b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.19; Thu, 8 Jul 2021 17:15:00 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::40d5:3554:c709:6b1b]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::40d5:3554:c709:6b1b%5]) with mapi id 15.20.4264.035; Thu, 8 Jul 2021 17:15:00 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Lukasz Majewski Cc: Maxime Ripard , Jun Li , Andre Przywara , Jagan Teki , Marek Vasut , Marek Szyprowski , Ye Li , Peng Fan , Bryan O'Donoghue , Sean Anderson Subject: [PATCH 4/4] usb: f_mass_storage: Stop after the host deconfigures us Date: Thu, 8 Jul 2021 13:14:23 -0400 Message-Id: <20210708171424.970928-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210708171424.970928-1-sean.anderson@seco.com> References: <20210708171424.970928-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR13CA0005.namprd13.prod.outlook.com (2603:10b6:208:160::18) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR13CA0005.namprd13.prod.outlook.com (2603:10b6:208:160::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.12 via Frontend Transport; Thu, 8 Jul 2021 17:14:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3ca9415-886f-4506-9a66-08d94233eb0d X-MS-TrafficTypeDiagnostic: DBBPR03MB6762: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W2cFa6xp+nJYVybqCa9f4jstfsyvmmd3X9EBzm1RjdgHuoBhUm2rmWHRnZmSPFJT8eVpL0+eUvskI6OdEI/VAsC3TfcTIEv6MA0Ux8riMJq4GSjd2MNqyGzkIv7vZ0GUp04L084KhPSEKI0tTSgSJzxsbVe3xFYDGuzWvk1Hds+QO8vu3Z1/w5Un35EMhfNBd8NMEnsoEuNVbQulGleXlReVb5xYfZS7BDvvyuWd4ScEubSUUcQcV58HVvVW32JnYSzRcyBqgWDWdJ9CMLeOKcZAzoSH9Rb15Elgm4Q+Qd46JucU/el6Lqz+TSLmFogk/HYX2FNIxyLBy4vivPElGH5qTofawcQPEsPJzVwdHmEjGNJED2x7evz/CTRJKXpyneTMJk68mH81nuD5MZG+/Y9RSPKX8Y3HBok2gDtzo4XgYFglOly/eZ4yD+M1Zp1tjB4K9GJ5jyCQGcUc4Lmf/Cy3b3zI4mmSqAr04gBXN58rS3Kf2Mlxg4prGZtrDUJI7qgnruBgzde3VKYQ860TQ8XhauvMY60WcFz8eFHRAFK9D/T9Ir4c+J6fWxEcPVg6gor/5xu4pMRcCW1lwTZbGyVRQ+nILuVzl8d3tXiWgSVhRVxn2LAMqxy/1yVJ7mlgFPBwPIBExB0LNiOtxdXn/oQrgoMWxVMg9sIIw8D0ByV6Ak4Y2SkjPGRGjnTpdJreeFlL+x9Dokv71UDQqgALiQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(366004)(376002)(346002)(396003)(39840400004)(52116002)(54906003)(478600001)(316002)(6506007)(6666004)(38350700002)(38100700002)(2906002)(8676002)(4326008)(36756003)(6486002)(8936002)(83380400001)(66946007)(66476007)(66556008)(86362001)(44832011)(1076003)(186003)(7416002)(6512007)(2616005)(107886003)(956004)(26005)(6916009)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e9WVr1rxGuzMaFgnCVUc/74FMUBSbef5Ly1pKR4v5ZsPBLZWG/U4a3ljrhZ5qS2JGy1RXauH5rCCWxiF7SBhosIzpWvhtVmwP1GjxFAV3n0wzHk6BFNSEIuf2DmbWlK+CFJ2IHxeayMusJcz+KasLoJdlaS+dIAFaAbGCTljmWTK7XE09Ph0wv6hYncuhc+PleN1Fca6zQ177krhZyOfkssVLpVl80rVuIdVpW2Ai2DGQvATl/p1CejJ7TSO9rkPxVWknDFW/0gyx5ywMe6L1DVDcD5b0PKECy51+HSRoGkmNUvkeCMG/sOuHYnGK1PB72sY7oqshNa2Bi4DPrBTD/Ond3dMhpwXcxoEWuwcbaJYlZj/cvljT1xPsSaIHROFcIcpohAtG+08WBksZH9UU+4E3bBt2tXGZCdvYTFjNUYDKkPxO/lMr+18V7a4f6e+TGCWIDfsN+ndTaIvSNWCOUOrMmnBJ5DA2yHHR7lKvvyYGePM4DtvKB4TemRCtpcA6lnr816k9r55oHmVHzv3g8WwudZaarPGJdKWXOky8V6CAiEYLLTTxqZN1rnvuxoXmP4RXgnfx8MxQnSJFdoVYtZ5Mbwc+JW4/gIxLT3FaMoYjk32TIypBis9196GYIn4xR6ilym52Ln+3RSeL7c39wnSHkZqCrE63DVMPTSscEeT7AxO40Q9cWYY8uqRxraOiV1yE9DhBDx4Ru9ygr8aKB7E/bOopjWoG8eXqgmm6rSzlpJJ6UbguYhs5SBLmE53Ro1kGGNkpNJZJ+S7VoXL2brv0QdtaFKBRxdvkNPUw7ExXFWGuG+kZycvL/LlWNzwWh+6Ia6TxyFPbQtQZM8eujTsHjs2k2A8tqxDPnRZejjb84cVK0AWux95IEjbnvCPR3HWfN/gc3/hWoJVKmHTp7S2dQMHEinuetWW4PaohoyyPS1/WT0Cb5c3NW+LTJ3LuKFnXdHZIRoz/yiFMFI6WZJDGSVCJSOZcGpc5BRDogG/itCYFAo7IwKC0UwawLMcQnYfXPcL3mRET18PgNRtAv9W5M05Y25lwO6VrrxUCWiZpDgXjoBnQtwup/Pcle/fdYy+dcExTvYnwOGhuo1lvTIXV3KkgS6hpMzcumWnJ98OB+kSqQAPrxa/FrPnfCpInNtp6K+gUSAs7Xb2C+it3m8uTzzPd5ddiImokfYBK/msDOaYgqQjvpm1HwGcgDRIhHF4llWk+twhlrcte9qd2h6bdF2D3idA/rxtESJnhEmKOvlQQc/q06g6uyezTHkoofCj+T3yV1Zs53BLc6lgtJVKf7GT5MV0EKbgLIiFICaexox5oaFqWdgImyXoX5yc X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3ca9415-886f-4506-9a66-08d94233eb0d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2021 17:15:00.4937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Jdy7fXJ50EWF7My9MfJ3sBWhFBYM5Ym8BBQrY9/SwsnrwETN//0TPl+5/jUHIOPVegc/83QIHKDeoiEVNmKP/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB6762 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean At the moment there is no way to signal to U-Boot from the host that we are done reading/writing data. This stops the gadget after the host deconfigures us by selecting config 0. In theory, the host could later select this configuration again, but this rarely happens. On Linux this may be accomplished by running udisksctl power-off -b /dev/sdX Signed-off-by: Sean Anderson --- cmd/usb_mass_storage.c | 3 +++ drivers/usb/gadget/f_mass_storage.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index d4e619b842..bac4ad87b9 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -227,6 +227,9 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, if (rc == -EPIPE) printf("\rCTRL+C - Operation aborted\n"); + if (rc == -ENOLINK) + printf("\rHost closed connection\n"); + rc = CMD_RET_SUCCESS; goto cleanup_register; } diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 190053590f..5968146b1c 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -2248,7 +2248,10 @@ static void fsg_disable(struct usb_function *f) { struct fsg_dev *fsg = fsg_from_func(f); fsg->common->new_fsg = NULL; - raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE); + if (fsg->common->running) + raise_exception(fsg->common, FSG_STATE_EXIT); + else + raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE); } /*-------------------------------------------------------------------------*/ @@ -2394,6 +2397,8 @@ int fsg_main_thread(void *common_) common->thread_task = NULL; + if (common->state == FSG_STATE_TERMINATED) + return -ENOLINK; return 0; }