On Fri, Oct 17, 2014 at 04:53:34PM +0800, Huang Rui wrote:
> AMD NL needs to enable P3 OK for U2/SSInactive on USB3PIPE register.
>
> Signed-off-by: Huang Rui <ray.huang@xxxxxxx>
> ---
> drivers/usb/dwc3/core.c | 20 ++++++++++++++++++++
> drivers/usb/dwc3/core.h | 1 +
> drivers/usb/dwc3/dwc3-pci.c | 3 ++-
> drivers/usb/dwc3/platform_data.h | 1 +
> 4 files changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 7322d85..9d0a249 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -365,6 +365,24 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc)
> }
>
> /**
> + * dwc3_phy_setup - Configure USB3 PHY Interface of DWC3 Core
> + * @dwc: Pointer to our controller context structure
> + */
> +static void dwc3_phy_setup(struct dwc3 *dwc)
> +{
> + u32 reg;
> +
> + reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
> +
> + if (dwc->quirks & DWC3_QUIRK_U2SSINP3OK)
if (dwc->p3_ok_on_ss_inactive_quirk)
> + reg |= DWC3_GUSB3PIPECTL_U2SSINP3OK;
> +
> + dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(0), reg);
> +
> + mdelay(100);
> +}
> +
> +/**
> * dwc3_core_init - Low-level initialization of DWC3 Core
> * @dwc: Pointer to our controller context structure
> *
> @@ -484,6 +502,8 @@ static int dwc3_core_init(struct dwc3 *dwc)
>
> dwc3_writel(dwc->regs, DWC3_GCTL, reg);
>
> + dwc3_phy_setup(dwc);
> +
> ret = dwc3_alloc_scratch_buffers(dwc);
> if (ret)
> goto err1;
> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
> index 3d27f10..71cb255 100644
> --- a/drivers/usb/dwc3/core.h
> +++ b/drivers/usb/dwc3/core.h
> @@ -176,6 +176,7 @@
>
> /* Global USB3 PIPE Control Register */
> #define DWC3_GUSB3PIPECTL_PHYSOFTRST (1 << 31)
> +#define DWC3_GUSB3PIPECTL_U2SSINP3OK (1 << 29)
> #define DWC3_GUSB3PIPECTL_SUSPHY (1 << 17)
>
> /* Global TX Fifo Size Register */
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index cdb9b04..1235eb3 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -150,7 +150,8 @@ static int dwc3_pci_probe(struct pci_dev *pci,
> PCI_DEVICE_ID_AMD_NL) {
> dwc3_pdata.has_lpm_erratum = true;
> dwc3_pdata.quirks |= DWC3_QUIRK_AMD_NL
> - | DWC3_QUIRK_U2EXIT_LFPS;
> + | DWC3_QUIRK_U2EXIT_LFPS
> + | DWC3_QUIRK_U2SSINP3OK;
> }
again to be combined in a single patch as the last patch in the series.
--
balbi
Attachment:
signature.asc
Description: Digital signature
