From: Tony Lindgren <tony@atomide.com>
To: NeilBrown <neilb@suse.de>
Cc: Felipe Balbi <balbi@ti.com>,
Kishon Vijay Abraham I <kishon@ti.com>,
linux-omap@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>,
GTA04 owners <gta04-owner@goldelico.com>
Subject: Re: [PATCH 1/4] usb: phy: twl4030: make runtime pm more reliable.
Date: Tue, 24 Feb 2015 12:44:11 -0800 [thread overview]
Message-ID: <20150224204410.GJ11056@atomide.com> (raw)
In-Reply-To: <20150224034036.31400.6133.stgit@notabene.brown>
* NeilBrown <neilb@suse.de> [150223 19:45]:
> A construct like:
>
> if (pm_runtime_suspended(twl->dev))
> pm_runtime_get_sync(twl->dev);
>
> is against the spirit of the runtime_pm interface as it
> makes the internal refcounting useless.
>
> In this case it is also racy, particularly as 'put_autosuspend'
> is use to drop a reference.
> When that happens a timer is started and the device is
> runtime-suspended after the timeout.
> If the above code runs in this window, the device will not be
> found to be suspended so no pm_runtime reference is taken.
> When the timer expires the device will be suspended, which is
> against the intention of the code.
>
> So be more direct is taking and dropping references.
> If twl->linkstat is VBUS_VALID or ID_GROUND, then hold a
> pm_runtime reference, otherwise don't.
Looks good to me, thanks for fixing it. I've tested this series
on beagleboard-xm by plugging and unplugging devices and
switching between host and peripheral mode, things still
idle properly for off-idle. So please feel free to add:
Tested-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: NeilBrown <neilb@suse.de>
> ---
> drivers/phy/phy-twl4030-usb.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 8e87f54671f3..97c59074233f 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -536,8 +536,13 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
>
> mutex_lock(&twl->lock);
> if (status >= 0 && status != twl->linkstat) {
> + status_changed =
> + (twl->linkstat == OMAP_MUSB_VBUS_VALID ||
> + twl->linkstat == OMAP_MUSB_ID_GROUND)
> + !=
> + (status == OMAP_MUSB_VBUS_VALID ||
> + status == OMAP_MUSB_ID_GROUND);
> twl->linkstat = status;
> - status_changed = true;
> }
> mutex_unlock(&twl->lock);
>
> @@ -555,13 +560,10 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
> */
> if ((status == OMAP_MUSB_VBUS_VALID) ||
> (status == OMAP_MUSB_ID_GROUND)) {
> - if (pm_runtime_suspended(twl->dev))
> - pm_runtime_get_sync(twl->dev);
> + pm_runtime_get_sync(twl->dev);
> } else {
> - if (pm_runtime_active(twl->dev)) {
> - pm_runtime_mark_last_busy(twl->dev);
> - pm_runtime_put_autosuspend(twl->dev);
> - }
> + pm_runtime_mark_last_busy(twl->dev);
> + pm_runtime_put_autosuspend(twl->dev);
> }
> omap_musb_mailbox(status);
> }
> @@ -768,6 +770,10 @@ 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 (twl->linkstat == OMAP_MUSB_VBUS_VALID ||
> + twl->linkstat == OMAP_MUSB_ID_GROUND)
> + pm_runtime_put_noidle(twl->dev);
> pm_runtime_mark_last_busy(twl->dev);
> pm_runtime_put(twl->dev);
>
>
>
next prev parent reply other threads:[~2015-02-24 20:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 3:40 [PATCH 0/4] Enhancements to twl4030 phy to support better charging NeilBrown
2015-02-24 3:40 ` NeilBrown
2015-02-24 3:40 ` [PATCH 4/4] usb: phy: twl4030: test ID resistance to see if charger is present NeilBrown
2015-02-24 3:40 ` NeilBrown
2015-03-02 21:04 ` Pavel Machek
2015-03-04 6:40 ` NeilBrown
2015-02-24 3:40 ` [PATCH 3/4] usb: phy: twl4030: add support for reading restore on ID pin NeilBrown
2015-02-24 3:40 ` NeilBrown
2015-03-02 21:04 ` Pavel Machek
2015-03-04 6:35 ` NeilBrown
2015-03-04 6:54 ` [Gta04-owner] " Dr. H. Nikolaus Schaller
2015-03-22 6:05 ` NeilBrown
2015-03-04 10:17 ` Pavel Machek
2015-02-24 3:40 ` [PATCH 2/4] usb: phy: twl4030: allow charger to see usb current draw limits NeilBrown
2015-02-24 3:40 ` NeilBrown
2015-03-02 21:03 ` Pavel Machek
2015-03-04 6:17 ` NeilBrown
2015-02-24 3:40 ` [PATCH 1/4] usb: phy: twl4030: make runtime pm more reliable NeilBrown
2015-02-24 3:40 ` NeilBrown
2015-02-24 20:44 ` Tony Lindgren [this message]
2015-03-02 21:03 ` Pavel Machek
2015-03-04 6:24 ` NeilBrown
2015-02-24 20:46 ` [PATCH 0/4] Enhancements to twl4030 phy to support better charging Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150224204410.GJ11056@atomide.com \
--to=tony@atomide.com \
--cc=balbi@ti.com \
--cc=gta04-owner@goldelico.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=neilb@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.