From patchwork Tue Dec 11 02:09:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10722977 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF4A913AF for ; Tue, 11 Dec 2018 02:09:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E04E29FC2 for ; Tue, 11 Dec 2018 02:09:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 924862A0AF; Tue, 11 Dec 2018 02:09:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BAC929FC2 for ; Tue, 11 Dec 2018 02:09:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729503AbeLKCJE (ORCPT ); Mon, 10 Dec 2018 21:09:04 -0500 Received: from mail-eopbgr00074.outbound.protection.outlook.com ([40.107.0.74]:49632 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729474AbeLKCJE (ORCPT ); Mon, 10 Dec 2018 21:09:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8OcLc0Sa8ZNSUgzXx8dJfAmvjR5GJUT0OdXPJ+4wXWk=; b=qpfmGVjS4B8QDqPCobaiilsnYif7e+8SA1lVUMGNqAA61f9900KjAjfYixZdhH2UHNyj0ZBcqUD6Ot+SA4I4x1cGULOzWkR9AetbwlAOpc0QncU106myewBapWo+DWU/u7vjElkAiyDtA4nB1d/cwyINfY2wErQjsGYFBWr3Jto= Received: from AM0PR04MB5314.eurprd04.prod.outlook.com (20.177.42.87) by AM0PR04MB5986.eurprd04.prod.outlook.com (20.178.114.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.17; Tue, 11 Dec 2018 02:09:00 +0000 Received: from AM0PR04MB5314.eurprd04.prod.outlook.com ([fe80::7456:34a:3cbc:a78a]) by AM0PR04MB5314.eurprd04.prod.outlook.com ([fe80::7456:34a:3cbc:a78a%4]) with mapi id 15.20.1404.026; Tue, 11 Dec 2018 02:09:00 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , "frieder.schrempf@exceet.de" , "festevam@gmail.com" , Peter Chen Subject: [PATCH v5 3/4] usb: chipidea: host: override ehci->hub_control Thread-Topic: [PATCH v5 3/4] usb: chipidea: host: override ehci->hub_control Thread-Index: AQHUkPZ7JUouwWomc0qUj3jCaXtYlg== Date: Tue, 11 Dec 2018 02:09:00 +0000 Message-ID: <20181211020624.9433-4-peter.chen@nxp.com> References: <20181211020624.9433-1-peter.chen@nxp.com> In-Reply-To: <20181211020624.9433-1-peter.chen@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK0PR03CA0085.apcprd03.prod.outlook.com (2603:1096:203:72::25) To AM0PR04MB5314.eurprd04.prod.outlook.com (2603:10a6:208:d0::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peter.chen@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;AM0PR04MB5986;6:1JFAnhZMYOKVomaZiOgg+yCBvtREopBvl6yKxdwwTrTdpOLo5IG2pQZJ9/+AXulMZfzHtlHgu8lfcEHSU6zh7QBvvhxNIhjw1AKn/2487MpHwLp0VO6Rcj/Q/s51uPLR2BxChBB+/COwmSRvmyI/Q38fvyKzau/Jq0tXJXlFO/fl1jr/xvqOhIQut1ec8/Uu3HoXXRHlzZLXQHCgg681x6ngoszWOLjZyge5jUlxx3GFUj3x8LhN9/3ONj6P541oMD0cE/5ns0NFYJA8C1lccWH3YOVdQbdI2iv6c8NTfmYeT897LJKXMlbDgDtu+/+Y6b8NFj3IIzKulScEGq5e9dxcIbNZ8jok0pYVDUcft2Z9/lSHCJtzYlU+jpeO57budFe4tVFtcPLPxI1yEo6L4xw5nLys5ZhqQ2dyYoZz7HidVhRsTTwB/FFMkmtef4ZQWn9qZU4HXiXt8TVH8NqTGw==;5:6opoqKD7sw6MrIGTMk8ASURJNWFyd4KFxyomOlmsxpwbDuZLc6Rd5zzT8CylDoXWZj7QYrwj5p2N2ARf5UNJPRCvO8LD+GBcv9/i2+io8aCVlv+M/4aNnmpe/1bUXO2BG7suuoBMzlX3B9jDyz58REcyyUR+K8y/iuQyO+bDUV0=;7:l/fceVR88LeyW8LeMBRMpy5U/snCURzcWzKjW4RPGpi4tRYHgJ9Gj/NX9JcevdB1ETvjykPfL16vY6YYANgwowHD7372h/6+5tewcgVrjYf45wFNco1XgsOgP6ixkI5kp57seE17rZVT9AnrY3VhdA== x-ms-office365-filtering-correlation-id: ad26b81c-0ca2-4e85-42dc-08d65f0d9d6e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM0PR04MB5986; x-ms-traffictypediagnostic: AM0PR04MB5986: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230017)(999002)(6040522)(2401047)(8121501046)(5005006)(3231472)(944501520)(52105112)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:AM0PR04MB5986;BCL:0;PCL:0;RULEID:;SRVR:AM0PR04MB5986; x-forefront-prvs: 08831F51DC x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(346002)(376002)(136003)(396003)(39860400002)(189003)(199004)(99286004)(6512007)(4326008)(305945005)(36756003)(39060400002)(5660300001)(53936002)(81156014)(7736002)(81166006)(8676002)(14454004)(3846002)(8936002)(2906002)(6116002)(50226002)(105586002)(106356001)(2351001)(66066001)(1076002)(97736004)(25786009)(54906003)(68736007)(316002)(478600001)(76176011)(6436002)(52116002)(2616005)(26005)(476003)(86362001)(446003)(6916009)(386003)(6486002)(186003)(102836004)(11346002)(256004)(6506007)(44832011)(14444005)(2501003)(71200400001)(5640700003)(486006)(551934003)(71190400001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR04MB5986;H:AM0PR04MB5314.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Hf26IwVCo3WoYE6OW4FbteLMzvAaD5Zzs6raYl1NP0/gMaNSPkpFbQIOHXx4DHyPym99etpdxlFDnpX/GqsG9vtv45xOh8bvmMBqtscrlTM36b/HM74soDz+O86BYupyzevSI/7mXeYGAqH3MnYjKme5NyucI9FqrRcp6GpL51H0ov3yvz5+0Ct8Oc+0HLURI5ALUV1O/Wdfbpwyewve8aonN77snKzMgJ+E9ohd9/KDPX0ReF+v1+ALNfhSQ/TKqJzfpHGNDV5CGLkHXycohfnlkGT0U/k5/araY79FjB7VxWrVyVhScC7m6YVK7asm spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad26b81c-0ca2-4e85-42dc-08d65f0d9d6e X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2018 02:09:00.4999 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5986 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The chipidea controller has some special requirements during suspend/resume, override common ehci->hub_control to implement it. Reviewed-by: Frieder Schrempf Tested-by: Frieder Schrempf Signed-off-by: Peter Chen --- drivers/usb/chipidea/host.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index 028a3574266a..b45ceb91c735 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -220,6 +220,80 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci) host_stop(ci); } +/* The below code is based on tegra ehci driver */ +static int ci_ehci_hub_control( + struct usb_hcd *hcd, + u16 typeReq, + u16 wValue, + u16 wIndex, + char *buf, + u16 wLength +) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + u32 __iomem *status_reg; + u32 temp; + unsigned long flags; + int retval = 0; + struct device *dev = hcd->self.controller; + struct ci_hdrc *ci = dev_get_drvdata(dev); + + status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1]; + + spin_lock_irqsave(&ehci->lock, flags); + + if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) { + temp = ehci_readl(ehci, status_reg); + if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) { + retval = -EPIPE; + goto done; + } + + temp &= ~(PORT_RWC_BITS | PORT_WKCONN_E); + temp |= PORT_WKDISC_E | PORT_WKOC_E; + ehci_writel(ehci, temp | PORT_SUSPEND, status_reg); + + /* + * If a transaction is in progress, there may be a delay in + * suspending the port. Poll until the port is suspended. + */ + if (ehci_handshake(ehci, status_reg, PORT_SUSPEND, + PORT_SUSPEND, 5000)) + ehci_err(ehci, "timeout waiting for SUSPEND\n"); + + if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) { + if (ci->platdata->notify_event) + ci->platdata->notify_event(ci, + CI_HDRC_IMX_HSIC_SUSPEND_EVENT); + + temp = ehci_readl(ehci, status_reg); + temp &= ~(PORT_WKDISC_E | PORT_WKCONN_E); + ehci_writel(ehci, temp, status_reg); + } + + set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports); + goto done; + } + + /* + * After resume has finished, it needs do some post resume + * operation for some SoCs. + */ + else if (typeReq == ClearPortFeature && + wValue == USB_PORT_FEAT_C_SUSPEND) { + /* Make sure the resume has finished, it should be finished */ + if (ehci_handshake(ehci, status_reg, PORT_RESUME, 0, 25000)) + ehci_err(ehci, "timeout waiting for resume\n"); + } + + spin_unlock_irqrestore(&ehci->lock, flags); + + /* Handle the hub control events here */ + return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength); +done: + spin_unlock_irqrestore(&ehci->lock, flags); + return retval; +} static int ci_ehci_bus_suspend(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); @@ -298,4 +372,5 @@ void ci_hdrc_host_driver_init(void) ehci_init_driver(&ci_ehci_hc_driver, &ehci_ci_overrides); orig_bus_suspend = ci_ehci_hc_driver.bus_suspend; ci_ehci_hc_driver.bus_suspend = ci_ehci_bus_suspend; + ci_ehci_hc_driver.hub_control = ci_ehci_hub_control; }