* [PATCH v2 1/5] usb: dwc3: add Fujitsu Specific Glue layer
2015-01-19 7:56 [PATCH v2 0/5] Add support for Fujitsu USB host controller Sneeker Yeh
@ 2015-01-19 7:56 ` Sneeker Yeh
2015-01-19 14:48 ` Felipe Balbi
2015-01-19 7:56 ` [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A Sneeker Yeh
` (3 subsequent siblings)
4 siblings, 1 reply; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-19 7:56 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap
Cc: Andy Green, Jassi Brar, Sneeker Yeh
This patch adds support for Synopsis DesignWare USB3 IP Core found
on Fujitsu Socs.
Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
---
.../devicetree/bindings/usb/fujitsu-dwc3.txt | 33 ++++
drivers/usb/dwc3/Kconfig | 11 ++
drivers/usb/dwc3/Makefile | 1 +
drivers/usb/dwc3/dwc3-mb86s70.c | 206 ++++++++++++++++++++
4 files changed, 251 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/fujitsu-dwc3.txt
create mode 100644 drivers/usb/dwc3/dwc3-mb86s70.c
diff --git a/Documentation/devicetree/bindings/usb/fujitsu-dwc3.txt b/Documentation/devicetree/bindings/usb/fujitsu-dwc3.txt
new file mode 100644
index 0000000..be091eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/fujitsu-dwc3.txt
@@ -0,0 +1,33 @@
+FUJITSU GLUE COMPONENTS
+
+MB86S7x DWC3 GLUE
+- compatible: Should be "fujitsu,mb86s70-dwc3"
+- clocks: from common clock binding, handle to usb clock.
+- clock-names: Should contain the following:
+ "core" Master/Core clock needs to run at a minimum of 125 MHz to
+ support a 4 Gbps IN or 4 Gbps OUT
+ transfer at a given time.
+
+Sub-nodes:
+The dwc3 core should be added as subnode to MB86S7x dwc3 glue.
+- dwc3 :
+ The binding details of dwc3 can be found in:
+ Documentation/devicetree/bindings/usb/dwc3.txt
+
+Example device nodes:
+
+ usb3host: mb86s70_usb3host {
+ compatible = "fujitsu,mb86s70-dwc3";
+ clocks = <&clk_alw_1_1>;
+ clock-names = "core";
+ #address-cells = <2>;
+ #size-cells = <1>;
+ ranges;
+
+ dwc3@32200000 {
+ compatible = "synopsys,dwc3";
+ reg = <0 0x32300000 0x100000>;
+ interrupts = <0 412 0x4>,
+ <0 414 0x4>;
+ };
+ };
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 58b5b2c..3390d42 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -61,6 +61,17 @@ config USB_DWC3_EXYNOS
Recent Exynos5 SoCs ship with one DesignWare Core USB3 IP inside,
say 'Y' or 'M' if you have one such device.
+config USB_DWC3_MB86S70
+ tristate "MB86S70 Designware USB3 Platform code"
+ default USB_DWC3
+ help
+ MB86S7X SOC ship with DesignWare Core USB3 IP inside,
+ this implementation also integrated Fujitsu USB PHY inside
+ this Core USB3 IP.
+
+ say 'Y' or 'M' if you have one such device.
+
+
config USB_DWC3_PCI
tristate "PCIe-based Platforms"
depends on PCI
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index bb34fbc..05d1de2 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -38,3 +38,4 @@ obj-$(CONFIG_USB_DWC3_PCI) += dwc3-pci.o
obj-$(CONFIG_USB_DWC3_KEYSTONE) += dwc3-keystone.o
obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o
obj-$(CONFIG_USB_DWC3_ST) += dwc3-st.o
+obj-$(CONFIG_USB_DWC3_MB86S70) += dwc3-mb86s70.o
diff --git a/drivers/usb/dwc3/dwc3-mb86s70.c b/drivers/usb/dwc3/dwc3-mb86s70.c
new file mode 100644
index 0000000..301be76
--- /dev/null
+++ b/drivers/usb/dwc3/dwc3-mb86s70.c
@@ -0,0 +1,206 @@
+/**
+ * dwc3-mb86s70.c - Fujitsu mb86s70 DWC3 Specific Glue layer
+ *
+ * Copyright (c) 2013 - 2014 FUJITSU SEMICONDUCTOR LIMITED
+ * http://jp.fujitsu.com/group/fsl
+ *
+ * Authors: Alice Chan <Alice.Chan@tw.fujitsu.com>
+ * Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
+ * based on dwc3-exynos.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/pm_runtime.h>
+#include <linux/clk.h>
+
+struct dwc3_mb86s70 {
+ struct device *dev;
+ struct clk *clks[5];
+ u8 clk_cnt;
+};
+
+static int dwc3_mb86s70_clk_control(struct device *dev, bool on)
+{
+ struct dwc3_mb86s70 *priv = dev_get_drvdata(dev);
+ int ret, i = priv->clk_cnt;
+
+ if (!on)
+ goto clock_off;
+
+ for (i = 0; i < priv->clk_cnt; i++) {
+ ret = clk_prepare_enable(priv->clks[i]);
+ if (ret) {
+ dev_err(dev, "failed to enable clock[%d]\n", i);
+ on = ret;
+ goto clock_off;
+ }
+ }
+
+ return 0;
+
+clock_off:
+ for (; i > 0;)
+ clk_disable_unprepare(priv->clks[--i]);
+
+ return on;
+}
+
+static int dwc3_mb86s70_remove_child(struct device *dev, void *unused)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+
+ of_device_unregister(pdev);
+
+ return 0;
+}
+
+static int dwc3_mb86s70_probe(struct platform_device *pdev)
+{
+ struct dwc3_mb86s70 *priv;
+ struct device *dev = &pdev->dev;
+ struct device_node *node = dev->of_node;
+ int ret, i;
+ struct clk *clk;
+
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ platform_set_drvdata(pdev, priv);
+ priv->dev = dev;
+
+ dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+
+ for (i = 0; i < ARRAY_SIZE(priv->clks); i++) {
+ clk = of_clk_get(dev->of_node, i);
+ if (IS_ERR(clk))
+ break;
+ priv->clks[i] = clk;
+ }
+ priv->clk_cnt = i;
+ if (!i) {
+ dev_err(dev, "clock not found\n");
+ ret = PTR_ERR(clk);
+ goto err;
+ }
+
+ ret = dwc3_mb86s70_clk_control(dev, true);
+ if (ret)
+ goto err_clk;
+
+ pm_runtime_set_active(dev);
+ pm_runtime_enable(dev);
+ ret = pm_runtime_get(dev);
+ if (ret < 0) {
+ dev_err(dev, "get_sync failed with err %d\n", ret);
+ ret = -ENODEV;
+ goto err_pm;
+ }
+
+ if (node) {
+ ret = of_platform_populate(node, NULL, NULL, dev);
+ if (!ret)
+ return 0;
+ dev_err(dev, "failed to add dwc3 core\n");
+ }
+ dev_err(dev, "no device node, failed to add dwc3 core\n");
+ ret = -ENODEV;
+
+ pm_runtime_put_sync(dev);
+err_pm:
+ pm_runtime_disable(dev);
+err_clk:
+ for (i = 0; i < priv->clk_cnt; i++)
+ clk_put(priv->clks[i]);
+err:
+
+ return ret;
+}
+
+static int dwc3_mb86s70_remove(struct platform_device *pdev)
+{
+ struct dwc3_mb86s70 *priv = dev_get_drvdata(&pdev->dev);
+ int i;
+
+ device_for_each_child(&pdev->dev, NULL, dwc3_mb86s70_remove_child);
+
+ pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+
+ dwc3_mb86s70_clk_control(&pdev->dev, false);
+
+ for (i = 0; i < priv->clk_cnt ; i++)
+ clk_put(priv->clks[i]);
+
+ return 0;
+}
+
+static const struct of_device_id mb86s70_dwc3_match[] = {
+ { .compatible = "fujitsu,mb86s70-dwc3" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, mb86s70_dwc3_match);
+
+#ifdef CONFIG_PM_SLEEP
+static int dwc3_mb86s70_suspend(struct device *dev)
+{
+ dwc3_mb86s70_clk_control(dev, false);
+
+ return 0;
+}
+
+static int dwc3_mb86s70_resume(struct device *dev)
+{
+ int ret;
+
+ ret = dwc3_mb86s70_clk_control(dev, true);
+ if (ret)
+ return ret;
+
+ /* runtime set active to reflect active state. */
+ pm_runtime_disable(dev);
+ pm_runtime_set_active(dev);
+ pm_runtime_enable(dev);
+
+ return 0;
+}
+
+static const struct dev_pm_ops dwc3_mb86s70_dev_pm_ops = {
+ SET_SYSTEM_SLEEP_PM_OPS(dwc3_mb86s70_suspend, dwc3_mb86s70_resume)
+};
+
+#define DEV_PM_OPS (&dwc3_mb86s70_dev_pm_ops)
+#else
+#define DEV_PM_OPS NULL
+#endif /* CONFIG_PM_SLEEP */
+
+static struct platform_driver dwc3_mb86s70_driver = {
+ .probe = dwc3_mb86s70_probe,
+ .remove = dwc3_mb86s70_remove,
+ .driver = {
+ .name = "mb86s70-dwc3",
+ .of_match_table = of_match_ptr(mb86s70_dwc3_match),
+ .pm = DEV_PM_OPS,
+ },
+};
+
+module_platform_driver(dwc3_mb86s70_driver);
+
+MODULE_ALIAS("platform:mb86s70-dwc3");
+MODULE_AUTHOR("Alice Chan <Alice.Chan@tw.fujitsu.com>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("DesignWare USB3 mb86s70 Glue Layer");
--
1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 1/5] usb: dwc3: add Fujitsu Specific Glue layer
2015-01-19 7:56 ` [PATCH v2 1/5] usb: dwc3: add Fujitsu Specific Glue layer Sneeker Yeh
@ 2015-01-19 14:48 ` Felipe Balbi
0 siblings, 0 replies; 16+ messages in thread
From: Felipe Balbi @ 2015-01-19 14:48 UTC (permalink / raw)
To: Sneeker Yeh
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
On Mon, Jan 19, 2015 at 03:56:45PM +0800, Sneeker Yeh wrote:
> This patch adds support for Synopsis DesignWare USB3 IP Core found
> on Fujitsu Socs.
>
> Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
if this is moved after patch 3, you don't need to patch it again to add
the quirk ;-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A
2015-01-19 7:56 [PATCH v2 0/5] Add support for Fujitsu USB host controller Sneeker Yeh
2015-01-19 7:56 ` [PATCH v2 1/5] usb: dwc3: add Fujitsu Specific Glue layer Sneeker Yeh
@ 2015-01-19 7:56 ` Sneeker Yeh
2015-01-19 14:46 ` Felipe Balbi
2015-01-19 7:56 ` [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata Sneeker Yeh
` (2 subsequent siblings)
4 siblings, 1 reply; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-19 7:56 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap
Cc: Andy Green, Jassi Brar, Sneeker Yeh
Add the contstant for v3.00a dwc3 IP detection
Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
---
drivers/usb/dwc3/core.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 4bb9aa6..8090249 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -776,6 +776,7 @@ struct dwc3 {
#define DWC3_REVISION_260A 0x5533260a
#define DWC3_REVISION_270A 0x5533270a
#define DWC3_REVISION_280A 0x5533280a
+#define DWC3_REVISION_300A 0x5533300a
enum dwc3_ep0_next ep0_next_event;
enum dwc3_ep0_state ep0state;
--
1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A
2015-01-19 7:56 ` [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A Sneeker Yeh
@ 2015-01-19 14:46 ` Felipe Balbi
2015-01-19 19:45 ` John Youn
0 siblings, 1 reply; 16+ messages in thread
From: Felipe Balbi @ 2015-01-19 14:46 UTC (permalink / raw)
To: Sneeker Yeh, Paul Zimmerman, John Youn
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
[-- Attachment #1: Type: text/plain, Size: 811 bytes --]
Hi,
On Mon, Jan 19, 2015 at 03:56:46PM +0800, Sneeker Yeh wrote:
> Add the contstant for v3.00a dwc3 IP detection
>
> Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
> ---
> drivers/usb/dwc3/core.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
> index 4bb9aa6..8090249 100644
> --- a/drivers/usb/dwc3/core.h
> +++ b/drivers/usb/dwc3/core.h
> @@ -776,6 +776,7 @@ struct dwc3 {
> #define DWC3_REVISION_260A 0x5533260a
> #define DWC3_REVISION_270A 0x5533270a
> #define DWC3_REVISION_280A 0x5533280a
> +#define DWC3_REVISION_300A 0x5533300a
looking at Synopsys Solvnet for this IP, it shows that current version
is 2.90a. There's no 3.00a. Paul, John, is there a 3.00a version of the
DWC USB3 IP ?
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A
2015-01-19 14:46 ` Felipe Balbi
@ 2015-01-19 19:45 ` John Youn
2015-01-19 20:00 ` Felipe Balbi
0 siblings, 1 reply; 16+ messages in thread
From: John Youn @ 2015-01-19 19:45 UTC (permalink / raw)
To: balbi, Sneeker Yeh, Paul Zimmerman, John Youn
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Greg Kroah-Hartman, Mathias Nyman, Grant Likely, Huang Rui,
Kishon Vijay Abraham I, devicetree, linux-kernel, linux-usb,
linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
> -----Original Message-----
> From: Felipe Balbi [mailto:balbi@ti.com]
> Sent: Monday, January 19, 2015 6:47 AM
>
> looking at Synopsys Solvnet for this IP, it shows that current version
> is 2.90a. There's no 3.00a. Paul, John, is there a 3.00a version of the
> DWC USB3 IP ?
Yes there is, but it has not been released yet, thus it's not in Solvnet.
John
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A
2015-01-19 19:45 ` John Youn
@ 2015-01-19 20:00 ` Felipe Balbi
2015-01-21 8:57 ` Sneeker Yeh
0 siblings, 1 reply; 16+ messages in thread
From: Felipe Balbi @ 2015-01-19 20:00 UTC (permalink / raw)
To: John Youn
Cc: balbi, Sneeker Yeh, Paul Zimmerman, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Greg Kroah-Hartman,
Mathias Nyman, Grant Likely, Huang Rui, Kishon Vijay Abraham I,
devicetree, linux-kernel, linux-usb, linux-omap, Andy Green,
Jassi Brar, Sneeker Yeh
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
On Mon, Jan 19, 2015 at 07:45:31PM +0000, John Youn wrote:
> > -----Original Message-----
> > From: Felipe Balbi [mailto:balbi@ti.com]
> > Sent: Monday, January 19, 2015 6:47 AM
> >
> > looking at Synopsys Solvnet for this IP, it shows that current version
> > is 2.90a. There's no 3.00a. Paul, John, is there a 3.00a version of the
> > DWC USB3 IP ?
>
> Yes there is, but it has not been released yet, thus it's not in Solvnet.
alright, in that case, Sneeker, can you update this patch to add 2.90a
and 3.00a macros ?
Thanks
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A
2015-01-19 20:00 ` Felipe Balbi
@ 2015-01-21 8:57 ` Sneeker Yeh
0 siblings, 0 replies; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-21 8:57 UTC (permalink / raw)
To: Felipe Balbi
Cc: John Youn, Paul Zimmerman, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, Greg Kroah-Hartman, Mathias Nyman,
Grant Likely, Huang Rui, Kishon Vijay Abraham I, devicetree,
linux-kernel, linux-usb, linux-omap, Andy Green, Jassi Brar,
Sneeker Yeh
hi,
2015-01-20 4:00 GMT+08:00 Felipe Balbi <balbi@ti.com>:
> On Mon, Jan 19, 2015 at 07:45:31PM +0000, John Youn wrote:
>> > -----Original Message-----
>> > From: Felipe Balbi [mailto:balbi@ti.com]
>> > Sent: Monday, January 19, 2015 6:47 AM
>> >
>> > looking at Synopsys Solvnet for this IP, it shows that current version
>> > is 2.90a. There's no 3.00a. Paul, John, is there a 3.00a version of the
>> > DWC USB3 IP ?
>>
>> Yes there is, but it has not been released yet, thus it's not in Solvnet.
>
> alright, in that case, Sneeker, can you update this patch to add 2.90a
> and 3.00a macros ?
Sure,
I'll also add 2.90a in next round,
Thanks, and much appreciate,
Sneeker
>
> Thanks
>
> --
> balbi
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata
2015-01-19 7:56 [PATCH v2 0/5] Add support for Fujitsu USB host controller Sneeker Yeh
2015-01-19 7:56 ` [PATCH v2 1/5] usb: dwc3: add Fujitsu Specific Glue layer Sneeker Yeh
2015-01-19 7:56 ` [PATCH v2 2/5] usb: dwc3: add revision number DWC3_REVISION_300A Sneeker Yeh
@ 2015-01-19 7:56 ` Sneeker Yeh
2015-01-19 14:50 ` Felipe Balbi
2015-01-19 7:56 ` [PATCH v2 4/5] xhci: Platform: Set Synopsis device disconnection quirk based on platform data Sneeker Yeh
2015-01-19 7:56 ` [PATCH v2 5/5] xhci: add a quirk for device disconnection errata for Synopsis Designware USB3 core Sneeker Yeh
4 siblings, 1 reply; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-19 7:56 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap
Cc: Andy Green, Jassi Brar, Sneeker Yeh
Synopsis Designware USB3 IP earlier than v3.00a which is configured in silicon
with DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, would need a specific quirk to prevent
xhci host controller from dying when device is disconnected.
Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP configuration whose state
cannot be checked from software in runtime, it has to be enabled via platform
data or device tree.
Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
---
Documentation/devicetree/bindings/usb/dwc3.txt | 17 +++++++++++++++++
drivers/usb/dwc3/core.c | 6 ++++++
drivers/usb/dwc3/core.h | 1 +
drivers/usb/dwc3/host.c | 4 ++++
drivers/usb/dwc3/platform_data.h | 1 +
5 files changed, 29 insertions(+)
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
index cd7f045..1b78b29 100644
--- a/Documentation/devicetree/bindings/usb/dwc3.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3.txt
@@ -37,6 +37,23 @@ Optional properties:
- snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
utmi_l1_suspend_n, false when asserts utmi_sleep_n
- snps,hird-threshold: HIRD threshold
+ - snps,has_suspend_on_disconnect: true when IP is configured in silicon with
+ DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, it can inject a
+ specific quirk to prevent xhci host controller from
+ dying when usb device is disconnected from root hub.
+ Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP
+ configuration whose state cannot be checked from
+ software in runtime, it has to be enabled via platform
+ data or device tree.
+
+ xhci host dying symptom here is caused by that
+ DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1
+ configuration makes IP auto-suspended after PORTCSC is
+ cleared when usb device detached, then an asynchronous
+ disconnection procedure might fail using endpoint
+ command that suspened IP won't have any response to.
+
+ this issue is fixed when IP version >= 3.00a.
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 25ddc39..fbceab1 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -838,6 +838,9 @@ static int dwc3_probe(struct platform_device *pdev)
"snps,tx_de_emphasis_quirk");
of_property_read_u8(node, "snps,tx_de_emphasis",
&tx_de_emphasis);
+
+ dwc->suspend_on_disconnect_quirk = of_property_read_bool(node,
+ "snps,has_suspend_on_disconnect");
} else if (pdata) {
dwc->maximum_speed = pdata->maximum_speed;
dwc->has_lpm_erratum = pdata->has_lpm_erratum;
@@ -864,6 +867,9 @@ static int dwc3_probe(struct platform_device *pdev)
dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;
if (pdata->tx_de_emphasis)
tx_de_emphasis = pdata->tx_de_emphasis;
+
+ dwc->suspend_on_disconnect_quirk =
+ pdata->has_suspend_on_disconnect;
}
/* default to superspeed if no maximum_speed passed */
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 8090249..d7458ff 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -832,6 +832,7 @@ struct dwc3 {
unsigned tx_de_emphasis_quirk:1;
unsigned tx_de_emphasis:2;
+ unsigned suspend_on_disconnect_quirk:1;
};
/* -------------------------------------------------------------------------- */
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index 12bfd3c..9c42074 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -53,6 +53,10 @@ int dwc3_host_init(struct dwc3 *dwc)
pdata.usb3_lpm_capable = 1;
#endif
+ if ((dwc->revision < DWC3_REVISION_300A) &&
+ dwc->suspend_on_disconnect_quirk)
+ pdata.delay_portcsc_clear = 1;
+
ret = platform_device_add_data(xhci, &pdata, sizeof(pdata));
if (ret) {
dev_err(dwc->dev, "couldn't add platform data to xHCI device\n");
diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
index a3a3b6d..69562f1 100644
--- a/drivers/usb/dwc3/platform_data.h
+++ b/drivers/usb/dwc3/platform_data.h
@@ -44,4 +44,5 @@ struct dwc3_platform_data {
unsigned tx_de_emphasis_quirk:1;
unsigned tx_de_emphasis:2;
+ unsigned has_suspend_on_disconnect:1;
};
--
1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata
2015-01-19 7:56 ` [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata Sneeker Yeh
@ 2015-01-19 14:50 ` Felipe Balbi
2015-01-21 9:02 ` Sneeker Yeh
0 siblings, 1 reply; 16+ messages in thread
From: Felipe Balbi @ 2015-01-19 14:50 UTC (permalink / raw)
To: Sneeker Yeh
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
[-- Attachment #1: Type: text/plain, Size: 4743 bytes --]
Hi,
On Mon, Jan 19, 2015 at 03:56:47PM +0800, Sneeker Yeh wrote:
> Synopsis Designware USB3 IP earlier than v3.00a which is configured in silicon
> with DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, would need a specific quirk to prevent
> xhci host controller from dying when device is disconnected.
>
> Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP configuration whose state
> cannot be checked from software in runtime, it has to be enabled via platform
> data or device tree.
>
> Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
> ---
> Documentation/devicetree/bindings/usb/dwc3.txt | 17 +++++++++++++++++
> drivers/usb/dwc3/core.c | 6 ++++++
> drivers/usb/dwc3/core.h | 1 +
> drivers/usb/dwc3/host.c | 4 ++++
> drivers/usb/dwc3/platform_data.h | 1 +
> 5 files changed, 29 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
> index cd7f045..1b78b29 100644
> --- a/Documentation/devicetree/bindings/usb/dwc3.txt
> +++ b/Documentation/devicetree/bindings/usb/dwc3.txt
> @@ -37,6 +37,23 @@ Optional properties:
> - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
> utmi_l1_suspend_n, false when asserts utmi_sleep_n
> - snps,hird-threshold: HIRD threshold
> + - snps,has_suspend_on_disconnect: true when IP is configured in silicon with
> + DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, it can inject a
> + specific quirk to prevent xhci host controller from
> + dying when usb device is disconnected from root hub.
> + Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP
> + configuration whose state cannot be checked from
> + software in runtime, it has to be enabled via platform
> + data or device tree.
> +
> + xhci host dying symptom here is caused by that
> + DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1
> + configuration makes IP auto-suspended after PORTCSC is
> + cleared when usb device detached, then an asynchronous
> + disconnection procedure might fail using endpoint
> + command that suspened IP won't have any response to.
> +
> + this issue is fixed when IP version >= 3.00a.
>
> 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 25ddc39..fbceab1 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -838,6 +838,9 @@ static int dwc3_probe(struct platform_device *pdev)
> "snps,tx_de_emphasis_quirk");
> of_property_read_u8(node, "snps,tx_de_emphasis",
> &tx_de_emphasis);
> +
> + dwc->suspend_on_disconnect_quirk = of_property_read_bool(node,
> + "snps,has_suspend_on_disconnect");
> } else if (pdata) {
> dwc->maximum_speed = pdata->maximum_speed;
> dwc->has_lpm_erratum = pdata->has_lpm_erratum;
> @@ -864,6 +867,9 @@ static int dwc3_probe(struct platform_device *pdev)
> dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;
> if (pdata->tx_de_emphasis)
> tx_de_emphasis = pdata->tx_de_emphasis;
> +
> + dwc->suspend_on_disconnect_quirk =
> + pdata->has_suspend_on_disconnect;
> }
>
> /* default to superspeed if no maximum_speed passed */
> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
> index 8090249..d7458ff 100644
> --- a/drivers/usb/dwc3/core.h
> +++ b/drivers/usb/dwc3/core.h
> @@ -832,6 +832,7 @@ struct dwc3 {
>
> unsigned tx_de_emphasis_quirk:1;
> unsigned tx_de_emphasis:2;
> + unsigned suspend_on_disconnect_quirk:1;
you're missing the comment on the structure and these should be
alphabetically sorted.
> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
> index 12bfd3c..9c42074 100644
> --- a/drivers/usb/dwc3/host.c
> +++ b/drivers/usb/dwc3/host.c
> @@ -53,6 +53,10 @@ int dwc3_host_init(struct dwc3 *dwc)
> pdata.usb3_lpm_capable = 1;
> #endif
>
> + if ((dwc->revision < DWC3_REVISION_300A) &&
> + dwc->suspend_on_disconnect_quirk)
> + pdata.delay_portcsc_clear = 1;
> +
> ret = platform_device_add_data(xhci, &pdata, sizeof(pdata));
> if (ret) {
> dev_err(dwc->dev, "couldn't add platform data to xHCI device\n");
> diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
> index a3a3b6d..69562f1 100644
> --- a/drivers/usb/dwc3/platform_data.h
> +++ b/drivers/usb/dwc3/platform_data.h
> @@ -44,4 +44,5 @@ struct dwc3_platform_data {
>
> unsigned tx_de_emphasis_quirk:1;
> unsigned tx_de_emphasis:2;
> + unsigned has_suspend_on_disconnect:1;
needs a comment at the top of this structure and should sorted.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata
2015-01-19 14:50 ` Felipe Balbi
@ 2015-01-21 9:02 ` Sneeker Yeh
2015-01-23 16:20 ` Felipe Balbi
0 siblings, 1 reply; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-21 9:02 UTC (permalink / raw)
To: Felipe Balbi
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Greg Kroah-Hartman, Mathias Nyman, Grant Likely, Huang Rui,
Kishon Vijay Abraham I, devicetree, linux-kernel, linux-usb,
linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
Hi Felipe:
Thanks for reviewing these,
2015-01-19 22:50 GMT+08:00 Felipe Balbi <balbi@ti.com>:
> Hi,
>
> On Mon, Jan 19, 2015 at 03:56:47PM +0800, Sneeker Yeh wrote:
>> Synopsis Designware USB3 IP earlier than v3.00a which is configured in silicon
>> with DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, would need a specific quirk to prevent
>> xhci host controller from dying when device is disconnected.
>>
>> Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP configuration whose state
>> cannot be checked from software in runtime, it has to be enabled via platform
>> data or device tree.
>>
>> Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
>> ---
>> Documentation/devicetree/bindings/usb/dwc3.txt | 17 +++++++++++++++++
>> drivers/usb/dwc3/core.c | 6 ++++++
>> drivers/usb/dwc3/core.h | 1 +
>> drivers/usb/dwc3/host.c | 4 ++++
>> drivers/usb/dwc3/platform_data.h | 1 +
>> 5 files changed, 29 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
>> index cd7f045..1b78b29 100644
>> --- a/Documentation/devicetree/bindings/usb/dwc3.txt
>> +++ b/Documentation/devicetree/bindings/usb/dwc3.txt
>> @@ -37,6 +37,23 @@ Optional properties:
>> - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
>> utmi_l1_suspend_n, false when asserts utmi_sleep_n
>> - snps,hird-threshold: HIRD threshold
>> + - snps,has_suspend_on_disconnect: true when IP is configured in silicon with
>> + DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, it can inject a
>> + specific quirk to prevent xhci host controller from
>> + dying when usb device is disconnected from root hub.
>> + Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP
>> + configuration whose state cannot be checked from
>> + software in runtime, it has to be enabled via platform
>> + data or device tree.
>> +
>> + xhci host dying symptom here is caused by that
>> + DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1
>> + configuration makes IP auto-suspended after PORTCSC is
>> + cleared when usb device detached, then an asynchronous
>> + disconnection procedure might fail using endpoint
>> + command that suspened IP won't have any response to.
>> +
>> + this issue is fixed when IP version >= 3.00a.
>>
>> 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 25ddc39..fbceab1 100644
>> --- a/drivers/usb/dwc3/core.c
>> +++ b/drivers/usb/dwc3/core.c
>> @@ -838,6 +838,9 @@ static int dwc3_probe(struct platform_device *pdev)
>> "snps,tx_de_emphasis_quirk");
>> of_property_read_u8(node, "snps,tx_de_emphasis",
>> &tx_de_emphasis);
>> +
>> + dwc->suspend_on_disconnect_quirk = of_property_read_bool(node,
>> + "snps,has_suspend_on_disconnect");
>> } else if (pdata) {
>> dwc->maximum_speed = pdata->maximum_speed;
>> dwc->has_lpm_erratum = pdata->has_lpm_erratum;
>> @@ -864,6 +867,9 @@ static int dwc3_probe(struct platform_device *pdev)
>> dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;
>> if (pdata->tx_de_emphasis)
>> tx_de_emphasis = pdata->tx_de_emphasis;
>> +
>> + dwc->suspend_on_disconnect_quirk =
>> + pdata->has_suspend_on_disconnect;
>> }
>>
>> /* default to superspeed if no maximum_speed passed */
>> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
>> index 8090249..d7458ff 100644
>> --- a/drivers/usb/dwc3/core.h
>> +++ b/drivers/usb/dwc3/core.h
>> @@ -832,6 +832,7 @@ struct dwc3 {
>>
>> unsigned tx_de_emphasis_quirk:1;
>> unsigned tx_de_emphasis:2;
>> + unsigned suspend_on_disconnect_quirk:1;
>
> you're missing the comment on the structure and these should be
> alphabetically sorted.
okay, I see, I'll change it like this:
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -692,6 +692,9 @@ struct dwc3_scratchpad_array {
* @resize_fifos: tells us it's ok to reconfigure our TxFIFO sizes.
* @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround
* @start_config_issued: true when StartConfig command has been issued
+ * @suspend_on_disconnect_quirk: set if core was configured with
+ * DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1. Note that there's
+ * now way for software to detect this in runtime.
* @three_stage_setup: set if we perform a three phase setup
* @disable_scramble_quirk: set if we enable the disable scramble quirk
* @u2exit_lfps_quirk: set if we enable u2exit lfps quirk
@@ -818,6 +821,7 @@ struct dwc3 {
unsigned resize_fifos:1;
unsigned setup_packet_pending:1;
unsigned start_config_issued:1;
+ unsigned suspend_on_disconnect_quirk:1;
unsigned three_stage_setup:1;
unsigned disable_scramble_quirk:1;
>
>> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
>> index 12bfd3c..9c42074 100644
>> --- a/drivers/usb/dwc3/host.c
>> +++ b/drivers/usb/dwc3/host.c
>> @@ -53,6 +53,10 @@ int dwc3_host_init(struct dwc3 *dwc)
>> pdata.usb3_lpm_capable = 1;
>> #endif
>>
>> + if ((dwc->revision < DWC3_REVISION_300A) &&
>> + dwc->suspend_on_disconnect_quirk)
>> + pdata.delay_portcsc_clear = 1;
>> +
>> ret = platform_device_add_data(xhci, &pdata, sizeof(pdata));
>> if (ret) {
>> dev_err(dwc->dev, "couldn't add platform data to xHCI device\n");
>> diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
>> index a3a3b6d..69562f1 100644
>> --- a/drivers/usb/dwc3/platform_data.h
>> +++ b/drivers/usb/dwc3/platform_data.h
>> @@ -44,4 +44,5 @@ struct dwc3_platform_data {
>>
>> unsigned tx_de_emphasis_quirk:1;
>> unsigned tx_de_emphasis:2;
>> + unsigned has_suspend_on_disconnect:1;
>
> needs a comment at the top of this structure and should sorted.
okay, I'll do it like this:
--- a/drivers/usb/dwc3/platform_data.h
+++ b/drivers/usb/dwc3/platform_data.h
@@ -20,6 +20,13 @@
#include <linux/usb/ch9.h>
#include <linux/usb/otg.h>
+/**
+ * struct dwc3_platform_data - platform data of dwc3 controller
+ * @has_suspend_on_disconnect: true if core was configured with
+ * DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1. Note that there's
+ * now way for software to detect this in runtime.
+ */
+
struct dwc3_platform_data {
enum usb_device_speed maximum_speed;
enum usb_dr_mode dr_mode;
@@ -32,6 +39,7 @@ struct dwc3_platform_data {
unsigned disable_scramble_quirk:1;
unsigned has_lpm_erratum:1;
+ unsigned has_suspend_on_disconnect:1;
unsigned u2exit_lfps_quirk:1;
unsigned u2ss_inp3_quirk:1;
unsigned req_p1p2p3_quirk:1;
Much appreciate,
Sneeker
>
> --
> balbi
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata
2015-01-21 9:02 ` Sneeker Yeh
@ 2015-01-23 16:20 ` Felipe Balbi
0 siblings, 0 replies; 16+ messages in thread
From: Felipe Balbi @ 2015-01-23 16:20 UTC (permalink / raw)
To: Sneeker Yeh
Cc: Felipe Balbi, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, Greg Kroah-Hartman, Mathias Nyman,
Grant Likely, Huang Rui, Kishon Vijay Abraham I, devicetree,
linux-kernel, linux-usb, linux-omap, Andy Green, Jassi Brar,
Sneeker Yeh
[-- Attachment #1: Type: text/plain, Size: 8025 bytes --]
Hi,
On Wed, Jan 21, 2015 at 05:02:57PM +0800, Sneeker Yeh wrote:
> Hi Felipe:
>
> Thanks for reviewing these,
>
> 2015-01-19 22:50 GMT+08:00 Felipe Balbi <balbi@ti.com>:
> > Hi,
> >
> > On Mon, Jan 19, 2015 at 03:56:47PM +0800, Sneeker Yeh wrote:
> >> Synopsis Designware USB3 IP earlier than v3.00a which is configured in silicon
> >> with DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, would need a specific quirk to prevent
> >> xhci host controller from dying when device is disconnected.
> >>
> >> Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP configuration whose state
> >> cannot be checked from software in runtime, it has to be enabled via platform
> >> data or device tree.
> >>
> >> Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
> >> ---
> >> Documentation/devicetree/bindings/usb/dwc3.txt | 17 +++++++++++++++++
> >> drivers/usb/dwc3/core.c | 6 ++++++
> >> drivers/usb/dwc3/core.h | 1 +
> >> drivers/usb/dwc3/host.c | 4 ++++
> >> drivers/usb/dwc3/platform_data.h | 1 +
> >> 5 files changed, 29 insertions(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt
> >> index cd7f045..1b78b29 100644
> >> --- a/Documentation/devicetree/bindings/usb/dwc3.txt
> >> +++ b/Documentation/devicetree/bindings/usb/dwc3.txt
> >> @@ -37,6 +37,23 @@ Optional properties:
> >> - snps,is-utmi-l1-suspend: true when DWC3 asserts output signal
> >> utmi_l1_suspend_n, false when asserts utmi_sleep_n
> >> - snps,hird-threshold: HIRD threshold
> >> + - snps,has_suspend_on_disconnect: true when IP is configured in silicon with
> >> + DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1, it can inject a
> >> + specific quirk to prevent xhci host controller from
> >> + dying when usb device is disconnected from root hub.
> >> + Since DWC_USB3_SUSPEND_ON_DISCONNECT_EN is an IP
> >> + configuration whose state cannot be checked from
> >> + software in runtime, it has to be enabled via platform
> >> + data or device tree.
> >> +
> >> + xhci host dying symptom here is caused by that
> >> + DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1
> >> + configuration makes IP auto-suspended after PORTCSC is
> >> + cleared when usb device detached, then an asynchronous
> >> + disconnection procedure might fail using endpoint
> >> + command that suspened IP won't have any response to.
> >> +
> >> + this issue is fixed when IP version >= 3.00a.
> >>
> >> 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 25ddc39..fbceab1 100644
> >> --- a/drivers/usb/dwc3/core.c
> >> +++ b/drivers/usb/dwc3/core.c
> >> @@ -838,6 +838,9 @@ static int dwc3_probe(struct platform_device *pdev)
> >> "snps,tx_de_emphasis_quirk");
> >> of_property_read_u8(node, "snps,tx_de_emphasis",
> >> &tx_de_emphasis);
> >> +
> >> + dwc->suspend_on_disconnect_quirk = of_property_read_bool(node,
> >> + "snps,has_suspend_on_disconnect");
> >> } else if (pdata) {
> >> dwc->maximum_speed = pdata->maximum_speed;
> >> dwc->has_lpm_erratum = pdata->has_lpm_erratum;
> >> @@ -864,6 +867,9 @@ static int dwc3_probe(struct platform_device *pdev)
> >> dwc->tx_de_emphasis_quirk = pdata->tx_de_emphasis_quirk;
> >> if (pdata->tx_de_emphasis)
> >> tx_de_emphasis = pdata->tx_de_emphasis;
> >> +
> >> + dwc->suspend_on_disconnect_quirk =
> >> + pdata->has_suspend_on_disconnect;
> >> }
> >>
> >> /* default to superspeed if no maximum_speed passed */
> >> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
> >> index 8090249..d7458ff 100644
> >> --- a/drivers/usb/dwc3/core.h
> >> +++ b/drivers/usb/dwc3/core.h
> >> @@ -832,6 +832,7 @@ struct dwc3 {
> >>
> >> unsigned tx_de_emphasis_quirk:1;
> >> unsigned tx_de_emphasis:2;
> >> + unsigned suspend_on_disconnect_quirk:1;
> >
> > you're missing the comment on the structure and these should be
> > alphabetically sorted.
>
> okay, I see, I'll change it like this:
>
> --- a/drivers/usb/dwc3/core.h
> +++ b/drivers/usb/dwc3/core.h
> @@ -692,6 +692,9 @@ struct dwc3_scratchpad_array {
> * @resize_fifos: tells us it's ok to reconfigure our TxFIFO sizes.
> * @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround
> * @start_config_issued: true when StartConfig command has been issued
> + * @suspend_on_disconnect_quirk: set if core was configured with
> + * DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1. Note that there's
> + * now way for software to detect this in runtime.
> * @three_stage_setup: set if we perform a three phase setup
> * @disable_scramble_quirk: set if we enable the disable scramble quirk
> * @u2exit_lfps_quirk: set if we enable u2exit lfps quirk
> @@ -818,6 +821,7 @@ struct dwc3 {
> unsigned resize_fifos:1;
> unsigned setup_packet_pending:1;
> unsigned start_config_issued:1;
> + unsigned suspend_on_disconnect_quirk:1;
> unsigned three_stage_setup:1;
>
> unsigned disable_scramble_quirk:1;
>
>
> >
> >> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
> >> index 12bfd3c..9c42074 100644
> >> --- a/drivers/usb/dwc3/host.c
> >> +++ b/drivers/usb/dwc3/host.c
> >> @@ -53,6 +53,10 @@ int dwc3_host_init(struct dwc3 *dwc)
> >> pdata.usb3_lpm_capable = 1;
> >> #endif
> >>
> >> + if ((dwc->revision < DWC3_REVISION_300A) &&
> >> + dwc->suspend_on_disconnect_quirk)
> >> + pdata.delay_portcsc_clear = 1;
> >> +
> >> ret = platform_device_add_data(xhci, &pdata, sizeof(pdata));
> >> if (ret) {
> >> dev_err(dwc->dev, "couldn't add platform data to xHCI device\n");
> >> diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h
> >> index a3a3b6d..69562f1 100644
> >> --- a/drivers/usb/dwc3/platform_data.h
> >> +++ b/drivers/usb/dwc3/platform_data.h
> >> @@ -44,4 +44,5 @@ struct dwc3_platform_data {
> >>
> >> unsigned tx_de_emphasis_quirk:1;
> >> unsigned tx_de_emphasis:2;
> >> + unsigned has_suspend_on_disconnect:1;
> >
> > needs a comment at the top of this structure and should sorted.
>
> okay, I'll do it like this:
>
> --- a/drivers/usb/dwc3/platform_data.h
> +++ b/drivers/usb/dwc3/platform_data.h
> @@ -20,6 +20,13 @@
> #include <linux/usb/ch9.h>
> #include <linux/usb/otg.h>
>
> +/**
> + * struct dwc3_platform_data - platform data of dwc3 controller
> + * @has_suspend_on_disconnect: true if core was configured with
> + * DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1. Note that there's
> + * now way for software to detect this in runtime.
> + */
> +
> struct dwc3_platform_data {
> enum usb_device_speed maximum_speed;
> enum usb_dr_mode dr_mode;
> @@ -32,6 +39,7 @@ struct dwc3_platform_data {
>
> unsigned disable_scramble_quirk:1;
> unsigned has_lpm_erratum:1;
> + unsigned has_suspend_on_disconnect:1;
> unsigned u2exit_lfps_quirk:1;
> unsigned u2ss_inp3_quirk:1;
> unsigned req_p1p2p3_quirk:1;
looks good, thanks
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2 4/5] xhci: Platform: Set Synopsis device disconnection quirk based on platform data
2015-01-19 7:56 [PATCH v2 0/5] Add support for Fujitsu USB host controller Sneeker Yeh
` (2 preceding siblings ...)
2015-01-19 7:56 ` [PATCH v2 3/5] usb: dwc3: Add quirk for Synopsis device disconnection errata Sneeker Yeh
@ 2015-01-19 7:56 ` Sneeker Yeh
2015-01-19 14:51 ` Felipe Balbi
2015-01-19 7:56 ` [PATCH v2 5/5] xhci: add a quirk for device disconnection errata for Synopsis Designware USB3 core Sneeker Yeh
4 siblings, 1 reply; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-19 7:56 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap
Cc: Andy Green, Jassi Brar, Sneeker Yeh
If an xhci platform has Synopsis device disconnection errata then enable
XHCI_DISCONNECT_QUIRK quirk flag.
Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
---
drivers/usb/host/xhci-plat.c | 3 +++
include/linux/usb/xhci_pdriver.h | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 08d402b..40beb95 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -147,6 +147,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
if ((node && of_property_read_bool(node, "usb3-lpm-capable")) ||
(pdata && pdata->usb3_lpm_capable))
xhci->quirks |= XHCI_LPM_SUPPORT;
+
+ if (pdata && pdata->delay_portcsc_clear)
+ xhci->quirks |= XHCI_DISCONNECT_QUIRK;
/*
* Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset)
* is called by usb_add_hcd().
diff --git a/include/linux/usb/xhci_pdriver.h b/include/linux/usb/xhci_pdriver.h
index 376654b..a37a3a5 100644
--- a/include/linux/usb/xhci_pdriver.h
+++ b/include/linux/usb/xhci_pdriver.h
@@ -18,10 +18,14 @@
*
* @usb3_lpm_capable: determines if this xhci platform supports USB3
* LPM capability
+ * @delay_portcsc_clear: determines if Synopsis USB3 core has errata in
+ * "DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1" hardware
+ * configuration.
*
*/
struct usb_xhci_pdata {
unsigned usb3_lpm_capable:1;
+ unsigned delay_portcsc_clear:1;
};
#endif /* __USB_CORE_XHCI_PDRIVER_H */
--
1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 4/5] xhci: Platform: Set Synopsis device disconnection quirk based on platform data
2015-01-19 7:56 ` [PATCH v2 4/5] xhci: Platform: Set Synopsis device disconnection quirk based on platform data Sneeker Yeh
@ 2015-01-19 14:51 ` Felipe Balbi
2015-01-21 8:55 ` Sneeker Yeh
0 siblings, 1 reply; 16+ messages in thread
From: Felipe Balbi @ 2015-01-19 14:51 UTC (permalink / raw)
To: Sneeker Yeh
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
[-- Attachment #1: Type: text/plain, Size: 1830 bytes --]
On Mon, Jan 19, 2015 at 03:56:48PM +0800, Sneeker Yeh wrote:
> If an xhci platform has Synopsis device disconnection errata then enable
> XHCI_DISCONNECT_QUIRK quirk flag.
>
> Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
> ---
> drivers/usb/host/xhci-plat.c | 3 +++
> include/linux/usb/xhci_pdriver.h | 4 ++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 08d402b..40beb95 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -147,6 +147,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
> if ((node && of_property_read_bool(node, "usb3-lpm-capable")) ||
> (pdata && pdata->usb3_lpm_capable))
> xhci->quirks |= XHCI_LPM_SUPPORT;
> +
> + if (pdata && pdata->delay_portcsc_clear)
> + xhci->quirks |= XHCI_DISCONNECT_QUIRK;
> /*
> * Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset)
> * is called by usb_add_hcd().
> diff --git a/include/linux/usb/xhci_pdriver.h b/include/linux/usb/xhci_pdriver.h
> index 376654b..a37a3a5 100644
> --- a/include/linux/usb/xhci_pdriver.h
> +++ b/include/linux/usb/xhci_pdriver.h
> @@ -18,10 +18,14 @@
> *
> * @usb3_lpm_capable: determines if this xhci platform supports USB3
> * LPM capability
> + * @delay_portcsc_clear: determines if Synopsis USB3 core has errata in
> + * "DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1" hardware
> + * configuration.
> *
> */
> struct usb_xhci_pdata {
> unsigned usb3_lpm_capable:1;
> + unsigned delay_portcsc_clear:1;
previous patch won't build before this is applied. That's a problem.
Please shuffle things around so that each and every patch builds and
works on its own.
We cannot break bisectability ;-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v2 4/5] xhci: Platform: Set Synopsis device disconnection quirk based on platform data
2015-01-19 14:51 ` Felipe Balbi
@ 2015-01-21 8:55 ` Sneeker Yeh
0 siblings, 0 replies; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-21 8:55 UTC (permalink / raw)
To: Felipe Balbi
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Greg Kroah-Hartman, Mathias Nyman, Grant Likely, Huang Rui,
Kishon Vijay Abraham I, devicetree, linux-kernel, linux-usb,
linux-omap, Andy Green, Jassi Brar, Sneeker Yeh
hi,
2015-01-19 22:51 GMT+08:00 Felipe Balbi <balbi@ti.com>:
>
> On Mon, Jan 19, 2015 at 03:56:48PM +0800, Sneeker Yeh wrote:
> > If an xhci platform has Synopsis device disconnection errata then enable
> > XHCI_DISCONNECT_QUIRK quirk flag.
> >
> > Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
> > ---
> > drivers/usb/host/xhci-plat.c | 3 +++
> > include/linux/usb/xhci_pdriver.h | 4 ++++
> > 2 files changed, 7 insertions(+)
> >
> > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > index 08d402b..40beb95 100644
> > --- a/drivers/usb/host/xhci-plat.c
> > +++ b/drivers/usb/host/xhci-plat.c
> > @@ -147,6 +147,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
> > if ((node && of_property_read_bool(node, "usb3-lpm-capable")) ||
> > (pdata && pdata->usb3_lpm_capable))
> > xhci->quirks |= XHCI_LPM_SUPPORT;
> > +
> > + if (pdata && pdata->delay_portcsc_clear)
> > + xhci->quirks |= XHCI_DISCONNECT_QUIRK;
> > /*
> > * Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset)
> > * is called by usb_add_hcd().
> > diff --git a/include/linux/usb/xhci_pdriver.h b/include/linux/usb/xhci_pdriver.h
> > index 376654b..a37a3a5 100644
> > --- a/include/linux/usb/xhci_pdriver.h
> > +++ b/include/linux/usb/xhci_pdriver.h
> > @@ -18,10 +18,14 @@
> > *
> > * @usb3_lpm_capable: determines if this xhci platform supports USB3
> > * LPM capability
> > + * @delay_portcsc_clear: determines if Synopsis USB3 core has errata in
> > + * "DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1" hardware
> > + * configuration.
> > *
> > */
> > struct usb_xhci_pdata {
> > unsigned usb3_lpm_capable:1;
> > + unsigned delay_portcsc_clear:1;
>
> previous patch won't build before this is applied. That's a problem.
> Please shuffle things around so that each and every patch builds and
> works on its own.
>
> We cannot break bisectability ;-)
Ah...sorry I seem to make a mess here,
i'll re-arrange all patches next round.
Much appreciate,
Sneeker
>
> --
> balbi
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v2 5/5] xhci: add a quirk for device disconnection errata for Synopsis Designware USB3 core
2015-01-19 7:56 [PATCH v2 0/5] Add support for Fujitsu USB host controller Sneeker Yeh
` (3 preceding siblings ...)
2015-01-19 7:56 ` [PATCH v2 4/5] xhci: Platform: Set Synopsis device disconnection quirk based on platform data Sneeker Yeh
@ 2015-01-19 7:56 ` Sneeker Yeh
4 siblings, 0 replies; 16+ messages in thread
From: Sneeker Yeh @ 2015-01-19 7:56 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Felipe Balbi, Greg Kroah-Hartman, Mathias Nyman, Grant Likely,
Huang Rui, Kishon Vijay Abraham I, devicetree, linux-kernel,
linux-usb, linux-omap
Cc: Andy Green, Jassi Brar, Sneeker Yeh
This issue is defined by a three-way race at disconnect, between
1) Class driver interrupt endpoint resheduling attempts if the ISR gave an ep
error event due to device detach (it would try 3 times)
2) Disconnect interrupt on PORTSC_CSC, which is cleared by hub thread
asynchronously
3) The hardware IP was configured in silicon with
- DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1
- Synopsys IP version is < 3.00a
The IP will auto-suspend itself on device detach with some phy-specific interval
after CSC is cleared by 2)
If 2) and 3) complete before 1), the interrupts it expects will not be generated
by the autosuspended IP, leading to a deadlock. Even later disconnection
procedure would detect that corresponding urb is still in-progress and issue a
ep stop command, auto-suspended IP still won't respond to that command.
this defect would result in this when device detached:
-------------------------------------------------------
[ 99.603544] usb 4-1: USB disconnect, device number 2
[ 104.615254] xhci-hcd xhci-hcd.0.auto: xHCI host not responding to stop endpoint command.
[ 104.623362] xhci-hcd xhci-hcd.0.auto: Assuming host is dying, halting host.
[ 104.653261] xhci-hcd xhci-hcd.0.auto: Host not halted after 16000 microseconds.
[ 104.660584] xhci-hcd xhci-hcd.0.auto: Non-responsive xHCI host is not halting.
[ 104.667817] xhci-hcd xhci-hcd.0.auto: Completing active URBs anyway.
[ 104.674198] xhci-hcd xhci-hcd.0.auto: HC died; cleaning up
------------------------------------------------------
As a result, when device detached, we desired to postpone "PORTCSC clear" behind
"disable slot". it's found that all executed ep command related to disconnetion,
are executed before "disable slot".
Signed-off-by: Sneeker Yeh <Sneeker.Yeh@tw.fujitsu.com>
---
drivers/usb/host/xhci-hub.c | 4 ++++
drivers/usb/host/xhci.c | 29 +++++++++++++++++++++++++++++
drivers/usb/host/xhci.h | 24 ++++++++++++++++++++++++
3 files changed, 57 insertions(+)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index a7865c4..3b8f7fc 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -368,6 +368,10 @@ static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
port_change_bit = "warm(BH) reset";
break;
case USB_PORT_FEAT_C_CONNECTION:
+ if ((xhci->quirks & XHCI_DISCONNECT_QUIRK) &&
+ !(readl(addr) & PORT_CONNECT))
+ return;
+
status = PORT_CSC;
port_change_bit = "connect";
break;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index c50d8d2..aa8e02a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3584,6 +3584,33 @@ command_cleanup:
return ret;
}
+static void xhci_try_to_clear_csc(struct usb_hcd *hcd, int dev_port_num)
+{
+ int max_ports;
+ struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ __le32 __iomem **port_array;
+ u32 status;
+
+ /* print debug info */
+ if (hcd->speed == HCD_USB3) {
+ max_ports = xhci->num_usb3_ports;
+ port_array = xhci->usb3_ports;
+ } else {
+ max_ports = xhci->num_usb2_ports;
+ port_array = xhci->usb2_ports;
+ }
+
+ if (dev_port_num > max_ports) {
+ xhci_err(xhci, "%s() port number invalid", __func__);
+ return;
+ }
+ status = readl(port_array[dev_port_num - 1]);
+
+ /* write 1 to clear */
+ if (!(status & PORT_CONNECT) && (status & PORT_CSC))
+ writel(status & PORT_CSC, port_array[0]);
+}
+
/*
* At this point, the struct usb_device is about to go away, the device has
* disconnected, and all traffic has been stopped and the endpoints have been
@@ -3649,6 +3676,8 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
xhci_ring_cmd_db(xhci);
spin_unlock_irqrestore(&xhci->lock, flags);
+ if (xhci->quirks & XHCI_DISCONNECT_QUIRK)
+ xhci_try_to_clear_csc(hcd, udev->portnum);
/*
* Event command completion handler will free any data structures
* associated with the slot. XXX Can free sleep?
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index cc7c5bb..65a65cc 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1560,6 +1560,30 @@ struct xhci_hcd {
#define XHCI_SPURIOUS_WAKEUP (1 << 18)
/* For controllers with a broken beyond repair streams implementation */
#define XHCI_BROKEN_STREAMS (1 << 19)
+/*
+ * This issue is defined by a three-way race at disconnect in Synopsis USB3 IP,
+ * between
+ * 1) Class driver interrupt endpoint resheduling attempts if the ISR gave an ep
+ * error event due to device detach (it would try 3 times)
+ * 2) Disconnect interrupt on PORTSC_CSC, which is cleared by hub thread
+ * asynchronously
+ * 3) The hardware IP was configured in silicon with
+ * - DWC_USB3_SUSPEND_ON_DISCONNECT_EN=1
+ * - Synopsys IP version is < 3.00a
+ * The IP will auto-suspend itself on device detach with some phy-specific
+ * interval after CSC is cleared by 2)
+ *
+ * If 2) and 3) complete before 1), the interrupts it expects will not be
+ * generated by the autosuspended IP, leading to a deadlock. Even later
+ * disconnection procedure would detect that corresponding urb is still
+ * in-progress and issue a ep stop command, auto-suspended IP still won't
+ * respond to that command.
+ *
+ * As a result, when device detached, it's needed to postpone "PORTCSC clear"
+ * behind "disable slot". it's found that all executed ep command related to
+ * disconnetion, are executed before "disable slot".
+ */
+#define XHCI_DISCONNECT_QUIRK (1 << 20)
unsigned int num_active_eps;
unsigned int limit_active_eps;
/* There are two roothubs to keep track of bus suspend info for */
--
1.7.9.5
^ permalink raw reply [flat|nested] 16+ messages in thread