3.20-rc0 breaks nfsroot over usb

3.20-rc0 breaks nfsroot over usb

[Pavel Machek]

Hi!

It no longer works after I merged

commit 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
Merge: 8c334ce 45ee2db
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 16 15:48:00 2015 -0800

    Merge branch 'drm-next' of
    git://people.freedesktop.org/~airlied/linux

    Pull drm updates from Dave Airlie:
         "This is the main drm pull, it has a shared branch with some
         alsa
      crossover but everything should be acked by relevant people.
    

If it works for you or if you have an idea, let me know...
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3.20-rc0 breaks nfsroot over usb

[Pavel Machek]

Hi!

> It no longer works after I merged
> 
> commit 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
> Merge: 8c334ce 45ee2db
> Author: Linus Torvalds <torvalds@linux-foundation.org>
> Date:   Mon Feb 16 15:48:00 2015 -0800
> 
>     Merge branch 'drm-next' of
>     git://people.freedesktop.org/~airlied/linux
> 
>     Pull drm updates from Dave Airlie:
>          "This is the main drm pull, it has a shared branch with some
>          alsa
>       crossover but everything should be acked by relevant people.
>     
> 
> If it works for you or if you have an idea, let me know...

Ok, it seems that new config dependencies broke my kconfig. These will
not be enabled if you just to make oldconfig; you want to make sure
they are on.

 OMAP2430 and onwards (USB_MUSB_OMAP2PLUS) [N/m/y] (NEW)
TWL4030 USB Transceiver Driver (TWL4030_USB) [N/m/y/?] (NEW)
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3.20-rc0 breaks nfsroot over usb

[Aaro Koskinen]

Hi,

On Thu, Feb 26, 2015 at 11:19:50PM +0100, Pavel Machek wrote:
> Ok, it seems that new config dependencies broke my kconfig. These will
> not be enabled if you just to make oldconfig; you want to make sure
> they are on.
> 
>  OMAP2430 and onwards (USB_MUSB_OMAP2PLUS) [N/m/y] (NEW)
> TWL4030 USB Transceiver Driver (TWL4030_USB) [N/m/y/?] (NEW)

Yes, also other users have reported "USB breakage" with 4.0-rc1 on N900
etc caused by this.

Commit fbba7db3990cb707ff91cd6507d53a0a730afe97 (usb: musb:
add omap-control dependency) changed USB_MUSB_OMAP2PLUS to depend
on OMAP_CONTROL_PHY but that seems to be wrong at least for OMAP3.
omap_control_phy.h provides dummy functions when it's not enabled.
So there should be no dependency.

A.

3.20-rc0 breaks nfsroot over usb

[Tony Lindgren]

* Aaro Koskinen <aaro.koskinen@iki.fi> [150226 15:06]:
> Hi,
> 
> On Thu, Feb 26, 2015 at 11:19:50PM +0100, Pavel Machek wrote:
> > Ok, it seems that new config dependencies broke my kconfig. These will
> > not be enabled if you just to make oldconfig; you want to make sure
> > they are on.
> > 
> >  OMAP2430 and onwards (USB_MUSB_OMAP2PLUS) [N/m/y] (NEW)
> > TWL4030 USB Transceiver Driver (TWL4030_USB) [N/m/y/?] (NEW)
> 
> Yes, also other users have reported "USB breakage" with 4.0-rc1 on N900
> etc caused by this.
> 
> Commit fbba7db3990cb707ff91cd6507d53a0a730afe97 (usb: musb:
> add omap-control dependency) changed USB_MUSB_OMAP2PLUS to depend
> on OMAP_CONTROL_PHY but that seems to be wrong at least for OMAP3.
> omap_control_phy.h provides dummy functions when it's not enabled.
> So there should be no dependency.

I guess the solution would be to make drivers/phy handle whatever
omap_control_usb_set_mode is doing in a generic way.

Regards,

Tony

3.20-rc0 breaks nfsroot over usb

[Arnd Bergmann]

On Friday 27 February 2015 07:38:09 Tony Lindgren wrote:
> * Aaro Koskinen <aaro.koskinen@iki.fi> [150226 15:06]:
> > Hi,
> > 
> > On Thu, Feb 26, 2015 at 11:19:50PM +0100, Pavel Machek wrote:
> > > Ok, it seems that new config dependencies broke my kconfig. These will
> > > not be enabled if you just to make oldconfig; you want to make sure
> > > they are on.
> > > 
> > >  OMAP2430 and onwards (USB_MUSB_OMAP2PLUS) [N/m/y] (NEW)
> > > TWL4030 USB Transceiver Driver (TWL4030_USB) [N/m/y/?] (NEW)
> > 
> > Yes, also other users have reported "USB breakage" with 4.0-rc1 on N900
> > etc caused by this.
> > 
> > Commit fbba7db3990cb707ff91cd6507d53a0a730afe97 (usb: musb:
> > add omap-control dependency) changed USB_MUSB_OMAP2PLUS to depend
> > on OMAP_CONTROL_PHY but that seems to be wrong at least for OMAP3.
> > omap_control_phy.h provides dummy functions when it's not enabled.
> > So there should be no dependency.

