From patchwork Mon Jun 29 02:12:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1318706 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=kd7phPth; 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 49w9Pz5cJTz9s6w for ; Mon, 29 Jun 2020 11:48:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C0D7C81EB0; Mon, 29 Jun 2020 03:48:52 +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="kd7phPth"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 155B781EB0; Mon, 29 Jun 2020 03:48:46 +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.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_SPF_HELO,KHOP_HELO_FCRDNS,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::610]) (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 C106381ED5 for ; Mon, 29 Jun 2020 03:48:36 +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=gBFitjNpQ1D1ev4viSJARG83YiPKKcAbwKggnRxkjxJzId9fHP408JHHkR0ibrdaifTTj7Tzmu8yQAI/NEGaZMD6E/T2sByChXYkIX/r4i29Dp7Vg8RRyDQUi7k0BtJWc1wrcfHyxUevGu4Q43vp9gKQgcpgGPZtKfwVZkkINmLKCaCWF1bADmdSA7w04Jy3wEMUrC9/5wGpDMK5Ir87IHjB1XoBmyp708j8LbebD9l1c7jE47gtwBDARmcNGfXedmb2UVpZBcQShQb3OKNDso7yRRKiEdEn/5UmwhRtbUCHBLi5BmtsIaZ91yYhysCbwa+y1RAZuOrl6XCITJZL7w== 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=1ZdBA+GvlsIE2Zn5ATlmCt3PWbUVa0orHOJYnvNjATg=; b=g3ZXy1Pf7OO8ZztGtlDsHSHaBD0hgklIH3tzkJy9PBfTo6G9dTrhzBSqMGkbLnfXvt/+jgITaJgoQdVT7vjUTX9ROABMiDjzSo4iyqFg/iVnwoK1beDlmM+vCzHANwGzEPIDpI6nAKXSSHr/sLERUlpuerLbD6HgGVohptffnAMp8WBbheiv8BsGlH8nLo9Ax0fNHFP8nvm4BHpu050hxrt2wZjqG5z3YGM65xalJjkmebzm0Py2C7bYJKBALFSHZbCAbF7aaBFEhdC+6Fcw+3heAhQ0I5n60CHETuM81m4zIJbFRCWdO9dCMp33kHPQIHNANgJcBszLfBz5ELKRog== 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=1ZdBA+GvlsIE2Zn5ATlmCt3PWbUVa0orHOJYnvNjATg=; b=kd7phPthSZGfTwyaEVXYH6R9RSHCu/8n6qt04rcEl4iNgrhsF3xSpIzRmBICgbWHpigtbdE99z1MwLND9qm+kXxHdNVG2b91FVgHHh2wdkcUTxldxM9f1i8DB6C+FPi6Syte6i30cyOvKt5PzQ+6ZPMaVqZr7Pi8z0+5/GVHKbg= 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:35 +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:35 +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: ci_udc: Add function to remove usb device Date: Mon, 29 Jun 2020 10:12:59 +0800 Message-Id: <20200629021259.21103-1-peng.fan@nxp.com> X-Mailer: git-send-email 2.16.4 X-ClientProxiedBy: SG2PR02CA0077.apcprd02.prod.outlook.com (2603:1096:4:90::17) 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 SG2PR02CA0077.apcprd02.prod.outlook.com (2603:1096:4:90::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21 via Frontend Transport; Mon, 29 Jun 2020 01:48:33 +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: b1c5e00f-fb42-4c50-dd7c-08d81bce895c X-MS-TrafficTypeDiagnostic: DB8PR04MB7177: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-Forefront-PRVS: 044968D9E1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: otxKgyxiLWCD4M3L6ox0i5zfab915t8ynThYgXHn82qdR07qtUSiLY697DKZlf+m/UoS/U1hmKbsIx2w32Ab8E8Rwe5V7ov3lPyVuzVWRbZjj2L7E5/PS5pu15xkqrUPye9JHbGWbS6FuLF4AYspOq4oOZ+5SYSNXr9U6JF6oN0BMr4vuuK/X1kNY/FuO7do7kWGTCMZtXMGPdz5yVHc3TwIsL1bCrhNnNEUmBvO+ly7s1uz7cPqzipx3QcKPLlZ914U6xHp8WI2LXjVYXrLLGIgF8zWFnZTpUXGV/lto1j17tvRbRJo3pe+e6xGFnQPGpQZsaNV8hniJrLJaA7HSA== 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); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: h0/p8ykGzJGPHebFNnShiwSOR8QrKLQmgBqn3MwVNhg+c/lF9VpfIQcF790nY7MGQNKKpJrAb3/ZCcZ1G9M+PDz6hFPQipAY0H6dMf5OEqIYI2hPo80cDlmhJa/xMRBkSWpPys6w2QF97Vv83cjj/9DkOsZ/gSnvZK/LO6UGlwtJCMA+17ujocSoPIp6whI7hAKq8DRnF81r9l7rHd1/gwapNk8WK5rWTbQB0rTrtuI2vTmeFhhuDQq4Hz+3XS7oEq/T0YUfa/ETRTnQd7MUeP8VR4KhUiIX61sIr4D/N4IT9fZOeyHcMM0f+9DoRbXE6E9MZdo+IDABPkimzVWSi9yqYcnsPpYA+2HdHz3kzIgsoRi58PHYBpprMVUZ8nW57gY9KlrWjnJ17jVb7FY6VcDz1DWvSz8lYy+JfThOMSxkuRoJiKRXmxCA9sh4PJIC7nikWEQ48SOO2aitRSl8oPJjhgV51dyjYPusp9LzU/w= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1c5e00f-fb42-4c50-dd7c-08d81bce895c 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:35.7031 (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: KTO4qewQG3ELpoJAbhtbugjjJHT/h3/F0VpYexmeoS2j0ZXXsG9Ozo6bPN/cngVtKJlKC55wXlNbRsJac9Nmfw== 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 When unregister gadget driver in ci_udc, the usb device is not removed or stop. This causes next "usb start" fails to work. Add a new interface "usb_remove_ehci_gadget" in usb-uclass to remove the usb device for DM driver. Using "usb_lowlevel_stop" for non-DM driver. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- drivers/usb/gadget/ci_udc.c | 7 +++++++ drivers/usb/host/usb-uclass.c | 18 ++++++++++++++++++ include/usb.h | 9 +++++++++ 3 files changed, 34 insertions(+) diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index cdbdbcc5ca..cdb8f6fb3d 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -1053,6 +1053,13 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) free(controller.items_mem); free(controller.epts); +#if CONFIG_IS_ENABLED(DM_USB) + usb_remove_ehci_gadget(&controller.ctrl); +#else + usb_lowlevel_stop(0); + controller.ctrl = NULL; +#endif + return 0; } diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index cb79dfbbd5..50ba39af42 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -411,6 +411,24 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) return 0; } +int usb_remove_ehci_gadget(struct ehci_ctrl **ctlrp) +{ + struct udevice *dev; + int ret; + + /* Find the old device and remove it */ + ret = uclass_find_device_by_seq(UCLASS_USB, 0, true, &dev); + if (ret) + return ret; + ret = device_remove(dev, DM_REMOVE_NORMAL); + if (ret) + return ret; + + *ctlrp = NULL; + + return 0; +} + /* returns 0 if no match, 1 if match */ static int usb_match_device(const struct usb_device_descriptor *desc, const struct usb_device_id *id) diff --git a/include/usb.h b/include/usb.h index fa9e09607e..5a7af882fb 100644 --- a/include/usb.h +++ b/include/usb.h @@ -921,6 +921,15 @@ struct ehci_ctrl; */ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp); +/** + * usb_remove_ehci_gadget() - Remove a gadget USB device + * + * TODO(sjg@chromium.org): Tidy this up when USB gadgets can use driver model + * + * This provides a way to tell a controller to remove a USB device + */ +int usb_remove_ehci_gadget(struct ehci_ctrl **ctlrp); + /** * usb_stor_reset() - Prepare to scan USB storage devices *