diff mbox series

[2/2] usb: core: Try generic PHY_MODE_USB_HOST if usb_phy_roothub_set_mode fails

Message ID 20190322085108.18693-3-wens@kernel.org
State Mainlined, archived
Commit e671765e521c571afec3157a7e17502d54f6a43e
Headers show
Series ARM: sunxi: Fix USB host init fail on v5.1-rc1 | expand

Commit Message

Chen-Yu Tsai March 22, 2019, 8:51 a.m. UTC
From: Chen-Yu Tsai <wens@csie.org>

Some PHYs do not support PHY_MODE_USB_HOST_SS, i.e. USB 3.0 or higher.
Fall back and try the more generic PHY_MODE_USB_HOST if it fails.

Fixes: b97a31348379 ("usb: core: comply to PHY framework")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/usb/core/hcd.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Neil Armstrong March 22, 2019, 12:56 p.m. UTC | #1
On 22/03/2019 09:51, Chen-Yu Tsai wrote:
> From: Chen-Yu Tsai <wens@csie.org>
> 
> Some PHYs do not support PHY_MODE_USB_HOST_SS, i.e. USB 3.0 or higher.
> Fall back and try the more generic PHY_MODE_USB_HOST if it fails.
> 
> Fixes: b97a31348379 ("usb: core: comply to PHY framework")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/usb/core/hcd.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
> index 3189181bb628..975d7c1288e3 100644
> --- a/drivers/usb/core/hcd.c
> +++ b/drivers/usb/core/hcd.c
> @@ -2741,6 +2741,9 @@ int usb_add_hcd(struct usb_hcd *hcd,
>  
>  		retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
>  						  PHY_MODE_USB_HOST_SS);
> +		if (retval)
> +			retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
> +							  PHY_MODE_USB_HOST);
>  		if (retval)
>  			goto err_usb_phy_roothub_power_on;
>  
> 

Tested-by: Neil Armstrong <narmstrong@baylibre.com>

This fixes USB on Amlogic GXL/GXL, tested on a Nexbox A1 with a S912 SoC running v5.1-rc1

Error was :
[    4.851477] phy phy-d0078080.phy.3: unsupported PHY mode 5
[    4.856266] xhci-hcd: probe of xhci-hcd.0.auto failed with error -22

Neil
diff mbox series

Patch

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 3189181bb628..975d7c1288e3 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2741,6 +2741,9 @@  int usb_add_hcd(struct usb_hcd *hcd,
 
 		retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
 						  PHY_MODE_USB_HOST_SS);
+		if (retval)
+			retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
+							  PHY_MODE_USB_HOST);
 		if (retval)
 			goto err_usb_phy_roothub_power_on;