Skip to contentSkip to conversation

usb: dwc2: fix phy dependecy

PATCH Superseded Daniel Brát 3 participants 9 messages Sep 8, 2021 – Oct 20, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover usb: dwc2: fix phy dependecy

I had problems getting USB working on my Raspberry Pi 3B+. I tracked the problem down to the dwc2 driver failing in its probe function due to CONFIG_GENERIC_PHY not enabled. I fixed the phy dependency in dwc2 and also enabled phy core in rpi_defconfig.

Daniel Brát (2):
usb: dwc2: Make having a phy optional
ARM: rpi_defconfig: Enable PHY core for dwc2 usb driver

 arch/arm/configs/rpi_defconfig |  2 ++
 drivers/usb/dwc2/dwc2.c        | 38 ++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 16 deletions(-)
Signature · 7 lines
2.17.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 1/2 usb: dwc2: Make having a phy optional

Despite using 'phy_optional_get' to get a 'usb2_phy' inside its probe, the driver would fail if it didnt find it. Also, there is no Kconfig dependency on 'CONFIG_GENERIC_PHY', so without it defined te phy functions are unimplemented and always return -ENOSYS making dwc2 probe always fail too. Since the 'dwc2->phy' is optional, the driver was modified to reflect this.
Tested working on Raspberry Pi 3B+.

---
 drivers/usb/dwc2/dwc2.c | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/usb/dwc2/dwc2.c +22 -16
index 9893977b8..8f3f8da00 100644
@@ -72,20 +72,22 @@ static int dwc2_probe(struct device_d *dev)
 	if (ret)
 		goto clk_disable;
 
