From patchwork Tue Oct 16 05:01:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 10643093 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 1D7AA14E2 for ; Tue, 16 Oct 2018 05:02:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E8CA29BCF for ; Tue, 16 Oct 2018 05:02:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0212929C1D; Tue, 16 Oct 2018 05:02:05 +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 87A7429BCF for ; Tue, 16 Oct 2018 05:02:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727516AbeJPMui (ORCPT ); Tue, 16 Oct 2018 08:50:38 -0400 Received: from mail-ve1eur01on0074.outbound.protection.outlook.com ([104.47.1.74]:41568 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727178AbeJPMui (ORCPT ); Tue, 16 Oct 2018 08:50:38 -0400 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=C1cEsZjb06IK+4NhNz+vvITU4YhMk5NjmpnRzrLp7qQ=; b=ADT0fx295Kme4nFDwKKh08ps7+vHAten5vyXpQDedqUT+O5rBYXlA47cwro8xBRn9dSDU729Avo7wbEZiapP0jsJwwLRKomAnSEBElXlCc6vwxoyUiY4v6MkdGVTemtCL/z+QzZGLUaC8VNPGrMrBtvqj0EF0cfttsnE+W4BY+k= Received: from VI1PR04MB5327.eurprd04.prod.outlook.com (20.177.52.16) by VI1PR04MB4976.eurprd04.prod.outlook.com (20.177.49.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.25; Tue, 16 Oct 2018 05:01:25 +0000 Received: from VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::5c50:30f3:3805:71f9]) by VI1PR04MB5327.eurprd04.prod.outlook.com ([fe80::5c50:30f3:3805:71f9%4]) with mapi id 15.20.1228.027; Tue, 16 Oct 2018 05:01:25 +0000 From: Peter Chen To: "linux-usb@vger.kernel.org" , "frieder.schrempf@exceet.de" CC: dl-linux-imx , "robh+dt@kernel.org" , "devicetree@vger.kernel.org" , Peter Chen Subject: [PATCH 3/4] usb: chipidea: host: override ehci->hub_control Thread-Topic: [PATCH 3/4] usb: chipidea: host: override ehci->hub_control Thread-Index: AQHUZQ1JMc2LYV3jnke4p55ZCBkjHg== Date: Tue, 16 Oct 2018 05:01:25 +0000 Message-ID: <20181016045846.2345-4-peter.chen@nxp.com> References: <20181016045846.2345-1-peter.chen@nxp.com> In-Reply-To: <20181016045846.2345-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: HK0PR03CA0027.apcprd03.prod.outlook.com (2603:1096:203:2f::15) To VI1PR04MB5327.eurprd04.prod.outlook.com (2603:10a6:803:60::16) 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;VI1PR04MB4976;6:UX0Y1pi0nsll95zqEzjbO630aKQvzXyPhKNyOoFq4H1mrhEatX3fIPkWza2QmCynDzlOpGss2O8SUzxwzl0rZIaJ6pw64aNX+M1mRMi0Uo6mNewzKOZZLXZs/TtPdhKJ5mzVFq5r8OowQ1woOVk71ErNxPRW3fG3gra1zqmC3V5PxkCUpswec7VKC+hNiCuqnS4OgsrR3dCqDAm9hSaNO9tjz1A7uMR488lZYhsXtCMdY6vzEdfsEy3Trq8gsdDu8vrGZx0P1kv2/DmkDpNSDvZ5OH4+SGTFgbGUa+4xOAgHBc6khsBQaGImbmjczF2lV7Xtl69ujRUkRED82RFjAy9Wtk17J56R+SUi0cJ32tkWsfhF/R973DfOu63hYGqyphtTM/hwQ3wkTrhL9RaqVbq31LBjfLG4CwHU2K5NV7ECtZl1g03m+v27V+xHiCwLFrT3up504B+OzgBAidAhog==;5:QDXAu3nmtiTAjZaDVee6fqipnjx72WO/4Uzg2pnRZR0CS5kjTDOOjN0HJKxPLN93k1BBSOcGMsB62zX6YVXGIEkAziPAHcesdx7BvUUrm9aAI8WWNDGSx9riDh2trNhBkEuyNm3/0xcOdQiinmUJ+fvpZzLCfB3FTrUNljouhgg=;7:cKTZdfdAZ4CZEewYH8goHKQxmWTUPNlCA1Wq9UPkGhqb4WZrblKMp57/cuTWBicEtIwuhQFrjCB7y8SK6k6Z8guYb0VfkmUhGIIFkB9XpNkIrlVISguV3QZyet1itTLvwIhtptVrnBI7TxoIMLBkkk+PpZ9TYerbHF/G0EHNEcpxq2XPixorN36UWt7CZ2VqT2kTSIgoPrO8f7QoA5h1CNLIfehDSpqOB+ySf3chncBdXIJ7ia/KJAZduaW2dWPP x-ms-office365-filtering-correlation-id: 6f9448d8-f4dd-40a6-79d1-08d633246c37 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);SRVR:VI1PR04MB4976; x-ms-traffictypediagnostic: VI1PR04MB4976: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051);SRVR:VI1PR04MB4976;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB4976; x-forefront-prvs: 0827D7ACB9 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(136003)(346002)(376002)(396003)(189003)(199004)(14444005)(25786009)(11346002)(476003)(6512007)(2616005)(2906002)(478600001)(6486002)(4326008)(110136005)(446003)(6506007)(54906003)(386003)(6436002)(76176011)(551934003)(71190400001)(71200400001)(102836004)(2900100001)(486006)(53936002)(52116002)(186003)(99286004)(44832011)(66066001)(26005)(2501003)(5250100002)(305945005)(14454004)(97736004)(316002)(6116002)(8676002)(7736002)(1076002)(8936002)(3846002)(5660300001)(256004)(36756003)(86362001)(106356001)(81156014)(105586002)(81166006)(68736007)(50226002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB4976;H:VI1PR04MB5327.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: P/AmyvBUPDDQBOioCmb5TuNYlydJTvxnJ3UEBRGw7LWRYWwAt/T2wl5oS2fHgj0ujh3aMF8HqlFyzHBW+x7UMCPXhByK1rE8arLPDcZ6h4irHTCP5b+XsFHwnFEzGj12A/Tm03ZYgcph0YSDc3yp1y5/PkAEDgKPTXYE81lX1QBPfloWVih+3nMAAjoC3/hU/Pr7sRl9odlWKtbq7VV3LNb791wtQorryT0rlGzJNQh0bgfE68+KAcfrClCTahd9/95LbVusZ/mKNDbwGIgA/t6lK63gYr6w2Y+hmiPdAzWTKDkPzAWWMgLris/NvZqpc1VItCT7f0z3Cu5JCv2fc6mHTYtWJimWFZISB3BJtDw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f9448d8-f4dd-40a6-79d1-08d633246c37 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Oct 2018 05:01:25.0280 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4976 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. Signed-off-by: Peter Chen --- drivers/usb/chipidea/host.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index d74a13d7c21c..b8e7d7fe3d53 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -234,6 +234,79 @@ 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); + ci_ehci_override_wakeup_flag(ehci, status_reg, + PORT_WKDISC_E | PORT_WKCONN_E, false); + } + + 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); @@ -305,4 +378,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; }