From patchwork Mon Jun 29 02:12:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1318705 X-Patchwork-Delegate: lukma@denx.de 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=AjZPeANT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49w9PR5Rwfz9s6w for ; Mon, 29 Jun 2020 11:48:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5B9F481EA9; Mon, 29 Jun 2020 03:48:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.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=nxp.com header.i=@nxp.com header.b="AjZPeANT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C1A8781EB0; Mon, 29 Jun 2020 03:48:17 +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=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0630.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::630]) (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 D5BC881E97 for ; Mon, 29 Jun 2020 03:48:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C7ZC9JeFh0Q7BgZXZ8AHeGj0wLcCDxwmxqF4cgStTIP/7nEdZMoEWuga/NdLcIlYe6s9ajMneJTk4guemR4Nrk/fackMdzEdkMWuo5+UjISA2tTzkeBFxCLJ4CohJ3Kgv+kjWZK4BZnAnGPo8SvzoxyzeNJ2C7hFCsigyKc28hFmm2VBpAGXmRA6fMiV18GAE0Va/z6/5PX0If1mHtHh3Tc+225YxSktmSSd110HLUb5Djm94lhhNg5gkbbIPbOzPm/XLM0XwacltY1mgsdhQvzBmqZHwtDAKeJ+nmluanBXd28HUs85axgMosi4Ozlw2qN9kOFeuamnQVa6z77/rw== 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=Al8J1QgVxEZkcqnxKFOiZBuAWbKVYehcZ0A1OLF2jx4=; b=CzGB5Nh2d0Uat4smbqNUU4kJi1q9zqoRgjGR+sI6dWhMb2dpHjklHdrqA5xnC/HpSdpKT8v4T2kxGZ/y8ICmJ02DguXUHKVuRYCBzzO4AT8iG6Hvq0Tulfq2mHk29JLlhXLTLpEv2rDjs8Op1eSjZ7GCYOrtsOyjPiS1mHnnwrPpUYq4FfzOSlty/6HsfS9rzNREFpRa0XqaiBZDCTTV+pEsmCqsqh5ucjdmo+dedzYkrfvnyP3ZnlhcHIf3O9ni9+orUfrnJzCXXHx3lRdNvfAEFYIfQQ01AgdAq+jW07jXDzzsJFFNiHAw3WW2PlFEgjR1f3cUn5WZ6kVhVdVykA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Al8J1QgVxEZkcqnxKFOiZBuAWbKVYehcZ0A1OLF2jx4=; b=AjZPeANTuR9AoQzUvwsiHynuVo/IoM8vex28tdQj3vLVwrgiozJUpn7lr/hFovpIfiKtHebbotp5gyInYnfJjmgoFD5BswmxJaISjNXzUWsTYqfnCTBKVw1ufsRps7LfJSQLN3zOVf3Twmtqbg+WyzJiXHDbXDc/cEnA9EMYnCg= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB8PR04MB7177.eurprd04.prod.outlook.com (2603:10a6:10:127::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21; Mon, 29 Jun 2020 01:48:05 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::2d36:b569:17c:7701]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::2d36:b569:17c:7701%4]) with mapi id 15.20.3131.026; Mon, 29 Jun 2020 01:48:05 +0000 From: Peng Fan To: marex@denx.de, lukma@denx.de Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH] usb: gadget: Fix controller index in UMS Date: Mon, 29 Jun 2020 10:12:26 +0800 Message-Id: <20200629021226.20993-1-peng.fan@nxp.com> X-Mailer: git-send-email 2.16.4 X-ClientProxiedBy: SG2PR01CA0167.apcprd01.prod.exchangelabs.com (2603:1096:4:28::23) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR01CA0167.apcprd01.prod.exchangelabs.com (2603:1096:4:28::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20 via Frontend Transport; Mon, 29 Jun 2020 01:48:03 +0000 X-Mailer: git-send-email 2.16.4 X-Originating-IP: [119.31.174.71] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a137a198-2b6a-4c3e-4278-08d81bce773b X-MS-TrafficTypeDiagnostic: DB8PR04MB7177: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-Forefront-PRVS: 044968D9E1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wc5nuZZ6yS44/q/1srN5d86+vw/gnXQugK4cn7PoplfYE514fN0M5vUmUW87uR/txSrzV7Xu2L0/2A15ptG4oe4fZyWgSxELC4EQyz4WlGQYWn/tWw1zU3OEJS5xE23kcOKkKLV+2jscEqIegHfkFqaXujifV162/kW1J8nMpvw9ZZImgex+hjmNkGo22V7EJ4zT4ignMtJN8iqOiAd5pJ9TuBvpaGa2VT1n4NTtCWyM7uL58Noo5xRtsKum5UUR5BXbFoL/BOdV7P+SIdra7JCny7T3bzh4mw/aikWThcvxqURCyi/yl7Hitcuw+bTwyYVT1UNS+/SZMSAQ2oqaIg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(376002)(366004)(136003)(39860400002)(396003)(86362001)(478600001)(956004)(1076003)(44832011)(6666004)(6512007)(8676002)(8936002)(6506007)(5660300002)(2616005)(36756003)(2906002)(6486002)(66476007)(66946007)(52116002)(54906003)(186003)(66556008)(16526019)(4326008)(26005)(316002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: IfBgufaDJnXj62ySG/2C+//izUzSkHmE/ZSqPRI2Rd+Rpz0iKE9Ce0iiWd/Dg0MxjAYmD0MwFsSurj5uvI66uIpZ5MGnQYBqfo8w2BtWAV/TrD8ZqVMCsNMPryTP15Qao8OSu2rKtHVbqcck6uFgefco/mI/GjB9dKL6vc0kadgnAAi9YkWEX5Ysbw8rhuVB63OY060DW3dCjAL7s35x6OJOkqh8zU9svVCivbbWYaFciuFqCdAKrHXchyEhZ0X5rqEqxCtnZujAIv8+lgk4yp8VRcjpt5OQiUNaHYCBjDQ8lNa76lhyDUmaljgDyttMetDSwg4RjEDMOyeIA+grRjGx/hsMtpHrGL8QuvxwrDz4G8H8+5jqRBD4zWnNIJJ/BXwFvXhl2i/dl2ov0KabbiiyS+96LoQlA9tcz4DT4XFWAdftEIquTJN8TeUjYzGQe8vUy3aSdOh0wt4wRnoNKt1flykjeyJ2T5aKK7xMrzc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a137a198-2b6a-4c3e-4278-08d81bce773b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2020 01:48:05.3549 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YS4uupV/AFw+zPPU5jCMqogl6MBpovvsUtc0Z8IbnzQEeTzIr7nx47bxG6y5bzVSJhDn41rHKDxg9HLgXb87Hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7177 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean From: Ye Li The usb mass storage (f_mass_storage.c) uses fixed usb index 0, this causes problem while CDNS3 USB controller index is 1. Modify the API of fsg to pass the controller index. Reviewed-by: Jun Li Signed-off-by: Ye Li Signed-off-by: Peng Fan --- cmd/usb_mass_storage.c | 2 +- drivers/usb/gadget/f_mass_storage.c | 6 ++++-- include/usb_mass_storage.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index d565635c6c..cf2f55994e 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -170,7 +170,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, goto cleanup_ums_init; } - rc = fsg_init(ums, ums_count); + rc = fsg_init(ums, ums_count, controller_index); if (rc) { pr_err("fsg_init failed\n"); rc = CMD_RET_FAILURE; diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 439a31c255..45f0504b6e 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -435,6 +435,7 @@ static void set_bulk_out_req_length(struct fsg_common *common, static struct ums *ums; static int ums_count; static struct fsg_common *the_fsg_common; +static unsigned int controller_index; static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep) { @@ -679,7 +680,7 @@ static int sleep_thread(struct fsg_common *common) k = 0; } - usb_gadget_handle_interrupts(0); + usb_gadget_handle_interrupts(controller_index); } common->thread_wakeup_needed = 0; return rc; @@ -2764,10 +2765,11 @@ int fsg_add(struct usb_configuration *c) return fsg_bind_config(c->cdev, c, fsg_common); } -int fsg_init(struct ums *ums_devs, int count) +int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx) { ums = ums_devs; ums_count = count; + controller_index = controller_idx; return 0; } diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index c7b770fa3e..08ccc97cf2 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -25,7 +25,7 @@ struct ums { struct blk_desc block_dev; }; -int fsg_init(struct ums *ums_devs, int count); +int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx); void fsg_cleanup(void); int fsg_main_thread(void *); int fsg_add(struct usb_configuration *c);