[PATCH] usb: dwc2: Fix endless deferral probe

[mchehab@s-opensource.com (Mauro Carvalho Chehab)]

Em Fri, 12 Jan 2018 10:18:59 +0100
Arnd Bergmann <arnd@arndb.de> escreveu:

> On Fri, Jan 12, 2018 at 9:06 AM, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> > Am 12.01.2018 um 00:32 schrieb Arnd Bergmann:  
> >> On Wed, Jan 10, 2018 at 1:15 PM, Stefan Wahren <stefan.wahren@i2se.com>  
> 
> >> diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
> >> index b4964b067aec..93b55fb71d54 100644
> >> --- a/drivers/phy/phy-core.c
> >> +++ b/drivers/phy/phy-core.c
> >> @@ -410,6 +410,10 @@ static struct phy *_of_phy_get(struct device_node
> >> *np, int index)
> >>          if (ret)
> >>                  return ERR_PTR(-ENODEV);
> >>
> >> +       /* This phy type handled by the usb-phy subsystem for now */
> >> +       if (of_device_is_compatible(np, "usb-nop-xceiv"))
> >> +               return ERR_PTR(-ENODEV);
> >> +
> >>          mutex_lock(&phy_provider_mutex);
> >>          phy_provider = of_phy_provider_lookup(args.np);
> >>          if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner))
> >> {  
> >
> >
> > I tried this, but it doesn't work. "np" is the node of the USB controller,
> > not of the phy?  
> 
> Correct, that was a really dumb mistake on my end, I'm glad I asked
> you to try it first.
> 
> I'll fix it up and send the right version with a proper changelog right away.

I suspect you meant to do, instead:


diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index b4964b067aec..584cc1469f7d 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -410,6 +410,10 @@ static struct phy *_of_phy_get(struct device_node *np, int index)
 	if (ret)
 		return ERR_PTR(-ENODEV);
 
+       /* This phy type handled by the usb-phy subsystem for now */
+       if (of_device_is_compatible(args.np, "usb-nop-xceiv"))
+		return ERR_PTR(-ENODEV);
+
 	mutex_lock(&phy_provider_mutex);
 	phy_provider = of_phy_provider_lookup(args.np);
 	if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) {


(e. g. args.np, instead of np).

The above works for me on RPi3:

$ uname -a
Linux raspberrypi 4.15.0-rc7-mcc+ #28 SMP Fri Jan 12 12:35:19 EST 2018 armv7l GNU/Linux

$ lsusb
Bus 001 Device 005: ID 045e:0750 Microsoft Corp. Wired Keyboard 600
Bus 001 Device 004: ID 0572:960c Conexant Systems (Rockwell), Inc. DVBSky S960C DVB-S2 tuner
Bus 001 Device 003: ID 0424:ec00 Standard Microsystems Corp. SMSC9512/9514 Fast Ethernet Adapter
Bus 001 Device 002: ID 0424:9514 Standard Microsystems Corp. SMC9514 Hub
Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub

So, if you change np -> args.np, feel free to add my:

Tested-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

Regards,
Mauro