[v3] usb: ehci-omap: Fix deferred probe for phy handling

Message ID 1544780175-17019-1-git-send-email-rogerq@ti.com
State Accepted
Commit 8dc7623bf608495b6e6743e805807c7840673573
Headers show
Series
  • [v3] usb: ehci-omap: Fix deferred probe for phy handling
Related show

Commit Message

Roger Quadros Dec. 14, 2018, 9:36 a.m.
PHY model is being used on omap5 platforms even if port mode
is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required
or not based on PHY mode.

If PHY is provided in device tree, it must be required. So, if
devm_usb_get_phy_by_phandle() gives us an error code other
than -ENODEV (no PHY) then error out.

This fixes USB Ethernet on omap5-uevm if PHY happens to
probe after EHCI thus causing a -EPROBE_DEFER.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Johan Hovold <johan@kernel.org>
Cc: Ladislav Michl <ladis@linux-mips.org>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>

---
 drivers/usb/host/ehci-omap.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Comments

Peter Ujfalusi Dec. 14, 2018, 9:49 a.m. | #1
Roger,

On 14/12/2018 11.36, Roger Quadros wrote:
> PHY model is being used on omap5 platforms even if port mode

> is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required

> or not based on PHY mode.

> 

> If PHY is provided in device tree, it must be required. So, if

> devm_usb_get_phy_by_phandle() gives us an error code other

> than -ENODEV (no PHY) then error out.

> 

> This fixes USB Ethernet on omap5-uevm if PHY happens to

> probe after EHCI thus causing a -EPROBE_DEFER.


Thanks, it works.

Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>


> Cc: Alan Stern <stern@rowland.harvard.edu>

> Cc: Johan Hovold <johan@kernel.org>

> Cc: Ladislav Michl <ladis@linux-mips.org>

> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Cc: Tony Lindgren <tony@atomide.com>

> Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Signed-off-by: Roger Quadros <rogerq@ti.com>

> ---

>  drivers/usb/host/ehci-omap.c | 7 ++++---

>  1 file changed, 4 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c

> index 7e4c1334..7d20296 100644

> --- a/drivers/usb/host/ehci-omap.c

> +++ b/drivers/usb/host/ehci-omap.c

> @@ -159,11 +159,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)

>  		/* get the PHY device */

>  		phy = devm_usb_get_phy_by_phandle(dev, "phys", i);

>  		if (IS_ERR(phy)) {

> -			/* Don't bail out if PHY is not absolutely necessary */

> -			if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)

> +			ret = PTR_ERR(phy);

> +			if (ret == -ENODEV) { /* no PHY */

> +				phy = NULL;

>  				continue;

> +			}

>  

> -			ret = PTR_ERR(phy);

>  			if (ret != -EPROBE_DEFER)

>  				dev_err(dev, "Can't get PHY for port %d: %d\n",

>  					i, ret);

> 


- P├ęter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Tony Lindgren Dec. 14, 2018, 2:09 p.m. | #2
* Roger Quadros <rogerq@ti.com> [181214 09:36]:
> PHY model is being used on omap5 platforms even if port mode

> is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required

> or not based on PHY mode.

> 

> If PHY is provided in device tree, it must be required. So, if

> devm_usb_get_phy_by_phandle() gives us an error code other

> than -ENODEV (no PHY) then error out.

> 

> This fixes USB Ethernet on omap5-uevm if PHY happens to

> probe after EHCI thus causing a -EPROBE_DEFER.


Acked-by: Tony Lindgren <tony@atomide.com>
Alan Stern Dec. 14, 2018, 3:06 p.m. | #3
On Fri, 14 Dec 2018, Roger Quadros wrote:

> PHY model is being used on omap5 platforms even if port mode

> is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required

> or not based on PHY mode.

> 

> If PHY is provided in device tree, it must be required. So, if

> devm_usb_get_phy_by_phandle() gives us an error code other

> than -ENODEV (no PHY) then error out.

> 

> This fixes USB Ethernet on omap5-uevm if PHY happens to

> probe after EHCI thus causing a -EPROBE_DEFER.

> 

> Cc: Alan Stern <stern@rowland.harvard.edu>

> Cc: Johan Hovold <johan@kernel.org>

> Cc: Ladislav Michl <ladis@linux-mips.org>

> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Cc: Tony Lindgren <tony@atomide.com>

> Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Signed-off-by: Roger Quadros <rogerq@ti.com>

> ---

>  drivers/usb/host/ehci-omap.c | 7 ++++---

>  1 file changed, 4 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c

> index 7e4c1334..7d20296 100644

> --- a/drivers/usb/host/ehci-omap.c

> +++ b/drivers/usb/host/ehci-omap.c

> @@ -159,11 +159,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)

>  		/* get the PHY device */

>  		phy = devm_usb_get_phy_by_phandle(dev, "phys", i);

>  		if (IS_ERR(phy)) {

> -			/* Don't bail out if PHY is not absolutely necessary */

> -			if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)

> +			ret = PTR_ERR(phy);

> +			if (ret == -ENODEV) { /* no PHY */

> +				phy = NULL;

>  				continue;

> +			}

>  

> -			ret = PTR_ERR(phy);

>  			if (ret != -EPROBE_DEFER)

>  				dev_err(dev, "Can't get PHY for port %d: %d\n",

>  					i, ret);


Acked-by: Alan Stern <stern@rowland.harvard.edu>

Patch

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 7e4c1334..7d20296 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -159,11 +159,12 @@  static int ehci_hcd_omap_probe(struct platform_device *pdev)
 		/* get the PHY device */
 		phy = devm_usb_get_phy_by_phandle(dev, "phys", i);
 		if (IS_ERR(phy)) {
-			/* Don't bail out if PHY is not absolutely necessary */
-			if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)
+			ret = PTR_ERR(phy);
+			if (ret == -ENODEV) { /* no PHY */
+				phy = NULL;
 				continue;
+			}
 
-			ret = PTR_ERR(phy);
 			if (ret != -EPROBE_DEFER)
 				dev_err(dev, "Can't get PHY for port %d: %d\n",
 					i, ret);