diff mbox

usb: musb: turn phy on

Message ID 20140402193138.GM8504@saruman.home
State Superseded
Headers show

Commit Message

Felipe Balbi April 2, 2014, 7:31 p.m. UTC 
Hi,

On Wed, Apr 02, 2014 at 09:26:27PM +0200, Rabin Vincent wrote:
> 30a70b026b4cde4 ("usb: musb: fix obex in g_nokia.ko causing kernel
> panic") broke USB gadget support on Pandaboard because it simply deletes
> the call to phy_power_on() and the PHY is therefore never turned on.
> 
> Fix it by actually turning the phy on.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Rabin Vincent <rabin@rab.in>
> ---
>  drivers/usb/musb/musb_gadget.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
> index d4aa779..09d5883 100644
> --- a/drivers/usb/musb/musb_gadget.c
> +++ b/drivers/usb/musb/musb_gadget.c
> @@ -1850,6 +1850,7 @@ static int musb_gadget_start(struct usb_gadget *g,
>  	}
>  
>  	pm_runtime_get_sync(musb->controller);
> +	phy_power_on(musb->phy);
>  
>  	dev_dbg(musb->controller, "registering driver %s\n", driver->function);
>  
> @@ -1963,6 +1964,7 @@ static int musb_gadget_stop(struct usb_gadget *g,
>  	 * that currently misbehaves.
>  	 */
>  
> +	phy_power_off(musb->phy);

hmmm... not the best place, I have been waiting for -rc1 to be out to
send this version:

commit e8fbe7b90021960907e885e0b7a9b52d378b0202
Author: Felipe Balbi <balbi@ti.com>
Date:   Fri Mar 28 14:31:47 2014 -0500

    usb: musb: fix PHY power on/off
    
    commi 30a70b0 (usb: musb: fix obex in g_nokia.ko
    causing kernel panic) removed phy_power_on()
    and phy_power_off() calls from runtime PM callbacks
    but it failed to note that the driver depended
    on pm_runtime_get_sync() calls to power up the PHY,
    thus leaving some platforms without any means to
    have a working PHY.
    
    Fix that by enabling the phy during omap2430_musb_init()
    and killing it in omap2430_musb_exit().
    
    Fixes: 30a70b0 (usb: musb: fix obex in g_nokia.ko causing kernel panic)
    Cc: <stable@vger.kernel.org> # v3.14
    Cc: Pali Rohár <pali.rohar@gmail.com>
    Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
    Reported-by: Michael Scott <hashcode0f@gmail.com>
    Tested-by: Michael Scott <hashcode0f@gmail.com>
    Reported-by: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Felipe Balbi <balbi@ti.com>


and I'm much more inclined to send this one instead since it has been
tested by other folks already. I was even going to Cc you, as you can
see on that Reported-by tag.

cheers
diff mbox

Patch

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index d341c14..819a7cd 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -416,6 +416,7 @@  static int omap2430_musb_init(struct musb *musb)
 		omap_musb_set_mailbox(glue);
 
 	phy_init(musb->phy);
+	phy_power_on(musb->phy);
 
 	pm_runtime_put_noidle(musb->controller);
 	return 0;
@@ -478,6 +479,7 @@  static int omap2430_musb_exit(struct musb *musb)
 	del_timer_sync(&musb_idle_timer);
 
 	omap2430_low_level_exit(musb);
+	phy_power_off(musb->phy);
 	phy_exit(musb->phy);
 
 	return 0;