* [PATCH] phy: phy-twl4030-usb: Disable PHY for suspend
@ 2021-07-27 10:45 Tony Lindgren
2021-08-06 12:02 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Tony Lindgren @ 2021-07-27 10:45 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul
Cc: linux-phy, linux-usb, linux-omap, Andreas Kemnade
Since commit 88d26136a256 ("PM: Prevent runtime suspend during system
resume"), PM runtime will not let devices idle during system suspend.
This is because of the pm_runtime_get_noresume() call done in
device_prepare() that is not released until at device_complete() after
resume.
We must now disable the USB PHY in suspend if no USB cable is connected.
Cc: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/phy/ti/phy-twl4030-usb.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/phy/ti/phy-twl4030-usb.c b/drivers/phy/ti/phy-twl4030-usb.c
--- a/drivers/phy/ti/phy-twl4030-usb.c
+++ b/drivers/phy/ti/phy-twl4030-usb.c
@@ -162,6 +162,8 @@ struct twl4030_usb {
atomic_t connected;
bool vbus_supplied;
bool musb_mailbox_pending;
+ unsigned long runtime_suspended:1;
+ unsigned long needs_resume:1;
struct delayed_work id_workaround_work;
};
@@ -384,6 +386,9 @@ static void __twl4030_phy_power(struct twl4030_usb *twl, int on)
WARN_ON(twl4030_usb_write_verify(twl, PHY_PWR_CTRL, pwr) < 0);
}
+static int twl4030_usb_runtime_suspend(struct device *dev);
+static int twl4030_usb_runtime_resume(struct device *dev);
+
static int __maybe_unused twl4030_usb_suspend(struct device *dev)
{
struct twl4030_usb *twl = dev_get_drvdata(dev);
@@ -395,6 +400,10 @@ static int __maybe_unused twl4030_usb_suspend(struct device *dev)
*/
dev_dbg(twl->dev, "%s\n", __func__);
disable_irq(twl->irq);
+ if (!twl->runtime_suspended && !atomic_read(&twl->connected)) {
+ twl4030_usb_runtime_suspend(dev);
+ twl->needs_resume = 1;
+ }
return 0;
}
@@ -405,9 +414,13 @@ static int __maybe_unused twl4030_usb_resume(struct device *dev)
dev_dbg(twl->dev, "%s\n", __func__);
enable_irq(twl->irq);
+ if (twl->needs_resume)
+ twl4030_usb_runtime_resume(dev);
/* check whether cable status changed */
twl4030_usb_irq(0, twl);
+ twl->runtime_suspended = 0;
+
return 0;
}
@@ -422,6 +435,8 @@ static int __maybe_unused twl4030_usb_runtime_suspend(struct device *dev)
regulator_disable(twl->usb1v8);
regulator_disable(twl->usb3v1);
+ twl->runtime_suspended = 1;
+
return 0;
}
--
2.32.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] phy: phy-twl4030-usb: Disable PHY for suspend
2021-07-27 10:45 [PATCH] phy: phy-twl4030-usb: Disable PHY for suspend Tony Lindgren
@ 2021-08-06 12:02 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2021-08-06 12:02 UTC (permalink / raw)
To: Tony Lindgren
Cc: Kishon Vijay Abraham I, linux-phy, linux-usb, linux-omap,
Andreas Kemnade
On 27-07-21, 13:45, Tony Lindgren wrote:
> Since commit 88d26136a256 ("PM: Prevent runtime suspend during system
> resume"), PM runtime will not let devices idle during system suspend.
>
> This is because of the pm_runtime_get_noresume() call done in
> device_prepare() that is not released until at device_complete() after
> resume.
>
> We must now disable the USB PHY in suspend if no USB cable is connected.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-06 12:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-27 10:45 [PATCH] phy: phy-twl4030-usb: Disable PHY for suspend Tony Lindgren
2021-08-06 12:02 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).