From: Huang Rui <ray.huang@amd.com>
To: Felipe Balbi <balbi@ti.com>,
Alan Stern <stern@rowland.harvard.edu>,
"Bjorn Helgaas" <bhelgaas@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Paul Zimmerman <Paul.Zimmerman@synopsys.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Jason Chang <jason.chang@amd.com>,
Vincent Wan <vincent.wan@amd.com>, Tony Li <tony.li@amd.com>,
<linux-usb@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
Huang Rui <ray.huang@amd.com>
Subject: [PATCH v4 04/20] usb: dwc3: add disable scramble quirk
Date: Thu, 30 Oct 2014 18:08:29 +0800 [thread overview]
Message-ID: <1414663725-2195-5-git-send-email-ray.huang@amd.com> (raw)
In-Reply-To: <1414663725-2195-1-git-send-email-ray.huang@amd.com>
This patch adds disable scramble quirk, and it only needs to be enabled at
FPGA board on some vendor platforms.
[Note] In DesignWare databook, HW designer describes:
disscramble = disable scramble
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
Documentation/devicetree/bindings/usb/dwc3.txt | 2 ++
drivers/usb/dwc3/core.c | 11 ++++++++++-
drivers/usb/dwc3/core.h | 3 +++
drivers/usb/dwc3/platform_data.h | 2 ++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index 471366d..8ec2256 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -14,6 +14,8 @@ Optional properties:
- phys: from the *Generic PHY* bindings
- phy-names: from the *Generic PHY* bindings
- tx-fifo-resize: determines if the FIFO *has* to be reallocated.
+ - snps,disable_scramble_quirk: true when SW should disable data scrambling.
+ Only really useful for FPGA builds.
This is usually a subnode to DWC3 glue to which it is connected.
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c8ae098..fae095f 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:
@@ -466,6 +465,11 @@ static int dwc3_core_init(struct dwc3 *dwc)
dwc->is_fpga = true;
}
+ if (dwc->disable_scramble_quirk && dwc->is_fpga)
+ reg |= DWC3_GCTL_DISSCRAMBLE;
+ else
+ reg &= ~DWC3_GCTL_DISSCRAMBLE;
+
/*
* WORKAROUND: DWC3 revisions <1.90a have a bug
* where the device can fail to connect at SuperSpeed
@@ -710,11 +714,16 @@ static int dwc3_probe(struct platform_device *pdev)
dwc->needs_fifo_resize = of_property_read_bool(node, "tx-fifo-resize");
dwc->dr_mode = of_usb_get_dr_mode(node);
+
+ dwc->disable_scramble_quirk = of_property_read_bool(node,
+ "snps,disable_scramble_quirk");
} else if (pdata) {
dwc->maximum_speed = pdata->maximum_speed;
dwc->needs_fifo_resize = pdata->tx_fifo_resize;
dwc->dr_mode = pdata->dr_mode;
+
+ dwc->disable_scramble_quirk = pdata->disable_scramble_quirk;
}
/* default to superspeed if no maximum_speed passed */
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index f6ee623..56bada6 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -672,6 +672,7 @@ struct dwc3_scratchpad_array {
* @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround
* @start_config_issued: true when StartConfig command has been issued
* @three_stage_setup: set if we perform a three phase setup
+ * @disable_scramble_quirk: set if we enable the disable scramble quirk
*/
struct dwc3 {
struct usb_ctrlrequest *ctrl_req;
@@ -776,6 +777,8 @@ struct dwc3 {
unsigned setup_packet_pending:1;
unsigned start_config_issued:1;
unsigned three_stage_setup:1;
+
+ unsigned disable_scramble_quirk:1;
};
/* -------------------------------------------------------------------------- */
diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
index 7db34f0..9209d02 100644
--- a/drivers/usb/dwc3/platform_data.h
+++ b/drivers/usb/dwc3/platform_data.h
@@ -24,4 +24,6 @@ struct dwc3_platform_data {
enum usb_device_speed maximum_speed;
enum usb_dr_mode dr_mode;
bool tx_fifo_resize;
+
+ unsigned disable_scramble_quirk:1;
};
--
1.9.1
next prev parent reply other threads:[~2014-10-30 10:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-30 10:08 [PATCH v4 00/20] usb: dwc3: add support for AMD Nolan SoC Huang Rui
2014-10-30 10:08 ` [PATCH v4 01/20] usb: dwc3: enable hibernation if to be supported Huang Rui
2014-10-30 11:35 ` Arnd Bergmann
2014-10-30 11:36 ` Huang Rui
2014-10-30 14:08 ` Felipe Balbi
2014-10-30 14:14 ` Arnd Bergmann
2014-10-30 14:18 ` Felipe Balbi
2014-10-30 10:08 ` [PATCH v4 02/20] usb: dwc3: add a flag to check if it is FPGA board Huang Rui
2014-10-30 10:08 ` [PATCH v4 03/20] usb: dwc3: initialize platform data at pci glue layer Huang Rui
2014-10-30 10:08 ` Huang Rui [this message]
2014-10-30 10:08 ` [PATCH v4 05/20] usb: dwc3: add lpm erratum support Huang Rui
2014-10-30 10:08 ` [PATCH v4 06/20] usb: dwc3: add U2Exit LFPS quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 07/20] usb: dwc3: add P3 in U2 SS Inactive quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 08/20] usb: dwc3: add request P1/P2/P3 quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 09/20] usb: dwc3: add delay " Huang Rui
2014-10-30 10:08 ` [PATCH v4 10/20] usb: dwc3: add delay phy power change quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 11/20] usb: dwc3: add LFPS filter quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 12/20] usb: dwc3: add rx_detect to polling LFPS quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 13/20] usb: dwc3: set SUSPHY bit for all cores Huang Rui
2014-10-30 10:08 ` [PATCH v4 14/20] usb: dwc3: add Tx de-emphasis quirk Huang Rui
2014-10-30 16:42 ` Felipe Balbi
2014-10-31 1:29 ` Huang Rui
2014-10-31 3:00 ` Felipe Balbi
2014-10-30 10:08 ` [PATCH v4 15/20] usb: dwc3: add disable usb3 suspend phy quirk Huang Rui
2014-10-30 10:08 ` [PATCH v4 16/20] usb: dwc3: add disable usb2 " Huang Rui
2014-10-30 16:39 ` Felipe Balbi
2014-10-31 1:34 ` Huang Rui
2014-10-30 10:08 ` [PATCH v4 17/20] PCI: Add support for AMD Nolan USB3 DRD Huang Rui
2014-10-30 10:08 ` [PATCH v4 18/20] PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD device Huang Rui
2014-10-30 10:08 ` [PATCH v4 19/20] usb: dwc3: add support for AMD Nolan platform Huang Rui
2014-10-30 16:38 ` Felipe Balbi
2014-10-31 1:35 ` Huang Rui
2014-10-30 10:08 ` [PATCH v4 20/20] usb: dwc3: make HIRD threshold configurable Huang Rui
2014-10-30 16:37 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414663725-2195-5-git-send-email-ray.huang@amd.com \
--to=ray.huang@amd.com \
--cc=Paul.Zimmerman@synopsys.com \
--cc=balbi@ti.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jason.chang@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=stern@rowland.harvard.edu \
--cc=tony.li@amd.com \
--cc=vincent.wan@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).