Re: [PATCH v2 06/16] usb: dwc3: add disscramble quirk

Felipe Balbi
2014-10-17T14:45:51Z

[-- Attachment #1: Type: text/plain, Size: 2331 bytes --]

Hi,

On Fri, Oct 17, 2014 at 04:53:31PM +0800, Huang Rui wrote:
> AMD NL fpga needs to enable disscramble quirk. And this quirk doesn't need on
> the true soc.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/usb/dwc3/core.c | 8 +++++++-
> drivers/usb/dwc3/dwc3-pci.c | 5 +++++
> drivers/usb/dwc3/platform_data.h | 4 ++++
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 50c0eae..819e501 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -422,7 +422,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
>
> reg = dwc3_readl(dwc->regs, DWC3_GCTL);
> reg &= ~DWC3_GCTL_SCALEDOWN_MASK;
> - reg &= ~DWC3_GCTL_DISSCRAMBLE;
>
> switch (DWC3_GHWPARAMS1_EN_PWROPT(dwc->hwparams.hwparams1)) {
> case DWC3_GHWPARAMS1_EN_PWROPT_CLK:
> @@ -461,6 +460,13 @@ static int dwc3_core_init(struct dwc3 *dwc)
> dwc->is_fpga = true;
> }
>
> + if ((dwc->quirks & DWC3_QUIRK_AMD_NL) && dwc->is_fpga)
> + dwc->quirks |= DWC3_QUIRK_DISSCRAMBLE;
> +
> + if (dwc->quirks & DWC3_QUIRK_DISSCRAMBLE)

this should only be set if is_fpga, and this quirk should be a 1-bit
flag, so here's what you should do:

WARN_ONCE(dwc->disable_scramble_quirk && !dwc->is_fpga,
"disable_scramble cannot be used on non-FPGA builds\n");

if (dwc->disable_scramble && dwc->is_fpga)
reg |= DWC3_GCTL_DISSCRAMBLE;
else
reg &= ~DWC3_GCTL_DISSCRAMBLE;

> + reg |= DWC3_GCTL_DISSCRAMBLE;
> + else
> + reg &= ~DWC3_GCTL_DISSCRAMBLE;

add a blank line here, to aid readability.

> /*
> * WORKAROUND: DWC3 revisions <1.90a have a bug
> * where the device can fail to connect at SuperSpeed
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index 18569a4..a89db6c 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -146,6 +146,11 @@ static int dwc3_pci_probe(struct pci_dev *pci,
> res[1].name = "dwc_usb3";
> res[1].flags = IORESOURCE_IRQ;
>
> + if (pci->vendor == PCI_VENDOR_ID_AMD && pci->device ==
> + PCI_DEVICE_ID_AMD_NL) {
> + dwc3_pdata.quirks |= DWC3_QUIRK_AMD_NL;
> + }

should be part of another patch and the quirk is
"disable_scramble_quirk", not AMD.

--
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]