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,02/10] usb: host: xhci: mvebu: add reset on resume quirk From: Gregory CLEMENT Message-Id: <878szilzpq.fsf@FE-laptop> Date: Fri, 18 Jan 2019 17:04:01 +0100 To: Miquel Raynal Cc: Kishon Vijay Abraham I , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Mark Rutland , Greg Kroah-Hartman , Mathias Nyman , Alan Stern , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, Thomas Petazzoni , Antoine Tenart , Maxime Chevallier , Nadav Haklai , Ofer Heifetz List-ID: SGkgTWlxdWVsLAogCiBPbiB2ZW4uLCBqYW52LiAxMSAyMDE5LCBNaXF1ZWwgUmF5bmFsIDxtaXF1 ZWwucmF5bmFsQGJvb3RsaW4uY29tPiB3cm90ZToKCj4gRnJvbTogT2ZlciBIZWlmZXR6IDxvZmVy aEBtYXJ2ZWxsLmNvbT4KPgo+IFRoZSBtdmVidSB4SENJIGhvc3QgZHJpdmVyIGRvZXMgbm90IGhh dmUgc3VzcGVuZC9yZXN1bWUgc3VwcG9ydC4gVXNlIG9mCj4gdGhlIFhIQ0lfUkVTRVRfT05fUkVT VU1FIHF1aXJrIGlzIG1hbmRhdG9yeSBpbiBvcmRlciB0byBhdm9pZCBmYWlsdXJlcwo+IGFmdGVy IHJlc3VtZS4gVGhpcyB3aWxsIHdvcmsgb25seSBpZiBubyBVU0IgZGV2aWNlIGlzIHBsdWdnZWQt aW4uCj4KPiBXaGlsZSBhdCBpdCwgbWVudGlvbiBpbiB0aGUgS2NvbmZpZyBmaWxlIHRoYXQgdGhp cyBJUCBpcyBhbHNvIHByZXNlbnQKPiBvbiB0aGUgQTM3MDAgU29DLgo+Cj4gU2lnbmVkLW9mZi1i eTogT2ZlciBIZWlmZXR6IDxvZmVyaEBtYXJ2ZWxsLmNvbT4KPiBbbWlxdWVsLnJheW5hbEBib290 bGluLmNvbTogUmV3b3JkIHRoZSBjb21taXQgbWVzc2FnZV0KPiBTaWduZWQtb2ZmLWJ5OiBNaXF1 ZWwgUmF5bmFsIDxtaXF1ZWwucmF5bmFsQGJvb3RsaW4uY29tPgo+IC0tLQo+ICBkcml2ZXJzL3Vz Yi9ob3N0L0tjb25maWcgICAgICB8ICA0ICsrLS0KPiAgZHJpdmVycy91c2IvaG9zdC94aGNpLW12 ZWJ1LmMgfCAxMSArKysrKysrKysrKwo+ICBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXZlYnUuaCB8 ICA2ICsrKysrKwo+ICBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGxhdC5jICB8ICA3ICsrKysrKysK PiAgNCBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+Cj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2hvc3QvS2NvbmZpZyBiL2RyaXZlcnMvdXNiL2hvc3Qv S2NvbmZpZwo+IGluZGV4IDE2NzU4YjEyYTVlOS4uMTNkNTliZTZhNmFhIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvdXNiL2hvc3QvS2NvbmZpZwo+ICsrKyBiL2RyaXZlcnMvdXNiL2hvc3QvS2NvbmZp Zwo+IEBAIC02OSwxMyArNjksMTMgQEAgY29uZmlnIFVTQl9YSENJX01USwo+ICAJICBJZiB1bnN1 cmUsIHNheSBOLgo+ICAKPiAgY29uZmlnIFVTQl9YSENJX01WRUJVCj4gLQl0cmlzdGF0ZSAieEhD SSBzdXBwb3J0IGZvciBNYXJ2ZWxsIEFybWFkYSAzNzUvMzh4Igo+ICsJdHJpc3RhdGUgInhIQ0kg c3VwcG9ydCBmb3IgTWFydmVsbCBBcm1hZGEgMzc1LzM4eC8zNzAwIgoKSSB3b3VsZCBuYW1lIGl0 IDM3eHggdG8gYmUgY29uc2lzdGVudCB3aXRoIDM4eAoKPiAgCXNlbGVjdCBVU0JfWEhDSV9QTEFU Rk9STQo+ICAJZGVwZW5kcyBvbiBIQVNfSU9NRU0KPiAgCWRlcGVuZHMgb24gQVJDSF9NVkVCVSB8 fCBDT01QSUxFX1RFU1QKPiAgCS0tLWhlbHAtLS0KPiAgCSAgU2F5ICdZJyB0byBlbmFibGUgdGhl IHN1cHBvcnQgZm9yIHRoZSB4SENJIGhvc3QgY29udHJvbGxlcgo+IC0JICBmb3VuZCBpbiBNYXJ2 ZWxsIEFybWFkYSAzNzUvMzh4IEFSTSBTT0NzLgo+ICsJICBmb3VuZCBpbiBNYXJ2ZWxsIEFybWFk YSAzNzUvMzh4LzM3MDAgQVJNIFNPQ3MuCnNhbWUgaGVyZQoKCj4gIAo+ICBjb25maWcgVVNCX1hI Q0lfUkNBUgo+ICAJdHJpc3RhdGUgInhIQ0kgc3VwcG9ydCBmb3IgUmVuZXNhcyBSLUNhciBTb0Nz Igo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktbXZlYnUuYyBiL2RyaXZlcnMv dXNiL2hvc3QveGhjaS1tdmVidS5jCj4gaW5kZXggMzJlMTU4NTY4Nzg4Li42MDY1MWE1MDc3MGYg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvaG9zdC94aGNpLW12ZWJ1LmMKPiArKysgYi9kcml2 ZXJzL3VzYi9ob3N0L3hoY2ktbXZlYnUuYwo+IEBAIC0xMyw2ICsxMyw3IEBACj4gICNpbmNsdWRl IDxsaW51eC91c2IvaGNkLmg+Cj4gIAo+ICAjaW5jbHVkZSAieGhjaS1tdmVidS5oIgo+ICsjaW5j bHVkZSAieGhjaS5oIgo+ICAKPiAgI2RlZmluZSBVU0IzX01BWF9XSU5ET1dTCTQKPiAgI2RlZmlu ZSBVU0IzX1dJTl9DVFJMKHcpCSgweDAgKyAoKHcpICogOCkpCj4gQEAgLTcyLDMgKzczLDEzIEBA IGludCB4aGNpX212ZWJ1X21idXNfaW5pdF9xdWlyayhzdHJ1Y3QgdXNiX2hjZCAqaGNkKQo+ICAK PiAgCXJldHVybiAwOwo+ICB9Cj4gKwo+ICtpbnQgeGhjaV9tdmVidV9hMzcwMF9pbml0X3F1aXJr KHN0cnVjdCB1c2JfaGNkICpoY2QpCj4gK3sKPiArCXN0cnVjdCB4aGNpX2hjZAkqeGhjaSA9IGhj ZF90b194aGNpKGhjZCk7Cj4gKwo+ICsJLyogV2l0aG91dCByZXNldCBvbiByZXN1bWUsIHRoZSBI QyB3b24ndCB3b3JrIGF0IGFsbCAqLwo+ICsJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfUkVTRVRfT05f UkVTVU1FOwo+ICsKPiArCXJldHVybiAwOwo+ICt9Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNi L2hvc3QveGhjaS1tdmVidS5oIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLW12ZWJ1LmgKPiBpbmRl eCAwOTc5MWRmMmNlYzAuLmNhMGEzYTU3MjFkZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9o b3N0L3hoY2ktbXZlYnUuaAo+ICsrKyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1tdmVidS5oCj4g QEAgLTEyLDEwICsxMiwxNiBAQCBzdHJ1Y3QgdXNiX2hjZDsKPiAgCj4gICNpZiBJU19FTkFCTEVE KENPTkZJR19VU0JfWEhDSV9NVkVCVSkKPiAgaW50IHhoY2lfbXZlYnVfbWJ1c19pbml0X3F1aXJr KHN0cnVjdCB1c2JfaGNkICpoY2QpOwo+ICtpbnQgeGhjaV9tdmVidV9hMzcwMF9pbml0X3F1aXJr KHN0cnVjdCB1c2JfaGNkICpoY2QpOwo+ICAjZWxzZQo+ICBzdGF0aWMgaW5saW5lIGludCB4aGNp X212ZWJ1X21idXNfaW5pdF9xdWlyayhzdHJ1Y3QgdXNiX2hjZCAqaGNkKQo+ICB7Cj4gIAlyZXR1 cm4gMDsKPiAgfQo+ICsKPiArc3RhdGljIGlubGluZSBpbnQgeGhjaV9tdmVidV9hMzcwMF9pbml0 X3F1aXJrKHN0cnVjdCB1c2JfaGNkICpoY2QpCj4gK3sKPiArCXJldHVybiAwOwo+ICt9Cj4gICNl bmRpZgo+ICAjZW5kaWYgLyogX19MSU5VWF9YSENJX01WRUJVX0ggKi8KPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy91c2IvaG9zdC94aGNpLXBsYXQuYyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0 LmMKPiBpbmRleCBlZjA5Y2IwNjIxMmYuLjBhYzRlYzk3NTU0NyAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL3VzYi9ob3N0L3hoY2ktcGxhdC5jCj4gKysrIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLXBs YXQuYwo+IEBAIC05OCw2ICs5OCwxMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHhoY2lfcGxhdF9w cml2IHhoY2lfcGxhdF9tYXJ2ZWxsX2FybWFkYSA9IHsKPiAgCS5pbml0X3F1aXJrID0geGhjaV9t dmVidV9tYnVzX2luaXRfcXVpcmssCj4gIH07Cj4gIAo+ICtzdGF0aWMgY29uc3Qgc3RydWN0IHho Y2lfcGxhdF9wcml2IHhoY2lfcGxhdF9tYXJ2ZWxsX2FybWFkYTM3MDAgPSB7Cj4gKwkuaW5pdF9x dWlyayA9IHhoY2lfbXZlYnVfYTM3MDBfaW5pdF9xdWlyaywKPiArfTsKPiArCj4gIHN0YXRpYyBj b25zdCBzdHJ1Y3QgeGhjaV9wbGF0X3ByaXYgeGhjaV9wbGF0X3JlbmVzYXNfcmNhcl9nZW4yID0g ewo+ICAJLmZpcm13YXJlX25hbWUgPSBYSENJX1JDQVJfRklSTVdBUkVfTkFNRV9WMSwKPiAgCS5p bml0X3F1aXJrID0geGhjaV9yY2FyX2luaXRfcXVpcmssCj4gQEAgLTEyMyw2ICsxMjcsOSBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCB1c2JfeGhjaV9vZl9tYXRjaFtdID0gewo+ ICAJfSwgewo+ICAJCS5jb21wYXRpYmxlID0gIm1hcnZlbGwsYXJtYWRhLTM4MC14aGNpIiwKPiAg CQkuZGF0YSA9ICZ4aGNpX3BsYXRfbWFydmVsbF9hcm1hZGEsCj4gKwl9LCB7Cj4gKwkJLmNvbXBh dGlibGUgPSAibWFydmVsbCxhcm1hZGEzNzAwLXhoY2kiLAo+ICsJCS5kYXRhID0gJnhoY2lfcGxh dF9tYXJ2ZWxsX2FybWFkYTM3MDAsCgoKUmV2aWV3ZWQtYnk6IEdyZWdvcnkgQ0xFTUVOVCA8Z3Jl Z29yeS5jbGVtZW50QGJvb3RsaW4uY29tPgoKVGhhbmtzLAoKR3JlZ29yeQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2582DC43387 for ; Fri, 18 Jan 2019 16:04:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E57602086D for ; Fri, 18 Jan 2019 16:04:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aGvwSsLQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E57602086D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:References:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uAUfeGnlBw1mkcm2KOsgHZxxDhFkjnvX5PiXSBW4xOg=; b=aGvwSsLQC+YGuT DQ26TQLEmUtN0HTBQlguY8hYOZ8mAj9GyGmKM6sf2yaVPyyyL8BZWG1N7USB/2etffCb8bwKCr7RM MiGYcqd0k9A71GPXuyhnwAOTnhD81Dyty2dVXzKJEao3/VqDkGxFGTXBZqvLV0+tRnWuJcmYJax4A aMeifV2h/PQeADaXJh/fEygixB4AF/VuKXVh1/N+NaJXNE6A9pkhQ7p3AlqaVAyjo/fXlBmLXyHz0 wtV2l2EE8s5lnyWY0f6spnYVxpLM/4lD0darS4NXDPXjCFtgYftyr5ZYkeo7F1e15BJ2YTPsWO9iA 2lS9pdTMMKAWwwu26d2w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkWd2-00082o-4K; Fri, 18 Jan 2019 16:04:20 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkWcx-00082U-NR for linux-arm-kernel@lists.infradead.org; Fri, 18 Jan 2019 16:04:18 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 4FEF22074A; Fri, 18 Jan 2019 17:04:14 +0100 (CET) Received: from localhost (alyon-652-1-26-46.w109-213.abo.wanadoo.fr [109.213.9.46]) by mail.bootlin.com (Postfix) with ESMTPSA id 48AAE206A7; Fri, 18 Jan 2019 17:04:03 +0100 (CET) From: Gregory CLEMENT To: Miquel Raynal Subject: Re: [PATCH v2 02/10] usb: host: xhci: mvebu: add reset on resume quirk References: <20190111133133.24803-1-miquel.raynal@bootlin.com> <20190111133133.24803-3-miquel.raynal@bootlin.com> Date: Fri, 18 Jan 2019 17:04:01 +0100 In-Reply-To: <20190111133133.24803-3-miquel.raynal@bootlin.com> (Miquel Raynal's message of "Fri, 11 Jan 2019 14:31:25 +0100") Message-ID: <878szilzpq.fsf@FE-laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190118_080416_036615_C9D69468 X-CRM114-Status: GOOD ( 26.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Andrew Lunn , Jason Cooper , Mathias Nyman , devicetree@vger.kernel.org, Antoine Tenart , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Kishon Vijay Abraham I , Nadav Haklai , Rob Herring , Alan Stern , Thomas Petazzoni , Maxime Chevallier , Ofer Heifetz , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Miquel, On ven., janv. 11 2019, Miquel Raynal wrote: > From: Ofer Heifetz > > The mvebu xHCI host driver does not have suspend/resume support. Use of > the XHCI_RESET_ON_RESUME quirk is mandatory in order to avoid failures > after resume. This will work only if no USB device is plugged-in. > > While at it, mention in the Kconfig file that this IP is also present > on the A3700 SoC. > > Signed-off-by: Ofer Heifetz > [miquel.raynal@bootlin.com: Reword the commit message] > Signed-off-by: Miquel Raynal > --- > drivers/usb/host/Kconfig | 4 ++-- > drivers/usb/host/xhci-mvebu.c | 11 +++++++++++ > drivers/usb/host/xhci-mvebu.h | 6 ++++++ > drivers/usb/host/xhci-plat.c | 7 +++++++ > 4 files changed, 26 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index 16758b12a5e9..13d59be6a6aa 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -69,13 +69,13 @@ config USB_XHCI_MTK > If unsure, say N. > > config USB_XHCI_MVEBU > - tristate "xHCI support for Marvell Armada 375/38x" > + tristate "xHCI support for Marvell Armada 375/38x/3700" I would name it 37xx to be consistent with 38x > select USB_XHCI_PLATFORM > depends on HAS_IOMEM > depends on ARCH_MVEBU || COMPILE_TEST > ---help--- > Say 'Y' to enable the support for the xHCI host controller > - found in Marvell Armada 375/38x ARM SOCs. > + found in Marvell Armada 375/38x/3700 ARM SOCs. same here > > config USB_XHCI_RCAR > tristate "xHCI support for Renesas R-Car SoCs" > diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c > index 32e158568788..60651a50770f 100644 > --- a/drivers/usb/host/xhci-mvebu.c > +++ b/drivers/usb/host/xhci-mvebu.c > @@ -13,6 +13,7 @@ > #include > > #include "xhci-mvebu.h" > +#include "xhci.h" > > #define USB3_MAX_WINDOWS 4 > #define USB3_WIN_CTRL(w) (0x0 + ((w) * 8)) > @@ -72,3 +73,13 @@ int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd) > > return 0; > } > + > +int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd) > +{ > + struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + > + /* Without reset on resume, the HC won't work at all */ > + xhci->quirks |= XHCI_RESET_ON_RESUME; > + > + return 0; > +} > diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h > index 09791df2cec0..ca0a3a5721dd 100644 > --- a/drivers/usb/host/xhci-mvebu.h > +++ b/drivers/usb/host/xhci-mvebu.h > @@ -12,10 +12,16 @@ struct usb_hcd; > > #if IS_ENABLED(CONFIG_USB_XHCI_MVEBU) > int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd); > +int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd); > #else > static inline int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd) > { > return 0; > } > + > +static inline int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd) > +{ > + return 0; > +} > #endif > #endif /* __LINUX_XHCI_MVEBU_H */ > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index ef09cb06212f..0ac4ec975547 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -98,6 +98,10 @@ static const struct xhci_plat_priv xhci_plat_marvell_armada = { > .init_quirk = xhci_mvebu_mbus_init_quirk, > }; > > +static const struct xhci_plat_priv xhci_plat_marvell_armada3700 = { > + .init_quirk = xhci_mvebu_a3700_init_quirk, > +}; > + > static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = { > .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1, > .init_quirk = xhci_rcar_init_quirk, > @@ -123,6 +127,9 @@ static const struct of_device_id usb_xhci_of_match[] = { > }, { > .compatible = "marvell,armada-380-xhci", > .data = &xhci_plat_marvell_armada, > + }, { > + .compatible = "marvell,armada3700-xhci", > + .data = &xhci_plat_marvell_armada3700, Reviewed-by: Gregory CLEMENT Thanks, Gregory -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gregory CLEMENT Subject: Re: [PATCH v2 02/10] usb: host: xhci: mvebu: add reset on resume quirk Date: Fri, 18 Jan 2019 17:04:01 +0100 Message-ID: <878szilzpq.fsf@FE-laptop> References: <20190111133133.24803-1-miquel.raynal@bootlin.com> <20190111133133.24803-3-miquel.raynal@bootlin.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190111133133.24803-3-miquel.raynal@bootlin.com> (Miquel Raynal's message of "Fri, 11 Jan 2019 14:31:25 +0100") List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Miquel Raynal Cc: Mark Rutland , Andrew Lunn , Jason Cooper , Mathias Nyman , devicetree@vger.kernel.org, Antoine Tenart , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Kishon Vijay Abraham I , Nadav Haklai , Rob Herring , Alan Stern , Thomas Petazzoni , Maxime Chevallier , Ofer Heifetz , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth List-Id: devicetree@vger.kernel.org Hi Miquel, On ven., janv. 11 2019, Miquel Raynal wrote: > From: Ofer Heifetz > > The mvebu xHCI host driver does not have suspend/resume support. Use of > the XHCI_RESET_ON_RESUME quirk is mandatory in order to avoid failures > after resume. This will work only if no USB device is plugged-in. > > While at it, mention in the Kconfig file that this IP is also present > on the A3700 SoC. > > Signed-off-by: Ofer Heifetz > [miquel.raynal@bootlin.com: Reword the commit message] > Signed-off-by: Miquel Raynal > --- > drivers/usb/host/Kconfig | 4 ++-- > drivers/usb/host/xhci-mvebu.c | 11 +++++++++++ > drivers/usb/host/xhci-mvebu.h | 6 ++++++ > drivers/usb/host/xhci-plat.c | 7 +++++++ > 4 files changed, 26 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index 16758b12a5e9..13d59be6a6aa 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -69,13 +69,13 @@ config USB_XHCI_MTK > If unsure, say N. > > config USB_XHCI_MVEBU > - tristate "xHCI support for Marvell Armada 375/38x" > + tristate "xHCI support for Marvell Armada 375/38x/3700" I would name it 37xx to be consistent with 38x > select USB_XHCI_PLATFORM > depends on HAS_IOMEM > depends on ARCH_MVEBU || COMPILE_TEST > ---help--- > Say 'Y' to enable the support for the xHCI host controller > - found in Marvell Armada 375/38x ARM SOCs. > + found in Marvell Armada 375/38x/3700 ARM SOCs. same here > > config USB_XHCI_RCAR > tristate "xHCI support for Renesas R-Car SoCs" > diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c > index 32e158568788..60651a50770f 100644 > --- a/drivers/usb/host/xhci-mvebu.c > +++ b/drivers/usb/host/xhci-mvebu.c > @@ -13,6 +13,7 @@ > #include > > #include "xhci-mvebu.h" > +#include "xhci.h" > > #define USB3_MAX_WINDOWS 4 > #define USB3_WIN_CTRL(w) (0x0 + ((w) * 8)) > @@ -72,3 +73,13 @@ int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd) > > return 0; > } > + > +int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd) > +{ > + struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + > + /* Without reset on resume, the HC won't work at all */ > + xhci->quirks |= XHCI_RESET_ON_RESUME; > + > + return 0; > +} > diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h > index 09791df2cec0..ca0a3a5721dd 100644 > --- a/drivers/usb/host/xhci-mvebu.h > +++ b/drivers/usb/host/xhci-mvebu.h > @@ -12,10 +12,16 @@ struct usb_hcd; > > #if IS_ENABLED(CONFIG_USB_XHCI_MVEBU) > int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd); > +int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd); > #else > static inline int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd) > { > return 0; > } > + > +static inline int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd) > +{ > + return 0; > +} > #endif > #endif /* __LINUX_XHCI_MVEBU_H */ > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index ef09cb06212f..0ac4ec975547 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -98,6 +98,10 @@ static const struct xhci_plat_priv xhci_plat_marvell_armada = { > .init_quirk = xhci_mvebu_mbus_init_quirk, > }; > > +static const struct xhci_plat_priv xhci_plat_marvell_armada3700 = { > + .init_quirk = xhci_mvebu_a3700_init_quirk, > +}; > + > static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = { > .firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1, > .init_quirk = xhci_rcar_init_quirk, > @@ -123,6 +127,9 @@ static const struct of_device_id usb_xhci_of_match[] = { > }, { > .compatible = "marvell,armada-380-xhci", > .data = &xhci_plat_marvell_armada, > + }, { > + .compatible = "marvell,armada3700-xhci", > + .data = &xhci_plat_marvell_armada3700, Reviewed-by: Gregory CLEMENT Thanks, Gregory -- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com