From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-eopbgr40044.outbound.protection.outlook.com ([40.107.4.44]:47008 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727269AbeJVOAs (ORCPT ); Mon, 22 Oct 2018 10:00:48 -0400 From: Peter Chen Subject: [PATCH v2 3/4] usb: chipidea: host: override ehci->hub_control Date: Mon, 22 Oct 2018 05:43:04 +0000 Message-ID: <20181022054031.14027-4-peter.chen@nxp.com> References: <20181022054031.14027-1-peter.chen@nxp.com> In-Reply-To: <20181022054031.14027-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. 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); } =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); + 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 =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); @@ -305,4 +378,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 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: [v2,3/4] usb: chipidea: host: override ehci->hub_control From: Peter Chen Message-Id: <20181022054031.14027-4-peter.chen@nxp.com> Date: Mon, 22 Oct 2018 05:43:04 +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 aW1wbGVtZW50Cml0LgoKU2lnbmVkLW9mZi1ieTogUGV0ZXIgQ2hlbiA8cGV0ZXIuY2hlbkBueHAu Y29tPgotLS0KIGRyaXZlcnMvdXNiL2NoaXBpZGVhL2hvc3QuYyB8IDc0ICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDc0IGluc2Vy dGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9jaGlwaWRlYS9ob3N0LmMgYi9kcml2 ZXJzL3VzYi9jaGlwaWRlYS9ob3N0LmMKaW5kZXggZDc0YTEzZDdjMjFjLi5iOGU3ZDdmZTNkNTMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2NoaXBpZGVhL2hvc3QuYworKysgYi9kcml2ZXJzL3Vz Yi9jaGlwaWRlYS9ob3N0LmMKQEAgLTIzNCw2ICsyMzQsNzkgQEAgdm9pZCBjaV9oZHJjX2hvc3Rf ZGVzdHJveShzdHJ1Y3QgY2lfaGRyYyAqY2kpCiAJCWhvc3Rfc3RvcChjaSk7CiB9CiAKKy8qIFRo ZSBiZWxvdyBjb2RlIGlzIGJhc2VkIG9uIHRlZ3JhIGVoY2kgZHJpdmVyICovCitzdGF0aWMgaW50 IGNpX2VoY2lfaHViX2NvbnRyb2woCisJc3RydWN0IHVzYl9oY2QJKmhjZCwKKwl1MTYJCXR5cGVS ZXEsCisJdTE2CQl3VmFsdWUsCisJdTE2CQl3SW5kZXgsCisJY2hhcgkJKmJ1ZiwKKwl1MTYJCXdM ZW5ndGgKKykKK3sKKwlzdHJ1Y3QgZWhjaV9oY2QJKmVoY2kgPSBoY2RfdG9fZWhjaShoY2QpOwor CXUzMiBfX2lvbWVtCSpzdGF0dXNfcmVnOworCXUzMgkJdGVtcDsKKwl1bnNpZ25lZCBsb25nCWZs YWdzOworCWludAkJcmV0dmFsID0gMDsKKwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSBoY2QtPnNlbGYu Y29udHJvbGxlcjsKKwlzdHJ1Y3QgY2lfaGRyYyAqY2kgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsK KworCXN0YXR1c19yZWcgPSAmZWhjaS0+cmVncy0+cG9ydF9zdGF0dXNbKHdJbmRleCAmIDB4ZmYp IC0gMV07CisKKwlzcGluX2xvY2tfaXJxc2F2ZSgmZWhjaS0+bG9jaywgZmxhZ3MpOworCisJaWYg KHR5cGVSZXEgPT0gU2V0UG9ydEZlYXR1cmUgJiYgd1ZhbHVlID09IFVTQl9QT1JUX0ZFQVRfU1VT UEVORCkgeworCQl0ZW1wID0gZWhjaV9yZWFkbChlaGNpLCBzdGF0dXNfcmVnKTsKKwkJaWYgKCh0 ZW1wICYgUE9SVF9QRSkgPT0gMCB8fCAodGVtcCAmIFBPUlRfUkVTRVQpICE9IDApIHsKKwkJCXJl dHZhbCA9IC1FUElQRTsKKwkJCWdvdG8gZG9uZTsKKwkJfQorCisJCXRlbXAgJj0gfihQT1JUX1JX Q19CSVRTIHwgUE9SVF9XS0NPTk5fRSk7CisJCXRlbXAgfD0gUE9SVF9XS0RJU0NfRSB8IFBPUlRf V0tPQ19FOworCQllaGNpX3dyaXRlbChlaGNpLCB0ZW1wIHwgUE9SVF9TVVNQRU5ELCBzdGF0dXNf cmVnKTsKKworCQkvKgorCQkgKiBJZiBhIHRyYW5zYWN0aW9uIGlzIGluIHByb2dyZXNzLCB0aGVy ZSBtYXkgYmUgYSBkZWxheSBpbgorCQkgKiBzdXNwZW5kaW5nIHRoZSBwb3J0LiBQb2xsIHVudGls IHRoZSBwb3J0IGlzIHN1c3BlbmRlZC4KKwkJICovCisJCWlmIChlaGNpX2hhbmRzaGFrZShlaGNp LCBzdGF0dXNfcmVnLCBQT1JUX1NVU1BFTkQsCisJCQkJCQlQT1JUX1NVU1BFTkQsIDUwMDApKQor CQkJZWhjaV9lcnIoZWhjaSwgInRpbWVvdXQgd2FpdGluZyBmb3IgU1VTUEVORFxuIik7CisKKwkJ aWYgKGNpLT5wbGF0ZGF0YS0+ZmxhZ3MgJiBDSV9IRFJDX0lNWF9JU19IU0lDKSB7CisJCQlpZiAo Y2ktPnBsYXRkYXRhLT5ub3RpZnlfZXZlbnQpCisJCQkJY2ktPnBsYXRkYXRhLT5ub3RpZnlfZXZl bnQKKwkJCQkJKGNpLCBDSV9IRFJDX0lNWF9IU0lDX1NVU1BFTkRfRVZFTlQpOworCQkJY2lfZWhj aV9vdmVycmlkZV93YWtldXBfZmxhZyhlaGNpLCBzdGF0dXNfcmVnLAorCQkJCVBPUlRfV0tESVND X0UgfCBQT1JUX1dLQ09OTl9FLCBmYWxzZSk7CisJCX0KKworCQlzZXRfYml0KCh3SW5kZXggJiAw eGZmKSAtIDEsICZlaGNpLT5zdXNwZW5kZWRfcG9ydHMpOworCQlnb3RvIGRvbmU7CisJfQorCisJ LyoKKwkgKiBBZnRlciByZXN1bWUgaGFzIGZpbmlzaGVkLCBpdCBuZWVkcyBkbyBzb21lIHBvc3Qg cmVzdW1lCisJICogb3BlcmF0aW9uIGZvciBzb21lIFNvQ3MuCisJICovCisJZWxzZSBpZiAodHlw ZVJlcSA9PSBDbGVhclBvcnRGZWF0dXJlICYmCisJCQkJCXdWYWx1ZSA9PSBVU0JfUE9SVF9GRUFU X0NfU1VTUEVORCkgeworCisJCS8qIE1ha2Ugc3VyZSB0aGUgcmVzdW1lIGhhcyBmaW5pc2hlZCwg aXQgc2hvdWxkIGJlIGZpbmlzaGVkICovCisJCWlmIChlaGNpX2hhbmRzaGFrZShlaGNpLCBzdGF0 dXNfcmVnLCBQT1JUX1JFU1VNRSwgMCwgMjUwMDApKQorCQkJZWhjaV9lcnIoZWhjaSwgInRpbWVv dXQgd2FpdGluZyBmb3IgcmVzdW1lXG4iKTsKKwl9CisKKwlzcGluX3VubG9ja19pcnFyZXN0b3Jl KCZlaGNpLT5sb2NrLCBmbGFncyk7CisKKwkvKiBIYW5kbGUgdGhlIGh1YiBjb250cm9sIGV2ZW50 cyBoZXJlICovCisJcmV0dXJuIGVoY2lfaHViX2NvbnRyb2woaGNkLCB0eXBlUmVxLCB3VmFsdWUs IHdJbmRleCwgYnVmLCB3TGVuZ3RoKTsKK2RvbmU6CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgm ZWhjaS0+bG9jaywgZmxhZ3MpOworCXJldHVybiByZXR2YWw7Cit9CiBzdGF0aWMgaW50IGNpX2Vo Y2lfYnVzX3N1c3BlbmQoc3RydWN0IHVzYl9oY2QgKmhjZCkKIHsKIAlzdHJ1Y3QgZWhjaV9oY2Qg KmVoY2kgPSBoY2RfdG9fZWhjaShoY2QpOwpAQCAtMzA1LDQgKzM3OCw1IEBAIHZvaWQgY2lfaGRy Y19ob3N0X2RyaXZlcl9pbml0KHZvaWQpCiAJZWhjaV9pbml0X2RyaXZlcigmY2lfZWhjaV9oY19k cml2ZXIsICZlaGNpX2NpX292ZXJyaWRlcyk7CiAJb3JpZ19idXNfc3VzcGVuZCA9IGNpX2VoY2lf aGNfZHJpdmVyLmJ1c19zdXNwZW5kOwogCWNpX2VoY2lfaGNfZHJpdmVyLmJ1c19zdXNwZW5kID0g Y2lfZWhjaV9idXNfc3VzcGVuZDsKKwljaV9laGNpX2hjX2RyaXZlci5odWJfY29udHJvbCA9IGNp X2VoY2lfaHViX2NvbnRyb2w7CiB9Cg==