Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753073AbaJQOtS (ORCPT ); Fri, 17 Oct 2014 10:49:18 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:48703 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751946AbaJQOtQ (ORCPT ); Fri, 17 Oct 2014 10:49:16 -0400 Date: Fri, 17 Oct 2014 09:48:59 -0500 From: Felipe Balbi To: Huang Rui CC: Felipe Balbi , Alan Stern , Bjorn Helgaas , Greg Kroah-Hartman , Paul Zimmerman , Heikki Krogerus , Vincent Wan , Tony Li , , , Subject: Re: [PATCH v2 07/16] usb: dwc3: add lpm erratum support Message-ID: <20141017144859.GC26260@saruman> Reply-To: References: <1413536021-4886-1-git-send-email-ray.huang@amd.com> <1413536021-4886-8-git-send-email-ray.huang@amd.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jy6Sn24JjFx/iggw" Content-Disposition: inline In-Reply-To: <1413536021-4886-8-git-send-email-ray.huang@amd.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --jy6Sn24JjFx/iggw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 17, 2014 at 04:53:32PM +0800, Huang Rui wrote: > When parameter DWC_USB3_LPM_ERRATA_ENABLE is enabled in Andvanced Configu= ration > of coreConsultant, it supports of xHCI BESL Errata Dated 10/19/2011 is en= abled > in host mode. In device mode it adds the capability to send NYET response= based > on the BESL value received in the LPM token. >=20 > This patch add an entry that soc platform is able to define the lpm capac= ity > with their own device tree or bus glue layer. >=20 > Suggested-by: Felipe Balbi > Signed-off-by: Huang Rui > --- > drivers/usb/dwc3/core.c | 2 ++ > drivers/usb/dwc3/core.h | 24 +++++++++++++++--------- > drivers/usb/dwc3/dwc3-pci.c | 1 + > drivers/usb/dwc3/gadget.c | 7 +++++++ > drivers/usb/dwc3/platform_data.h | 1 + > 5 files changed, 26 insertions(+), 9 deletions(-) >=20 > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 819e501..25db533 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -708,11 +708,13 @@ static int dwc3_probe(struct platform_device *pdev) > =20 > if (node) { > dwc->maximum_speed =3D of_usb_get_maximum_speed(node); > + dwc->has_lpm_erratum =3D of_property_read_bool(node, "snps,has-lpm-err= atum"); > =20 > dwc->needs_fifo_resize =3D of_property_read_bool(node, "tx-fifo-resize= "); > dwc->dr_mode =3D of_usb_get_dr_mode(node); > } else if (pdata) { > dwc->maximum_speed =3D pdata->maximum_speed; > + dwc->has_lpm_erratum =3D pdata->has_lpm_erratum; > =20 > dwc->needs_fifo_resize =3D pdata->tx_fifo_resize; > dwc->dr_mode =3D pdata->dr_mode; > diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h > index cfe0d57..d58479e 100644 > --- a/drivers/usb/dwc3/core.h > +++ b/drivers/usb/dwc3/core.h > @@ -246,16 +246,19 @@ > #define DWC3_DCTL_TRGTULST_SS_INACT (DWC3_DCTL_TRGTULST(6)) > =20 > /* These apply for core versions 1.94a and later */ > -#define DWC3_DCTL_KEEP_CONNECT (1 << 19) > -#define DWC3_DCTL_L1_HIBER_EN (1 << 18) > -#define DWC3_DCTL_CRS (1 << 17) > -#define DWC3_DCTL_CSS (1 << 16) > +#define DWC3_DCTL_LPM_ERRATA_MASK DWC3_DCTL_LPM_ERRATA(0xf) > +#define DWC3_DCTL_LPM_ERRATA(n) ((n) << 20) > -#define DWC3_DCTL_INITU2ENA (1 << 12) > -#define DWC3_DCTL_ACCEPTU2ENA (1 << 11) > -#define DWC3_DCTL_INITU1ENA (1 << 10) > -#define DWC3_DCTL_ACCEPTU1ENA (1 << 9) > -#define DWC3_DCTL_TSTCTRL_MASK (0xf << 1) > +#define DWC3_DCTL_KEEP_CONNECT (1 << 19) > +#define DWC3_DCTL_L1_HIBER_EN (1 << 18) > +#define DWC3_DCTL_CRS (1 << 17) > +#define DWC3_DCTL_CSS (1 << 16) > + > +#define DWC3_DCTL_INITU2ENA (1 << 12) > +#define DWC3_DCTL_ACCEPTU2ENA (1 << 11) > +#define DWC3_DCTL_INITU1ENA (1 << 10) > +#define DWC3_DCTL_ACCEPTU1ENA (1 << 9) > +#define DWC3_DCTL_TSTCTRL_MASK (0xf << 1) > =20 > #define DWC3_DCTL_ULSTCHNGREQ_MASK (0x0f << 5) > #define DWC3_DCTL_ULSTCHNGREQ(n) (((n) << 5) & DWC3_DCTL_ULSTCHNGREQ_MAS= K) > @@ -665,6 +668,8 @@ struct dwc3_scratchpad_array { > * @ep0_bounced: true when we used bounce buffer > * @ep0_expect_in: true when we expect a DATA IN transfer > * @has_hibernation: true when dwc3 was configured with Hibernation > + * @has_lpm_erratum: true when core was configured with LPM Erratum. Not= e that > + * there's now way for software to detect this in runtime. > * @is_selfpowered: true when we are selfpowered > * @is_fpga: true when we are using the FPGA board > * @needs_fifo_resize: not all users might want fifo resizing, flag it > @@ -771,6 +776,7 @@ struct dwc3 { > unsigned ep0_bounced:1; > unsigned ep0_expect_in:1; > unsigned has_hibernation:1; > + unsigned has_lpm_erratum:1; > unsigned is_selfpowered:1; > unsigned is_fpga:1; > unsigned needs_fifo_resize:1; > diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c > index a89db6c..bbe946c 100644 > --- a/drivers/usb/dwc3/dwc3-pci.c > +++ b/drivers/usb/dwc3/dwc3-pci.c > @@ -148,6 +148,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, > =20 > if (pci->vendor =3D=3D PCI_VENDOR_ID_AMD && pci->device =3D=3D > PCI_DEVICE_ID_AMD_NL) { > + dwc3_pdata.has_lpm_erratum =3D true; > dwc3_pdata.quirks |=3D DWC3_QUIRK_AMD_NL; > } > =20 let's combine all AMD patches as the last patch in the series so we add AMD support with all quirks in one place. > diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c > index 1f2a719..33bfc70 100644 > --- a/drivers/usb/dwc3/gadget.c > +++ b/drivers/usb/dwc3/gadget.c > @@ -1581,6 +1581,13 @@ static int dwc3_gadget_start(struct usb_gadget *g, > } > dwc3_writel(dwc->regs, DWC3_DCFG, reg); > =20 > + if (dwc->has_lpm_erratum) { > + reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); > + /* REVISIT should this be configurable ? */ > + reg |=3D DWC3_DCTL_LPM_ERRATA(0xf); as Paul mentioned, this should definitely be configurable. So we need to discuss how to make that configurable too. --=20 balbi --jy6Sn24JjFx/iggw Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUQSxbAAoJEIaOsuA1yqREgioP/3Q9X6e5+haGSZhi+3zDcrVW 2coHDoKh58TJczSu6F2tBQsQ6dNorHAGwpx1nja68Z/9P0FDnamtU4MN9W5NlM5Z S7IEtaNVRG6BUTd8qn2AGX/1jxsURS2s676uR6zUUPjcGT50voQglst/4+jNwhRC P7io0cRf/G6aYvq3KFIcVkREc8Dm+FUhYB4o80KClL/kjFyY544Tuv5mOPLBsAqd T72HYEHujQs+6AnxEMNaLiwCJlD7dJjP0xRLK2kQpwadsbhirLSth1rW8gI2HxQL Z6HLnaatYuSsvI5Plr9y2My8YZoZkNZUXwT3sQ2NOErZBuejw8WbxlZlOUBDIhwQ znKwjuJ1XkE3oRfi1oB1x0oyuRcTxrpd2eM3PCutq0lffZDVYuPO/8oKPfeY+S7N rThJam9P4AOSMotmBJHDyBXXzdSJtjKx3HIZovTe6M7GmX0BFOwo84bahHT6DFpa a8sKwiJasLPo7px3cNacBwgKPl5TxQE0HxU3RTe5Mh8WHb/I904j/wK792M9OE0E SJAjxkAvDbE3WNigRDSL3pGtHrUqHwl5PTg79A92g3uZvJktLN0SK5nX9+tc+brV dx8ANdBjoGuihbnlPsd8qgbIVKgHZIfPw3pZXIhqKMFw9KZHiTU8u0KxI8i1DUGv 7KA50v/SSLdk8QvG6Y++ =WMer -----END PGP SIGNATURE----- --jy6Sn24JjFx/iggw-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/