-	dwc2->phy = phy_optional_get(dev, "usb2-phy");
-	if (IS_ERR(dwc2->phy)) {
-		ret = PTR_ERR(dwc2->phy);
-		goto clk_disable;
+	if (IS_ENABLED(CONFIG_GENERIC_PHY)) {
+		dwc2->phy = phy_optional_get(dev, "usb2-phy");
+		if (!dwc2->phy || IS_ERR(dwc2->phy)) {
+			dev_warn(dev, "Didnt find any 'usb2-phy'\n");
+			dwc2->phy = NULL;
+		} else {
+			ret = phy_power_on(dwc2->phy);
+			if (ret)
+				goto clk_disable;
+
+			ret = phy_init(dwc2->phy);
+			if (ret)
+				goto phy_power_off;
+		}
 	}
 
-	ret = phy_power_on(dwc2->phy);
-	if (ret)
-		goto clk_disable;
-
-	ret = phy_init(dwc2->phy);
-	if (ret)
-		goto phy_power_off;
-
 	ret = dwc2_check_core_version(dwc2);
 	if (ret)
 		goto error;
@@ -120,9 +122,11 @@ static int dwc2_probe(struct device_d *dev)
 
 	return 0;
 error:
-	phy_exit(dwc2->phy);
+	if (dwc2->phy)
+		phy_exit(dwc2->phy);
 phy_power_off:
-	phy_power_off(dwc2->phy);
+	if (dwc2->phy)
+		phy_power_off(dwc2->phy);
 clk_disable:
 	clk_disable(dwc2->clk);
 clk_put:
@@ -140,8 +144,10 @@ static void dwc2_remove(struct device_d *dev)
 	dwc2_host_uninit(dwc2);
 	dwc2_gadget_uninit(dwc2);
 
-	phy_exit(dwc2->phy);
-	phy_power_off(dwc2->phy);
+	if (dwc2->phy) {
+		phy_exit(dwc2->phy);
+		phy_power_off(dwc2->phy);
+	}
 }
 
 static const struct of_device_id dwc2_platform_dt_ids[] = {
Signature · 7 lines
2.17.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

Re: [PATCH 1/2] usb: dwc2: Make having a phy optional

Hi Daniel,

Quoted 18 lines · Daniel Brát

Despite using 'phy_optional_get' to get a 'usb2_phy' inside its probe, the driver would fail if it didnt find it. Also, there is no Kconfig dependency on 'CONFIG_GENERIC_PHY', so without it defined te phy functions are unimplemented and always return -ENOSYS making dwc2 probe always fail too. Since the 'dwc2->phy' is optional, the driver was modified to reflect this.
Tested working on Raspberry Pi 3B+.

---
 drivers/usb/dwc2/dwc2.c | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/usb/dwc2/dwc2.c +0 -0
index 9893977b8..8f3f8da00 100644

drivers/usb/dwc2/dwc2.c static int dwc2_probe(struct device_d *dev) · line 77

Quoted 10 lines
drivers/usb/dwc2/dwc2.c +3 -4
@@ -72,20 +72,22 @@ static int dwc2_probe(struct device_d *dev)
 	if (ret)
 		goto clk_disable;
 
-	dwc2->phy = phy_optional_get(dev, "usb2-phy");
-	if (IS_ERR(dwc2->phy)) {
-		ret = PTR_ERR(dwc2->phy);
-		goto clk_disable;
+	if (IS_ENABLED(CONFIG_GENERIC_PHY)) {
+		dwc2->phy = phy_optional_get(dev, "usb2-phy");
+		if (!dwc2->phy || IS_ERR(dwc2->phy)) {

I think a better way to fix this would be have phy_optional_get to return NULL when CONFIG_GENERIC_PHY is not enabled. That way this fix is not limited to dwc2 driver.

NULL is an expected return value for phy_optional_get when there is no phy, so that must not cause any issue in the driver.

Quoted 25 lines
drivers/usb/dwc2/dwc2.c +11 -8
+			dev_warn(dev, "Didnt find any 'usb2-phy'\n");
+			dwc2->phy = NULL;
+		} else {
+			ret = phy_power_on(dwc2->phy);
+			if (ret)
+				goto clk_disable;
+
+			ret = phy_init(dwc2->phy);
+			if (ret)
+				goto phy_power_off;
+		}
 	}
 
-	ret = phy_power_on(dwc2->phy);
-	if (ret)
-		goto clk_disable;
-
-	ret = phy_init(dwc2->phy);
-	if (ret)
-		goto phy_power_off;
-
 	ret = dwc2_check_core_version(dwc2);
 	if (ret)
 		goto error;

drivers/usb/dwc2/dwc2.c static int dwc2_probe(struct device_d *dev) · line 126

Quoted 6 lines
drivers/usb/dwc2/dwc2.c +2 -1
@@ -120,9 +122,11 @@ static int dwc2_probe(struct device_d *dev)
 
 	return 0;
 error:
-	phy_exit(dwc2->phy);
+	if (dwc2->phy)
+		phy_exit(dwc2->phy);

This is not needed as phy_exit already tests for NULL phy.

drivers/usb/dwc2/dwc2.c static int dwc2_probe(struct device_d *dev) · line 129

Quoted 4 lines
drivers/usb/dwc2/dwc2.c +2 -1
 phy_power_off:
-	phy_power_off(dwc2->phy);
+	if (dwc2->phy)
+		phy_power_off(dwc2->phy);

Same for phy_power_off

drivers/usb/dwc2/dwc2.c static void dwc2_remove(struct device_d *dev) · line 150

Quoted 13 lines
drivers/usb/dwc2/dwc2.c +4 -2
 clk_disable:
 	clk_disable(dwc2->clk);
 clk_put:
@@ -140,8 +144,10 @@ static void dwc2_remove(struct device_d *dev)
 	dwc2_host_uninit(dwc2);
 	dwc2_gadget_uninit(dwc2);
 
-	phy_exit(dwc2->phy);
-	phy_power_off(dwc2->phy);
+	if (dwc2->phy) {
+		phy_exit(dwc2->phy);
+		phy_power_off(dwc2->phy);
+	}

Same as above

Quoted 15 lines
drivers/usb/dwc2/dwc2.c +0 -0
 }
 
 static const struct of_device_id dwc2_platform_dt_ids[] = {
Signature · 10 lines
2.17.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox


To declare a filtering error, please use the following link : https://www.security-mail.net/reporter.php?mid=6017.61386e3c.c78.0&r=jmaselbas%40kalray.eu&s=barebox-bounces%2Bjmaselbas%3Dkalray.eu%40lists.infradead.org&o=%5BPATCH+1%2F2%5D+usb%3A+dwc2%3A+Make+having+a+phy+optional&verdict=C&c=a2cb297eefa99425f437bd1e182a2eb5ba1e58f8

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#3 lore raw

PATCH v2 1/2 usb: dwc2: Make having a phy optional

Despite using 'phy_optional_get' to get a 'usb2-phy' inside its probe, the driver would fail if it didnt find it. Also, there is no Kconfig dependency on 'CONFIG_GENERIC_PHY', so without it defined the phy functions are unimplemented and always return -ENOSYS making dwc2 probe always fail too.
The header stub of 'phy_optional_get' was changed to return NULL and the dwc2 driver was modified accordingly.

---
 drivers/usb/dwc2/dwc2.c | 27 +++++++++++++++------------
 include/linux/phy/phy.h |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)
drivers/usb/dwc2/dwc2.c +15 -12
index 9893977b8..472a0b7d9 100644
@@ -73,19 +73,22 @@ static int dwc2_probe(struct device_d *dev)
 		goto clk_disable;
 
 	dwc2->phy = phy_optional_get(dev, "usb2-phy");
-	if (IS_ERR(dwc2->phy)) {
-		ret = PTR_ERR(dwc2->phy);
-		goto clk_disable;
+	if (dwc2->phy) {
+		if (IS_ERR(dwc2->phy)) {
+			dev_warn(dev, "Couldnt get 'usb2-phy': %s\n",
+					strerror(PTR_ERR(dwc2->phy)));
+			goto phy_bypass;
+		}
+
+		ret = phy_power_on(dwc2->phy);
+		if (ret)
+			goto clk_disable;
+
+		ret = phy_init(dwc2->phy);
+		if (ret)
+			goto phy_power_off;
 	}
-
-	ret = phy_power_on(dwc2->phy);
-	if (ret)
-		goto clk_disable;
-
-	ret = phy_init(dwc2->phy);
-	if (ret)
-		goto phy_power_off;
-
+phy_bypass:
 	ret = dwc2_check_core_version(dwc2);
 	if (ret)
 		goto error;
include/linux/phy/phy.h +1 -1
index 679ce6e42..321e546f9 100644
@@ -195,7 +195,7 @@ static inline struct phy *phy_get(struct device_d *dev, const char *string)
 static inline struct phy *phy_optional_get(struct device_d *dev,
 					   const char *string)
 {
-	return ERR_PTR(-ENOSYS);
+	return NULL;
 }
 
 static inline struct phy *of_phy_get_by_phandle(struct device_d *dev,
Signature · 7 lines
2.17.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#4 lore raw

Re: [PATCH 1/2 v2] usb: dwc2: Make having a phy optional

Hi Daniel,

Quoted 21 lines · Daniel Brát

Despite using 'phy_optional_get' to get a 'usb2-phy' inside its probe, the driver would fail if it didnt find it. Also, there is no Kconfig dependency on 'CONFIG_GENERIC_PHY', so without it defined the phy functions are unimplemented and always return -ENOSYS making dwc2 probe always fail too.
The header stub of 'phy_optional_get' was changed to return NULL and the dwc2 driver was modified accordingly.

---
 drivers/usb/dwc2/dwc2.c | 27 +++++++++++++++------------
 include/linux/phy/phy.h |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)
drivers/usb/dwc2/dwc2.c +0 -0
index 9893977b8..472a0b7d9 100644
@@ -73,19 +73,22 @@ static int dwc2_probe(struct device_d *dev)
 		goto clk_disable;
 

drivers/usb/dwc2/dwc2.c static int dwc2_probe(struct device_d *dev) · line 81

Quoted 10 lines
drivers/usb/dwc2/dwc2.c +6 -3
 	dwc2->phy = phy_optional_get(dev, "usb2-phy");
-	if (IS_ERR(dwc2->phy)) {
-		ret = PTR_ERR(dwc2->phy);
-		goto clk_disable;
+	if (dwc2->phy) {
+		if (IS_ERR(dwc2->phy)) {
+			dev_warn(dev, "Couldnt get 'usb2-phy': %s\n",
+					strerror(PTR_ERR(dwc2->phy)));
+			goto phy_bypass;
+		}

You changed the return value of phy_optional_get() to NULL below, so when phy_optional_get() returns an error we would still have to fail the probe function here instead of ignoring the error, no?

Sascha

Quoted 43 lines
drivers/usb/dwc2/dwc2.c +9 -9
+
+		ret = phy_power_on(dwc2->phy);
+		if (ret)
+			goto clk_disable;
+
+		ret = phy_init(dwc2->phy);
+		if (ret)
+			goto phy_power_off;
 	}
-
-	ret = phy_power_on(dwc2->phy);
-	if (ret)
-		goto clk_disable;
-
-	ret = phy_init(dwc2->phy);
-	if (ret)
-		goto phy_power_off;
-
+phy_bypass:
 	ret = dwc2_check_core_version(dwc2);
 	if (ret)
 		goto error;
include/linux/phy/phy.h +1 -1
index 679ce6e42..321e546f9 100644
@@ -195,7 +195,7 @@ static inline struct phy *phy_get(struct device_d *dev, const char *string)
 static inline struct phy *phy_optional_get(struct device_d *dev,
 					   const char *string)
 {
-	return ERR_PTR(-ENOSYS);
+	return NULL;
 }
 
 static inline struct phy *of_phy_get_by_phandle(struct device_d *dev,
Signature · 7 lines
2.17.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#5 lore raw

Re: [PATCH 1/2 v2] usb: dwc2: Make having a phy optional

In reply to Daniel Brát

Hi Daniel,

Quoted 58 lines · Daniel Brát

Despite using 'phy_optional_get' to get a 'usb2-phy' inside its probe, the driver would fail if it didnt find it. Also, there is no Kconfig dependency on 'CONFIG_GENERIC_PHY', so without it defined the phy functions are unimplemented and always return -ENOSYS making dwc2 probe always fail too.
The header stub of 'phy_optional_get' was changed to return NULL and the dwc2 driver was modified accordingly.

---
 drivers/usb/dwc2/dwc2.c | 27 +++++++++++++++------------
 include/linux/phy/phy.h |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)
drivers/usb/dwc2/dwc2.c +15 -12
index 9893977b8..472a0b7d9 100644
@@ -73,19 +73,22 @@ static int dwc2_probe(struct device_d *dev)
 		goto clk_disable;
 
 	dwc2->phy = phy_optional_get(dev, "usb2-phy");
-	if (IS_ERR(dwc2->phy)) {
-		ret = PTR_ERR(dwc2->phy);
-		goto clk_disable;
+	if (dwc2->phy) {
+		if (IS_ERR(dwc2->phy)) {
+			dev_warn(dev, "Couldnt get 'usb2-phy': %s\n",
+					strerror(PTR_ERR(dwc2->phy)));
+			goto phy_bypass;
+		}
+
+		ret = phy_power_on(dwc2->phy);
+		if (ret)
+			goto clk_disable;
+
+		ret = phy_init(dwc2->phy);
+		if (ret)
+			goto phy_power_off;
 	}
-
-	ret = phy_power_on(dwc2->phy);
-	if (ret)
-		goto clk_disable;
-
-	ret = phy_init(dwc2->phy);
-	if (ret)
-		goto phy_power_off;
-
+phy_bypass:
 	ret = dwc2_check_core_version(dwc2);
 	if (ret)
 		goto error;
include/linux/phy/phy.h +0 -0
index 679ce6e42..321e546f9 100644

include/linux/phy/phy.h static inline struct phy *phy_get(struct device_d *dev, const char *string) · line 199

Quoted 6 lines
include/linux/phy/phy.h +1 -1
@@ -195,7 +195,7 @@ static inline struct phy *phy_get(struct device_d *dev, const char *string)
 static inline struct phy *phy_optional_get(struct device_d *dev,
 					   const char *string)
 {
-	return ERR_PTR(-ENOSYS);
+	return NULL;
 }

I am interested in getting this modification merged. Beside I don't think the dwc2 driver modification is needed, as phy_optional_get is intended to return NULL when no phy are available. For me it makes sense that NULL could be return by phy_optional_get when the phy support is not compiled in.

Do you have the time to send a new patch with only this modification ?

Thanks,
Jules

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#6 lore raw

Re: [PATCH 1/2 v2] usb: dwc2: Make having a phy optional

Hi Jules,

Quoted 7 lines · Jules Maselbas

I am interested in getting this modification merged. Beside I don't think the dwc2 driver modification is needed, as phy_optional_get is intended to return NULL when no phy are available. For me it makes sense that NULL could be return by phy_optional_get when the phy support is not compiled in.

Do you have the time to send a new patch with only this modification ?

I apologize for not responding to this thread sooner, had a lot on my plate lately. I agree that simply having the 'phy_optional_get' return NULL when unimplemented is better than making changes in the dwc2 driver itself and it makes sense in general for it to behave this ways. All the other functions using the phy already check for NULL anyway, so it is perfect fit. I submitted it as a new patch as you suggested.

Daniel

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#7 lore raw

Re: [PATCH 1/2 v2] usb: dwc2: Make having a phy optional

Hi,

Quoted 9 lines · Daniel Brát

Hi Jules,

Quoted 6 lines · Jules Maselbas

I am interested in getting this modification merged. Beside I don't think the dwc2 driver modification is needed, as phy_optional_get is intended to return NULL when no phy are available. For me it makes sense that NULL could be return by phy_optional_get when the phy support is not compiled in.

Quoted 3 lines
Quoted 1 line

Do you have the time to send a new patch with only this modification ?

I apologize for not responding to this thread sooner, had a lot on my plate

That's ok

Quoted 5 lines

lately. I agree that simply having the 'phy_optional_get' return NULL when unimplemented is better than making changes in the dwc2 driver itself and it makes sense in general for it to behave this ways. All the other functions using the phy already check for NULL anyway, so it is perfect fit. I submitted it as a new patch as you suggested.

nice :)

Thanks.

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#8 lore raw

PATCH 2/2 ARM: rpi_defconfig: Enable PHY core for dwc2 usb driver

In reply to Daniel Brát

The Raspbery Pi device tree defines 'usb2_phy' optionally used by the dwc2 usb driver, so lets enable PHY core for it in the defconfig.

---
 arch/arm/configs/rpi_defconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/configs/rpi_defconfig +2 -0
index f42b8819a..b823a9a3d 100644
@@ -96,6 +96,8 @@ CONFIG_WATCHDOG_BCM2835=y
 CONFIG_GPIO_RASPBERRYPI_EXP=y
 CONFIG_PINCTRL_BCM283X=y
 CONFIG_REGULATOR=y
+CONFIG_GENERIC_PHY=y
+CONFIG_USB_NOP_XCEIV=y
 CONFIG_FS_EXT4=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_NFS=y
Signature · 7 lines
2.17.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox