[PATCH 0/2] Two phy-twl4030-usb fixes for unloading the module

[PATCH 0/2] Two phy-twl4030-usb fixes for unloading the module

[Tony Lindgren]

Hi,

Here are two fixes for rmmod and PM. These can be merged separately after
the review from the MUSB related changes.

Regards,

Tony


Tony Lindgren (2):
  phy: twl4030-usb: Relase usb phy on unload
  phy: twl4030-usb: Fix unbalanced pm_runtime_enable on module reload

 drivers/phy/phy-twl4030-usb.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

-- 
2.6.2

[PATCH 1/2] phy: twl4030-usb: Relase usb phy on unload

[Tony Lindgren]

Otherwise rmmod omap2430; rmmod phy-twl4030-usb; modprobe omap2430
will try to use a non-existing phy and oops:

Unable to handle kernel paging request at virtual address b6f7c1f0
...
[<c048a284>] (devm_usb_get_phy_by_node) from [<bf0758ac>]
(omap2430_musb_init+0x44/0x2b4 [omap2430])
[<bf0758ac>] (omap2430_musb_init [omap2430]) from [<bf055ec0>]
(musb_init_controller+0x194/0x878 [musb_hdrc])

Cc: Bin Liu <b-liu@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: NeilBrown <neil@brown.name>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/phy/phy-twl4030-usb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 3a707dd..79870c4 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -750,6 +750,7 @@ static int twl4030_usb_remove(struct platform_device *pdev)
 	struct twl4030_usb *twl = platform_get_drvdata(pdev);
 	int val;
 
+	usb_remove_phy(&twl->phy);
 	pm_runtime_get_sync(twl->dev);
 	cancel_delayed_work(&twl->id_workaround_work);
 	device_remove_file(twl->dev, &dev_attr_vbus);
-- 
2.6.2

[PATCH 2/2] phy: twl4030-usb: Fix unbalanced pm_runtime_enable on module reload

[Tony Lindgren]

If we reload phy-twl4030-usb, we get a warning about unbalanced
pm_runtime_enable. Let's fix the issue and also fix idling of the
device on unload before we attempt to shut it down.

If we don't properly idle the PHY before shutting it down on removal,
the twl4030 ends up consuming about 62mW of extra power compared to
running idle with the module loaded.

Cc: Bin Liu <b-liu@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: NeilBrown <neil@brown.name>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/phy/phy-twl4030-usb.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 79870c4..f96065a 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -715,6 +715,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
 	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_set_autosuspend_delay(&pdev->dev, 2000);
 	pm_runtime_enable(&pdev->dev);
+	pm_runtime_get_sync(&pdev->dev);
 
 	/* Our job is to use irqs and status from the power module
 	 * to keep the transceiver disabled when nothing's connected.
@@ -758,6 +759,13 @@ static int twl4030_usb_remove(struct platform_device *pdev)
 	/* set transceiver mode to power on defaults */
 	twl4030_usb_set_mode(twl, -1);
 
+	/* idle ulpi before powering off */
+	if (cable_present(twl->linkstat))
+		pm_runtime_put_noidle(twl->dev);
+	pm_runtime_mark_last_busy(twl->dev);
+	pm_runtime_put_sync_suspend(twl->dev);
+	pm_runtime_disable(twl->dev);
+
 	/* autogate 60MHz ULPI clock,
 	 * clear dpll clock request for i2c access,
 	 * disable 32KHz
@@ -772,11 +780,6 @@ static int twl4030_usb_remove(struct platform_device *pdev)
 	/* disable complete OTG block */
 	twl4030_usb_clear_bits(twl, POWER_CTRL, POWER_CTRL_OTG_ENAB);
 
-	if (cable_present(twl->linkstat))
-		pm_runtime_put_noidle(twl->dev);
-	pm_runtime_mark_last_busy(twl->dev);
-	pm_runtime_put(twl->dev);
-
 	return 0;
 }
 
-- 
2.6.2

Re: [PATCH 0/2] Two phy-twl4030-usb fixes for unloading the module

[Tony Lindgren]

Hi Kishon,

* Tony Lindgren <tony@atomide.com> [151130 21:40]:
> Hi,
> 
> Here are two fixes for rmmod and PM. These can be merged separately after
> the review from the MUSB related changes.

Looks like these two fixes never got merged. Care to merge
these for v4.5-rc cycle with Cc stable v4.4?

Without these omap3 PM is blocked as the USB modules can
never be unloaded.

I can also merge these via the ARM SoC tree if you ack and have
no other fixes for the -rc cycle.

Regards,

Tony

> Tony Lindgren (2):
>   phy: twl4030-usb: Relase usb phy on unload
>   phy: twl4030-usb: Fix unbalanced pm_runtime_enable on module reload
> 
>  drivers/phy/phy-twl4030-usb.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> -- 
> 2.6.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 0/2] Two phy-twl4030-usb fixes for unloading the module

[Kishon Vijay Abraham I]

Hi Tony,

On Tuesday 09 February 2016 01:21 AM, Tony Lindgren wrote:
> Hi Kishon,
> 
> * Tony Lindgren <tony@atomide.com> [151130 21:40]:
>> Hi,
>>
>> Here are two fixes for rmmod and PM. These can be merged separately after
>> the review from the MUSB related changes.
> 
> Looks like these two fixes never got merged. Care to merge
> these for v4.5-rc cycle with Cc stable v4.4?
> 
> Without these omap3 PM is blocked as the USB modules can
> never be unloaded.
> 
> I can also merge these via the ARM SoC tree if you ack and have
> no other fixes for the -rc cycle.

merged this to linux-phy now. I have a couple of other fixes for this -rc
cycle. Will send this along with the other fixes.

Thanks
Kishon

> 
> Regards,
> 
> Tony
> 
>> Tony Lindgren (2):
>>   phy: twl4030-usb: Relase usb phy on unload
>>   phy: twl4030-usb: Fix unbalanced pm_runtime_enable on module reload
>>
>>  drivers/phy/phy-twl4030-usb.c | 14 +++++++++-----
>>  1 file changed, 9 insertions(+), 5 deletions(-)
>>
>> -- 
>> 2.6.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>

Re: [PATCH 0/2] Two phy-twl4030-usb fixes for unloading the module

[Tony Lindgren]

* Kishon Vijay Abraham I <kishon@ti.com> [160208 21:13]:
> Hi Tony,
> 
> On Tuesday 09 February 2016 01:21 AM, Tony Lindgren wrote:
> > Hi Kishon,
> > 
> > * Tony Lindgren <tony@atomide.com> [151130 21:40]:
> >> Hi,
> >>
> >> Here are two fixes for rmmod and PM. These can be merged separately after
> >> the review from the MUSB related changes.
> > 
> > Looks like these two fixes never got merged. Care to merge
> > these for v4.5-rc cycle with Cc stable v4.4?
> > 
> > Without these omap3 PM is blocked as the USB modules can
> > never be unloaded.
> > 
> > I can also merge these via the ARM SoC tree if you ack and have
> > no other fixes for the -rc cycle.
> 
> merged this to linux-phy now. I have a couple of other fixes for this -rc
> cycle. Will send this along with the other fixes.

OK thanks!

Regards,

Tony