From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,3/4] usb: chipidea: host: override ehci->hub_control From: Peter Chen Message-Id: <20181211020624.9433-4-peter.chen@nxp.com> Date: Tue, 11 Dec 2018 02:09:00 +0000 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 List-ID: VGhlIGNoaXBpZGVhIGNvbnRyb2xsZXIgaGFzIHNvbWUgc3BlY2lhbCByZXF1aXJlbWVudHMgZHVy aW5nCnN1c3BlbmQvcmVzdW1lLCBvdmVycmlkZSBjb21tb24gZWhjaS0+aHViX2NvbnRyb2wgdG8g aW1wbGVtZW50Cml0LgoKUmV2aWV3ZWQtYnk6IEZyaWVkZXIgU2NocmVtcGYgPGZyaWVkZXIuc2No cmVtcGZAa29udHJvbi5kZT4KVGVzdGVkLWJ5OiBGcmllZGVyIFNjaHJlbXBmIDxmcmllZGVyLnNj aHJlbXBmQGtvbnRyb24uZGU+ClNpZ25lZC1vZmYtYnk6IFBldGVyIENoZW4gPHBldGVyLmNoZW5A bnhwLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9jaGlwaWRlYS9ob3N0LmMgfCA3NSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA3NSBp bnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvY2hpcGlkZWEvaG9zdC5jIGIv ZHJpdmVycy91c2IvY2hpcGlkZWEvaG9zdC5jCmluZGV4IDAyOGEzNTc0MjY2YS4uYjQ1Y2ViOTFj NzM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9jaGlwaWRlYS9ob3N0LmMKKysrIGIvZHJpdmVy cy91c2IvY2hpcGlkZWEvaG9zdC5jCkBAIC0yMjAsNiArMjIwLDgwIEBAIHZvaWQgY2lfaGRyY19o b3N0X2Rlc3Ryb3koc3RydWN0IGNpX2hkcmMgKmNpKQogCQlob3N0X3N0b3AoY2kpOwogfQogCisv KiBUaGUgYmVsb3cgY29kZSBpcyBiYXNlZCBvbiB0ZWdyYSBlaGNpIGRyaXZlciAqLworc3RhdGlj IGludCBjaV9laGNpX2h1Yl9jb250cm9sKAorCXN0cnVjdCB1c2JfaGNkCSpoY2QsCisJdTE2CQl0 eXBlUmVxLAorCXUxNgkJd1ZhbHVlLAorCXUxNgkJd0luZGV4LAorCWNoYXIJCSpidWYsCisJdTE2 CQl3TGVuZ3RoCispCit7CisJc3RydWN0IGVoY2lfaGNkCSplaGNpID0gaGNkX3RvX2VoY2koaGNk KTsKKwl1MzIgX19pb21lbQkqc3RhdHVzX3JlZzsKKwl1MzIJCXRlbXA7CisJdW5zaWduZWQgbG9u ZwlmbGFnczsKKwlpbnQJCXJldHZhbCA9IDA7CisJc3RydWN0IGRldmljZSAqZGV2ID0gaGNkLT5z ZWxmLmNvbnRyb2xsZXI7CisJc3RydWN0IGNpX2hkcmMgKmNpID0gZGV2X2dldF9kcnZkYXRhKGRl dik7CisKKwlzdGF0dXNfcmVnID0gJmVoY2ktPnJlZ3MtPnBvcnRfc3RhdHVzWyh3SW5kZXggJiAw eGZmKSAtIDFdOworCisJc3Bpbl9sb2NrX2lycXNhdmUoJmVoY2ktPmxvY2ssIGZsYWdzKTsKKwor CWlmICh0eXBlUmVxID09IFNldFBvcnRGZWF0dXJlICYmIHdWYWx1ZSA9PSBVU0JfUE9SVF9GRUFU X1NVU1BFTkQpIHsKKwkJdGVtcCA9IGVoY2lfcmVhZGwoZWhjaSwgc3RhdHVzX3JlZyk7CisJCWlm ICgodGVtcCAmIFBPUlRfUEUpID09IDAgfHwgKHRlbXAgJiBQT1JUX1JFU0VUKSAhPSAwKSB7CisJ CQlyZXR2YWwgPSAtRVBJUEU7CisJCQlnb3RvIGRvbmU7CisJCX0KKworCQl0ZW1wICY9IH4oUE9S VF9SV0NfQklUUyB8IFBPUlRfV0tDT05OX0UpOworCQl0ZW1wIHw9IFBPUlRfV0tESVNDX0UgfCBQ T1JUX1dLT0NfRTsKKwkJZWhjaV93cml0ZWwoZWhjaSwgdGVtcCB8IFBPUlRfU1VTUEVORCwgc3Rh dHVzX3JlZyk7CisKKwkJLyoKKwkJICogSWYgYSB0cmFuc2FjdGlvbiBpcyBpbiBwcm9ncmVzcywg dGhlcmUgbWF5IGJlIGEgZGVsYXkgaW4KKwkJICogc3VzcGVuZGluZyB0aGUgcG9ydC4gUG9sbCB1 bnRpbCB0aGUgcG9ydCBpcyBzdXNwZW5kZWQuCisJCSAqLworCQlpZiAoZWhjaV9oYW5kc2hha2Uo ZWhjaSwgc3RhdHVzX3JlZywgUE9SVF9TVVNQRU5ELAorCQkJUE9SVF9TVVNQRU5ELCA1MDAwKSkK KwkJCWVoY2lfZXJyKGVoY2ksICJ0aW1lb3V0IHdhaXRpbmcgZm9yIFNVU1BFTkRcbiIpOworCisJ CWlmIChjaS0+cGxhdGRhdGEtPmZsYWdzICYgQ0lfSERSQ19JTVhfSVNfSFNJQykgeworCQkJaWYg KGNpLT5wbGF0ZGF0YS0+bm90aWZ5X2V2ZW50KQorCQkJCWNpLT5wbGF0ZGF0YS0+bm90aWZ5X2V2 ZW50KGNpLAorCQkJCQlDSV9IRFJDX0lNWF9IU0lDX1NVU1BFTkRfRVZFTlQpOworCisJCQl0ZW1w ID0gZWhjaV9yZWFkbChlaGNpLCBzdGF0dXNfcmVnKTsKKwkJCXRlbXAgJj0gfihQT1JUX1dLRElT Q19FIHwgUE9SVF9XS0NPTk5fRSk7CisJCQllaGNpX3dyaXRlbChlaGNpLCB0ZW1wLCBzdGF0dXNf cmVnKTsKKwkJfQorCisJCXNldF9iaXQoKHdJbmRleCAmIDB4ZmYpIC0gMSwgJmVoY2ktPnN1c3Bl bmRlZF9wb3J0cyk7CisJCWdvdG8gZG9uZTsKKwl9CisKKwkvKgorCSAqIEFmdGVyIHJlc3VtZSBo YXMgZmluaXNoZWQsIGl0IG5lZWRzIGRvIHNvbWUgcG9zdCByZXN1bWUKKwkgKiBvcGVyYXRpb24g Zm9yIHNvbWUgU29Dcy4KKwkgKi8KKwllbHNlIGlmICh0eXBlUmVxID09IENsZWFyUG9ydEZlYXR1 cmUgJiYKKwkJd1ZhbHVlID09IFVTQl9QT1JUX0ZFQVRfQ19TVVNQRU5EKSB7CisJCS8qIE1ha2Ug c3VyZSB0aGUgcmVzdW1lIGhhcyBmaW5pc2hlZCwgaXQgc2hvdWxkIGJlIGZpbmlzaGVkICovCisJ CWlmIChlaGNpX2hhbmRzaGFrZShlaGNpLCBzdGF0dXNfcmVnLCBQT1JUX1JFU1VNRSwgMCwgMjUw MDApKQorCQkJZWhjaV9lcnIoZWhjaSwgInRpbWVvdXQgd2FpdGluZyBmb3IgcmVzdW1lXG4iKTsK Kwl9CisKKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlaGNpLT5sb2NrLCBmbGFncyk7CisKKwkv KiBIYW5kbGUgdGhlIGh1YiBjb250cm9sIGV2ZW50cyBoZXJlICovCisJcmV0dXJuIGVoY2lfaHVi X2NvbnRyb2woaGNkLCB0eXBlUmVxLCB3VmFsdWUsIHdJbmRleCwgYnVmLCB3TGVuZ3RoKTsKK2Rv bmU6CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZWhjaS0+bG9jaywgZmxhZ3MpOworCXJldHVy biByZXR2YWw7Cit9CiBzdGF0aWMgaW50IGNpX2VoY2lfYnVzX3N1c3BlbmQoc3RydWN0IHVzYl9o Y2QgKmhjZCkKIHsKIAlzdHJ1Y3QgZWhjaV9oY2QgKmVoY2kgPSBoY2RfdG9fZWhjaShoY2QpOwpA QCAtMjk4LDQgKzM3Miw1IEBAIHZvaWQgY2lfaGRyY19ob3N0X2RyaXZlcl9pbml0KHZvaWQpCiAJ ZWhjaV9pbml0X2RyaXZlcigmY2lfZWhjaV9oY19kcml2ZXIsICZlaGNpX2NpX292ZXJyaWRlcyk7 CiAJb3JpZ19idXNfc3VzcGVuZCA9IGNpX2VoY2lfaGNfZHJpdmVyLmJ1c19zdXNwZW5kOwogCWNp X2VoY2lfaGNfZHJpdmVyLmJ1c19zdXNwZW5kID0gY2lfZWhjaV9idXNfc3VzcGVuZDsKKwljaV9l aGNpX2hjX2RyaXZlci5odWJfY29udHJvbCA9IGNpX2VoY2lfaHViX2NvbnRyb2w7CiB9Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 From: Peter Chen Subject: [PATCH v5 3/4] usb: chipidea: host: override ehci->hub_control 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> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org 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 List-ID: 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); } =20 +/* 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 =3D hcd_to_ehci(hcd); + u32 __iomem *status_reg; + u32 temp; + unsigned long flags; + int retval =3D 0; + struct device *dev =3D hcd->self.controller; + struct ci_hdrc *ci =3D dev_get_drvdata(dev); + + status_reg =3D &ehci->regs->port_status[(wIndex & 0xff) - 1]; + + spin_lock_irqsave(&ehci->lock, flags); + + if (typeReq =3D=3D SetPortFeature && wValue =3D=3D USB_PORT_FEAT_SUSPEND)= { + temp =3D ehci_readl(ehci, status_reg); + if ((temp & PORT_PE) =3D=3D 0 || (temp & PORT_RESET) !=3D 0) { + retval =3D -EPIPE; + goto done; + } + + temp &=3D ~(PORT_RWC_BITS | PORT_WKCONN_E); + temp |=3D 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 =3D ehci_readl(ehci, status_reg); + temp &=3D ~(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 =3D=3D ClearPortFeature && + wValue =3D=3D 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 =3D 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 =3D ci_ehci_hc_driver.bus_suspend; ci_ehci_hc_driver.bus_suspend =3D ci_ehci_bus_suspend; + ci_ehci_hc_driver.hub_control =3D ci_ehci_hub_control; } --=20 2.14.1