[PATCH v2 1/2] usb: chipidea: add xilinx zynq platform data
Due to having hardware tx buffers less than 512 bytes in size, streaming
must be enabled on the Zynq for the udc to work at all. Add platform data
specific to the Zynq udc, which does not set the CI_HDRC_DISABLE_STREAMING
flag.
Based on a patch by the same name from the Xilinx vendor tree.
Signed-off-by: Nathan Sullivan
---
Changes from v1 - better describe the issue in the description, the root cause
is that the Zynq hardware does not have big enough tx buffers to hold entire
packets, so streaming must be on.
---
drivers/usb/chipidea/ci_hdrc_usb2.c | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c
b/drivers/usb/chipidea/ci_hdrc_usb2.c
index 9eae1a1..4456d2c 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
@@ -12,6 +12,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -30,18 +31,36 @@ static const struct ci_hdrc_platform_data ci_default_pdata
= {
.flags = CI_HDRC_DISABLE_STREAMING,
};
+static struct ci_hdrc_platform_data ci_zynq_pdata = {
+ .capoffset = DEF_CAPOFFSET,
+};
+
+static const struct of_device_id ci_hdrc_usb2_of_match[] = {
+ { .compatible = "chipidea,usb2"},
+ { .compatible = "xlnx,zynq-usb-2.20a", .data = &ci_zynq_pdata},
+ { }
+};
+MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
+
static int ci_hdrc_usb2_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct ci_hdrc_usb2_priv *priv;
struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(dev);
int ret;
+ const struct of_device_id *match;
if (!ci_pdata) {
ci_pdata = devm_kmalloc(dev, sizeof(*ci_pdata), GFP_KERNEL);
*ci_pdata = ci_default_pdata; /* struct copy */
}
+ match = of_match_device(ci_hdrc_usb2_of_match, &pdev->dev);
+ if (match && match->data) {
+ /* struct copy */
+ *ci_pdata = *(struct ci_hdrc_platform_data *)match->data;
+ }
+
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -96,12 +115,6 @@ static int ci_hdrc_usb2_remove(struct platform_device *pdev)
return 0;
}
-static const struct of_device_id ci_hdrc_usb2_of_match[] = {
- { .compatible = "chipidea,usb2" },
- { }
-};
-MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
-
static struct platform_driver ci_hdrc_usb2_driver = {
.probe = ci_hdrc_usb2_probe,
.remove = ci_hdrc_usb2_remove,
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 2/2] Documentation: bindings: add doc for zynq USB
Document the binding for the zynq specific chipidea UDC binding. Signed-off-by: Nathan Sullivan --- Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt |1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index 553e2fa..29ec09e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -6,6 +6,7 @@ Required properties: "lsi,zevio-usb" "qcom,ci-hdrc" "chipidea,usb2" + "xlnx,zynq-usb-2.20a" - reg: base address and length of the registers - interrupts: interrupt for the USB controller -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] usb: chipidea: add xilinx zynq platform data
On Fri, Aug 28, 2015 at 09:30:12AM +0800, Peter Chen wrote: > On Thu, Aug 27, 2015 at 09:33:07AM -0500, Nathan Sullivan wrote: > > On Thu, Aug 27, 2015 at 01:11:30PM +0530, punnaiah choudary kalluri wrote: > > > Hi, > > > > > > On Thu, Aug 27, 2015 at 10:03 AM, Peter Chen > > > wrote: > > > > On Thu, Aug 27, 2015 at 10:59:22AM +0530, sundeep subbaraya wrote: > > > >> Hi, > > > >> > > > >> > > > >> On Wed, Aug 26, 2015 at 8:57 PM, Nathan Sullivan > > > >> wrote: > > > >> > The Xilinx Zynq udc does not need the CI_HDRC_DISABLE_STREAMING flag, > > > >> > unlike the default platform data. Add platform data specific to the > > > >> > Zynq udc. > > > >> > > > > >> > Based on a patch by the same name from the Xilinx vendor tree. > > > >> > > > >> I am that Xilinx guy who sent this patch :). It is in Xilinx tree as > > > >> temporary fix and > > > >> I did not debug further why UDC works only when streaming is enabled. > > > >> Probably this is right time to post my question here. > > > >> I was expecting like: > > > >> Streaming disabled - both low bandwidth and high bandwidth systems > > > >> should work fine > > > >> Streaming enabled - only for high bandwidth systems > > > >> but this is not the case, Zynq UDC works only when Streaming is > > > >> enabled. > > > >> Please correct me if I am wrong. > > > > > > > > You are right, stream mode disabled should work at anytime. > > > > It is so strange why zynq UDC only works when stream mode is enabled. > > > > > > I am referring the section 8.5.2 in Synopsys usb 2.0 HS controllervDoc > > > 2.20a, > > > this is what it says about SDIS (streaming mode disable option) > > > > > > Before activating this mode, the user must check if the TX latency > > > buffers per endpoint are able to > > > accommodate at least one entire maximum size packet. The RX buffer > > > size must, at least, double the TX > > > buffer size per endpoint. To optimize the stream disable performance, > > > system bus burst must be set as high > > > as possible. > > > When the stream disable mode is used, the burst size (VUSB_HS_RX_BURST > > > and VUSB_HS_TX_BURST) > > > must be a integer sub-multiple of the latency buffer size > > > (VUSB_HS_RX_DEPTH for RX buffer and > > > VUSB_HS_TX_CHAN for the TX buffer). If this is not respected the > > > controller will not work properly in stream > > > disable mode. > > > The stream disable mode should just be used in situations where the > > > available system bandwidth is low or the > > > system bus access latency is high, in order to avoid underruns and > > > overruns in the latency buffers. This works > > > for all types of endpoints, except for ISO endpoints. > > > Such a system can't ensure the real time support that the ISO > > > endpoints require, so the ISO endpoints are not > > > supported when the SDIS bit is set. > > > > > > Definitely we need to root cause why disable streaming mode is not > > > working for zynq but from controller spec > > > point of view it is possible that controller not work properly in > > > stream disable mode. > > > > > > Regards, > > > Punnaiah > > > > > > > Maybe the burst size isn't set correctly by default? It does say the > > controller > > won't work correctly with stream disable set and an invalid burst size. > > Looks > > like TX and RX burst both default to 16, per the Zynq manual. > > > > With the stream disable bit set, the behvior we see on our hardware is > > that priming just stops, with an outstanding transfer in memory marked > > active in the status field by the controller. This happens at random, even > > when doing single transfers at a time like with g_ether set to have a queue > > size of 1. With SDIS clear everything works great. Given that the Zynq is > > not > > bandwidth constrained, it seems like SDIS clear should be the default. > > > > I suspect the possible reason is the tx buffer for each endpoint is > small (<=512 bytes), so it can't copy one packet (assume max packet size > for bulk) to tx buffer, then the prime can't be finished. > > Would you help to dump the registers HWTXBUF ($BASE + 0x10) and DCCPARAMS > ($BASE + 124)? > > tx buffer size = ((2 ^ HWTXBUF.VUSB_HS_TX_ADD) / DCCPARAMS.DEN) * > (DWORD_PER_BYTES) > > DWORD_PER_BYTES is 4 > > -- > > Best Regards, > Peter Chen HWTXBUF is 0x80060A10, DCCPARAMS is 0xE0003124. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] usb: chipidea: add xilinx zynq platform data
On Thu, Aug 27, 2015 at 01:11:30PM +0530, punnaiah choudary kalluri wrote: > Hi, > > On Thu, Aug 27, 2015 at 10:03 AM, Peter Chen wrote: > > On Thu, Aug 27, 2015 at 10:59:22AM +0530, sundeep subbaraya wrote: > >> Hi, > >> > >> > >> On Wed, Aug 26, 2015 at 8:57 PM, Nathan Sullivan > >> wrote: > >> > The Xilinx Zynq udc does not need the CI_HDRC_DISABLE_STREAMING flag, > >> > unlike the default platform data. Add platform data specific to the > >> > Zynq udc. > >> > > >> > Based on a patch by the same name from the Xilinx vendor tree. > >> > >> I am that Xilinx guy who sent this patch :). It is in Xilinx tree as > >> temporary fix and > >> I did not debug further why UDC works only when streaming is enabled. > >> Probably this is right time to post my question here. > >> I was expecting like: > >> Streaming disabled - both low bandwidth and high bandwidth systems > >> should work fine > >> Streaming enabled - only for high bandwidth systems > >> but this is not the case, Zynq UDC works only when Streaming is enabled. > >> Please correct me if I am wrong. > > > > You are right, stream mode disabled should work at anytime. > > It is so strange why zynq UDC only works when stream mode is enabled. > > I am referring the section 8.5.2 in Synopsys usb 2.0 HS controllervDoc 2.20a, > this is what it says about SDIS (streaming mode disable option) > > Before activating this mode, the user must check if the TX latency > buffers per endpoint are able to > accommodate at least one entire maximum size packet. The RX buffer > size must, at least, double the TX > buffer size per endpoint. To optimize the stream disable performance, > system bus burst must be set as high > as possible. > When the stream disable mode is used, the burst size (VUSB_HS_RX_BURST > and VUSB_HS_TX_BURST) > must be a integer sub-multiple of the latency buffer size > (VUSB_HS_RX_DEPTH for RX buffer and > VUSB_HS_TX_CHAN for the TX buffer). If this is not respected the > controller will not work properly in stream > disable mode. > The stream disable mode should just be used in situations where the > available system bandwidth is low or the > system bus access latency is high, in order to avoid underruns and > overruns in the latency buffers. This works > for all types of endpoints, except for ISO endpoints. > Such a system can't ensure the real time support that the ISO > endpoints require, so the ISO endpoints are not > supported when the SDIS bit is set. > > Definitely we need to root cause why disable streaming mode is not > working for zynq but from controller spec > point of view it is possible that controller not work properly in > stream disable mode. > > Regards, > Punnaiah > Maybe the burst size isn't set correctly by default? It does say the controller won't work correctly with stream disable set and an invalid burst size. Looks like TX and RX burst both default to 16, per the Zynq manual. With the stream disable bit set, the behvior we see on our hardware is that priming just stops, with an outstanding transfer in memory marked active in the status field by the controller. This happens at random, even when doing single transfers at a time like with g_ether set to have a queue size of 1. With SDIS clear everything works great. Given that the Zynq is not bandwidth constrained, it seems like SDIS clear should be the default. > > > > Peter > >> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] Documentation: bindings: add doc for zynq USB
Document the binding for the zynq specific chipidea UDC binding. Signed-off-by: Nathan Sullivan --- Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt |1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index 553e2fa..29ec09e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -6,6 +6,7 @@ Required properties: "lsi,zevio-usb" "qcom,ci-hdrc" "chipidea,usb2" + "xlnx,zynq-usb-2.20a" - reg: base address and length of the registers - interrupts: interrupt for the USB controller -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] usb: chipidea: add xilinx zynq platform data
The Xilinx Zynq udc does not need the CI_HDRC_DISABLE_STREAMING flag,
unlike the default platform data. Add platform data specific to the
Zynq udc.
Based on a patch by the same name from the Xilinx vendor tree.
Signed-off-by: Nathan Sullivan
---
drivers/usb/chipidea/ci_hdrc_usb2.c | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c
b/drivers/usb/chipidea/ci_hdrc_usb2.c
index 9eae1a1..4456d2c 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
@@ -12,6 +12,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -30,18 +31,36 @@ static const struct ci_hdrc_platform_data ci_default_pdata
= {
.flags = CI_HDRC_DISABLE_STREAMING,
};
+static struct ci_hdrc_platform_data ci_zynq_pdata = {
+ .capoffset = DEF_CAPOFFSET,
+};
+
+static const struct of_device_id ci_hdrc_usb2_of_match[] = {
+ { .compatible = "chipidea,usb2"},
+ { .compatible = "xlnx,zynq-usb-2.20a", .data = &ci_zynq_pdata},
+ { }
+};
+MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
+
static int ci_hdrc_usb2_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct ci_hdrc_usb2_priv *priv;
struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(dev);
int ret;
+ const struct of_device_id *match;
if (!ci_pdata) {
ci_pdata = devm_kmalloc(dev, sizeof(*ci_pdata), GFP_KERNEL);
*ci_pdata = ci_default_pdata; /* struct copy */
}
+ match = of_match_device(ci_hdrc_usb2_of_match, &pdev->dev);
+ if (match && match->data) {
+ /* struct copy */
+ *ci_pdata = *(struct ci_hdrc_platform_data *)match->data;
+ }
+
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -96,12 +115,6 @@ static int ci_hdrc_usb2_remove(struct platform_device *pdev)
return 0;
}
-static const struct of_device_id ci_hdrc_usb2_of_match[] = {
- { .compatible = "chipidea,usb2" },
- { }
-};
-MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
-
static struct platform_driver ci_hdrc_usb2_driver = {
.probe = ci_hdrc_usb2_probe,
.remove = ci_hdrc_usb2_remove,
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v3] ARM: zynq: DT: Use the zynq binding with macb
Use the new zynq binding for macb ethernet, since it will disable half
duplex gigabit like the Zynq TRM says to do. Also allow the compatible
cadence gem binding that won't disable half duplex but works otherwise.
Signed-off-by: Nathan Sullivan
---
arch/arm/boot/dts/zynq-7000.dtsi |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index a5cd2ed..0691508 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -193,7 +193,7 @@
};
gem0: ethernet@e000b000 {
- compatible = "cdns,gem";
+ compatible = "cdns,zynq-gem", "cdns,gem";
reg = <0xe000b000 0x1000>;
status = "disabled";
interrupts = <0 22 4>;
@@ -204,7 +204,7 @@
};
gem1: ethernet@e000c000 {
- compatible = "cdns,gem";
+ compatible = "cdns,zynq-gem", "cdns,gem";
reg = <0xe000c000 0x1000>;
status = "disabled";
interrupts = <0 45 4>;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] ARM: zynq: DT: Use the zynq binding with macb
Use the new zynq binding for macb ethernet, since it will disable half
duplex gigabit like the Zynq TRM says to do. Also allow the compatible
cadence gem binding that won't disable half duplex but works otherwise.
Signed-off-by: Nathan Sullivan
---
arch/arm/boot/dts/zynq-7000.dtsi |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index a5cd2ed..154bf93 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -57,7 +57,7 @@
regulator-always-on;
};
- amba {
+ amba@0 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -193,7 +193,7 @@
};
gem0: ethernet@e000b000 {
- compatible = "cdns,gem";
+ compatible = "cdns,zynq-gem", "cdns,gem";
reg = <0xe000b000 0x1000>;
status = "disabled";
interrupts = <0 22 4>;
@@ -204,7 +204,7 @@
};
gem1: ethernet@e000c000 {
- compatible = "cdns,gem";
+ compatible = "cdns,zynq-gem", "cdns,gem";
reg = <0xe000c000 0x1000>;
status = "disabled";
interrupts = <0 45 4>;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