The problem I fixed was a link error when USB_MUSB_OMAP2PLUS
is built-in but OMAP_CONTROL_PHY is a loadable module.

> I guess the solution would be to make drivers/phy handle whatever
> omap_control_usb_set_mode is doing in a generic way.

I'm very sorry about the breakage in a patch that is marked for
backports.

Please accept my apology and the workaround patch in the
follow-up mail.

	Arnd

[PATCH] usb: musb: fix Kconfig regression

[Arnd Bergmann]

A recent bug fix I did that was marked for stable backports
introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.

I was missing the fact that the PHY driver already stubs out the
omap_control_usb_set_mode, and we only need to add a dependency
to prevent the musb-omap2430 driver from being built-in when
the phy driver is a loadable module, but we should not prevent it
from being built altogether when the phy driver is disabled.

This changes the dependency to allow OMAP_CONTROL_PHY to
be disabled, but to disallow USB_MUSB_OMAP2PLUS from being
built-in if OMAP_CONTROL_PHY is a loadable module.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: ca784be36cc725 ("usb: start using the control module driver")
Cc: <stable@vger.kernel.org> # v3.9+
Cc: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 14e1628483d9..39db8b603627 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010
 
 config USB_MUSB_OMAP2PLUS
 	tristate "OMAP2430 and onwards"
-	depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY
+	depends on ARCH_OMAP2PLUS && USB
+	depends on OMAP_CONTROL_PHY || !OMAP_CONTROL_PHY
 	select GENERIC_PHY
 
 config USB_MUSB_AM35X

[PATCH] usb: musb: fix Kconfig regression

[Felipe Balbi]

On Fri, Feb 27, 2015 at 09:12:45PM +0100, Arnd Bergmann wrote:
> A recent bug fix I did that was marked for stable backports
> introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.
> 
> I was missing the fact that the PHY driver already stubs out the
> omap_control_usb_set_mode, and we only need to add a dependency
> to prevent the musb-omap2430 driver from being built-in when
> the phy driver is a loadable module, but we should not prevent it
> from being built altogether when the phy driver is disabled.
> 
> This changes the dependency to allow OMAP_CONTROL_PHY to
> be disabled, but to disallow USB_MUSB_OMAP2PLUS from being
> built-in if OMAP_CONTROL_PHY is a loadable module.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: ca784be36cc725 ("usb: start using the control module driver")
> Cc: <stable@vger.kernel.org> # v3.9+
> Cc: Felipe Balbi <balbi@ti.com>

please resend with linux-usb in Cc and myself in Cc too ;-)

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150227/f2421702/attachment.sig>

[PATCH] usb: musb: fix Kconfig regression

[Pavel Machek]

On Fri 2015-02-27 21:12:45, Arnd Bergmann wrote:
> A recent bug fix I did that was marked for stable backports
> introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.
> 
> I was missing the fact that the PHY driver already stubs out the
> omap_control_usb_set_mode, and we only need to add a dependency
> to prevent the musb-omap2430 driver from being built-in when
> the phy driver is a loadable module, but we should not prevent it
> from being built altogether when the phy driver is disabled.
> 
> This changes the dependency to allow OMAP_CONTROL_PHY to
> be disabled, but to disallow USB_MUSB_OMAP2PLUS from being
> built-in if OMAP_CONTROL_PHY is a loadable module.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: ca784be36cc725 ("usb: start using the control module driver")
> Cc: <stable@vger.kernel.org> # v3.9+
> Cc: Felipe Balbi <balbi@ti.com>

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

3.20-rc0 breaks nfsroot over usb

[Pavel Machek]

On Fri 2015-02-27 01:03:07, Aaro Koskinen wrote:
> Hi,
> 
> On Thu, Feb 26, 2015 at 11:19:50PM +0100, Pavel Machek wrote:
> > Ok, it seems that new config dependencies broke my kconfig. These will
> > not be enabled if you just to make oldconfig; you want to make sure
> > they are on.
> > 
> >  OMAP2430 and onwards (USB_MUSB_OMAP2PLUS) [N/m/y] (NEW)
> > TWL4030 USB Transceiver Driver (TWL4030_USB) [N/m/y/?] (NEW)
> 
> Yes, also other users have reported "USB breakage" with 4.0-rc1 on N900
> etc caused by this.
> 
> Commit fbba7db3990cb707ff91cd6507d53a0a730afe97 (usb: musb:
> add omap-control dependency) changed USB_MUSB_OMAP2PLUS to depend

Too bad noone told me. I had a lot of fun trying to bisect config
problem. I have yet to try the nfsroot, but I guess it should be ok
now.

Thanks,

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html