Xilinx ZynqMP USB fixes
v7 cover Xilinx ZynqMP USB fixes
Some fixes related to the Xilinx ZynqMP DWC3 wrapper driver to allow ZynqMP USB to work properly when the hardware is configured in USB 2.0-only mode.
Changes since v6:
-skip USB core resets and register settings which are not necessary when USB3 PHY is not specified
-added patches to implement ULPI PHY reset in driver
Changes since v5:
-code formatting fixes, no functional change
Changes since v4:
-dropped DWC3 core patches as they are superseded by Sean Anderson's patchset "usb: dwc3: Calculate REFCLKPER et. al. from reference clock", ZynqMP-specific patches unchanged
Changes since v3:
-fixed DT schema dt-doc-validate error
Changes since v2:
-additional kerneldoc fixes
Changes since v1:
-added DT binding documentation for new attribute
-kerneldoc formatting and reworded comments
Robert Hancock (4):
usb: dwc3: xilinx: Skip resets and USB3 register settings for USB2.0
mode
usb: dwc3: xilinx: Fix error handling when getting USB3 PHY
dt-bindings: usb: dwc3-xilinx: Added reset-gpios
usb: dwc3: xilinx: Add ULPI PHY reset handling
.../devicetree/bindings/usb/dwc3-xilinx.yaml | 4 ++ drivers/usb/dwc3/dwc3-xilinx.c | 41 ++++++++++++++++--- 2 files changed, 40 insertions(+), 5 deletions(-)
Signature · 1 line
2.31.1
PATCH v7 1/4 usb: dwc3: xilinx: Skip resets and USB3 register settings for USB2.0 mode
It appears that the PIPE clock should not be selected when only USB 2.0 is being used in the design and no USB 3.0 reference clock is used. Also, the core resets are not required if a USB3 PHY is not in use, and will break things if USB3 is actually used but the PHY entry is not listed in the device tree.
Skip core resets and register settings that are only required for USB3 mode when no USB3 PHY is specified in the device tree.
--- drivers/usb/dwc3/dwc3-xilinx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/usb/dwc3/dwc3-xilinx.c +13 -0
@@ -110,6 +110,18 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data) usb3_phy =NULL ; } +/* +* The following core resets are not required unless a USB3 PHY +* is used, and the subsequent register settings are not required +* unless a core reset is performed (they should be set properly +* by the first-stage boot loader, but may be reverted by a core +* reset). They may also break the configuration if USB3 is actually +* in use but the usb3-phy entry is missing from the device tree. +* Therefore, skip these operations in this case. +*/ +if (!usb3_phy) + goto skip_usb3_phy; + crst =devm_reset_control_get_exclusive (dev,"usb_crst" );if (IS_ERR (crst)) { ret =PTR_ERR (crst);
@@ -188,6 +200,7 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data) goto err; } +skip_usb3_phy:/* * This routes the USB DMA traffic to go through FPD path instead * of reaching DDR directly. This traffic routing is needed to
Signature · 1 line
2.31.1
PATCH v7 2/4 usb: dwc3: xilinx: Fix error handling when getting USB3 PHY
In reply to Robert HancockThe code that looked up the USB3 PHY was ignoring all errors other than EPROBE_DEFER in an attempt to handle the PHY not being present. Fix and simplify the code by using devm_phy_optional_get and dev_err_probe so that a missing PHY is not treated as an error and unexpected errors are handled properly.
--- drivers/usb/dwc3/dwc3-xilinx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/dwc3/dwc3-xilinx.c +5 -5
@@ -102,12 +102,12 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data)int ret;u32 reg; - usb3_phy =devm_phy_get (dev,"usb3-phy" ); -if (PTR_ERR (usb3_phy) == -EPROBE_DEFER ) { - ret = -EPROBE_DEFER ; + usb3_phy =devm_phy_optional_get (dev,"usb3-phy" ); +if (IS_ERR (usb3_phy)) { + ret =PTR_ERR (usb3_phy); +dev_err_probe (dev, ret, +"failed to get USB3 PHY\n" ); goto err; - }else if (IS_ERR (usb3_phy)) { - usb3_phy =NULL ; }/*
Signature · 1 line
2.31.1
PATCH v7 3/4 dt-bindings: usb: dwc3-xilinx: Added reset-gpios
In reply to Robert HancockUpdate DT binding to reflect new reset-gpios property.
--- Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml +4 -0
@@ -59,6 +59,10 @@ properties: - const: usb_hibrst - const: usb_apbrst + reset-gpios: + description: Optional GPIO connected to ULPI PHY reset line. + maxItems: 1 + phys: minItems: 1 maxItems: 2
Signature · 1 line
2.31.1
PATCH v7 4/4 usb: dwc3: xilinx: Add ULPI PHY reset handling
In reply to Robert HancockHook up an optional GPIO-based reset for the connected USB ULPI PHY device. This is typically already done by the first-stage boot loader, however it can be more robust to ensure this reset is done prior to loading the driver in Linux.
Based on a patch "usb: dwc3: xilinx: Add gpio-reset support" in the Xilinx kernel tree by Piyush Mehta <[email protected]>.
--- drivers/usb/dwc3/dwc3-xilinx.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/usb/dwc3/dwc3-xilinx.c +18 -0
@@ -11,6 +11,7 @@#include <linux/slab.h> #include <linux/clk.h> #include <linux/of.h> +#include <linux/gpio/consumer.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/of_platform.h>
@@ -101,6 +102,7 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data)struct phy *usb3_phy;int ret;u32 reg; +struct gpio_desc *reset_gpio; usb3_phy =devm_phy_optional_get (dev,"usb3-phy" );if (IS_ERR (usb3_phy)) {
@@ -201,6 +203,22 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data) } skip_usb3_phy: +/* ulpi reset via gpio-modepin or gpio-framework driver */ + reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR (reset_gpio)) { +dev_err_probe (dev,PTR_ERR (reset_gpio), +"Failed to bind reset gpio\n" ); + goto err; + } + +if (reset_gpio) { +/* Toggle ulpi to reset the phy. */ +gpiod_set_value (reset_gpio,0 ); +usleep_range (5000 ,10000 );/* delay */ +gpiod_set_value (reset_gpio,1 ); +usleep_range (5000 ,10000 );/* delay */ + } +/* * This routes the USB DMA traffic to go through FPD path instead * of reaching DDR directly. This traffic routing is needed to
Signature · 1 line
2.31.1
Re: [PATCH v7 4/4] usb: dwc3: xilinx: Add ULPI PHY reset handling
Quoted 36 lines · Robert Hancock
Hook up an optional GPIO-based reset for the connected USB ULPI PHY device. This is typically already done by the first-stage boot loader, however it can be more robust to ensure this reset is done prior to loading the driver in Linux.
Based on a patch "usb: dwc3: xilinx: Add gpio-reset support" in the Xilinx kernel tree by Piyush Mehta <[email protected]>.
Signed-off-by Robert Hancock <[email protected]>--- drivers/usb/dwc3/dwc3-xilinx.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/usb/dwc3/dwc3-xilinx.c +2
-0@@ -11,6 +11,7 @@#include <linux/slab.h> #include <linux/clk.h> #include <linux/of.h> +#include <linux/gpio/consumer.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/of_platform.h> @@ -101,6 +102,7 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data)struct phy *usb3_phy;int ret;u32 reg; +struct gpio_desc *reset_gpio; usb3_phy =devm_phy_optional_get (dev,"usb3-phy" );drivers/usb/dwc3/dwc3-xilinx.c +0
-0if (IS_ERR (usb3_phy)) {@@ -201,6 +203,22 @@ static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx *priv_data)
drivers/usb/dwc3/dwc3-xilinx.c static int dwc3_xlnx_init_zynqmp(struct dwc3_xlnx · line 213
Quoted 10 lines
drivers/usb/dwc3/dwc3-xilinx.c +6
-0} skip_usb3_phy: +/* ulpi reset via gpio-modepin or gpio-framework driver */ + reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR (reset_gpio)) { +dev_err_probe (dev,PTR_ERR (reset_gpio), +"Failed to bind reset gpio\n" ); + goto err;
Just noticed this forgets to set the error code to PTR_ERR(reset_gpio) and breaks in the deferred probe case. Also, this should be done earlier to avoid bailing out too late in that case. Will resubmit a new patchset with this fix for the remaining two patches (first 2 in this series were already merged).
Quoted 13 lines
drivers/usb/dwc3/dwc3-xilinx.c +10
-0+ } + +if (reset_gpio) { +/* Toggle ulpi to reset the phy. */ +gpiod_set_value (reset_gpio,0 ); +usleep_range (5000 ,10000 );/* delay */ +gpiod_set_value (reset_gpio,1 ); +usleep_range (5000 ,10000 );/* delay */ + } +/* drivers/usb/dwc3/dwc3-xilinx.c +0
-0* This routes the USB DMA traffic to go through FPD path instead * of reaching DDR directly. This traffic routing is needed to
Signature · 3 lines
Robert Hancock Senior Hardware Designer, Calian Advanced Technologies www.calian.com