diff mbox series

[BUG] USB (EHCI/OHCI) broken on Allwinner SoCs

Message ID 20190318084536.GA27150@wens.csie.org
State Superseded
Headers show
Series [BUG] USB (EHCI/OHCI) broken on Allwinner SoCs | expand

Commit Message

Chen-Yu Tsai March 18, 2019, 8:45 a.m. UTC
Hi everyone,

USB EHCI/OHCI hosts are broken on Allwinner SoCs on v5.1-rc1. I believe
this is partially triggered by commit b97a31348379 ("usb: core: comply
to PHY framework"), and partially due to how the Allwinner USB PHY
driver handles phy_set_mode for non-OTG PHYs. Note this is not from a

The following changes fix this.

Hunk 1 makes our PHY driver accept PHY_MODE_USB_HOST for the non-OTG
PHYs as a no-op.


If the two changes make sense I'll send them out as actual patches.
diff mbox series


diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 5163097b43df..4bbd9ede38c8 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -485,8 +485,11 @@  static int sun4i_usb_phy_set_mode(struct phy *_phy,
 	struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
 	int new_mode;
-	if (phy->index != 0)
+	if (phy->index != 0) {
+		if (mode == PHY_MODE_USB_HOST)
+			return 0;
 		return -EINVAL;
+	}
 	switch (mode) {

Hunk 2 makes the USB core call phy_set_mode with PHY_MODE_USB_HOST
instead of PHY_MODE_USB_HOST_SS. Not sure why PHY_MODE_USB_HOST_SS was
used here, but I believe only a small set of hardware actually support
SuperSpeed, so it might be better to use the more encompasing
PHY_MODE_USB_HOST. That or the core code would have to check which speed
class the port is for and pass in the appropriate mode. The Allwinner
PHYs do not support SuperSpeed.

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 3189181bb628..7f25e384144d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2740,7 +2740,7 @@  int usb_add_hcd(struct usb_hcd *hcd,
 			return retval;
 		retval = usb_phy_roothub_set_mode(hcd->phy_roothub,
+						  PHY_MODE_USB_HOST);
 		if (retval)
 			goto err_usb_phy_roothub_power_on;