i2c: nomadik: Fixup system suspend

Message ID 1397138376-28427-1-git-send-email-ulf.hansson@linaro.org
State Accepted
Commit 9219982bc64a41ec7745668b06f86e97b498e10a
Headers show

Commit Message

Ulf Hansson April 10, 2014, 1:59 p.m.
For !CONFIG_PM_RUNTIME, the device were never put back into active
state while resuming.

For CONFIG_PM_RUNTIME, we blindly trusted the device to be inactive
while we were about to handle it at suspend late, which is just too
optimistic.

Even if the driver uses pm_runtime_put_sync() after each tranfer to
return it's runtime PM resources, there are no guarantees this will
actually mean the device will inactivated. The reason is that the PM
core will prevent runtime suspend during system suspend, and thus when
a transfer occurs during the early phases of system suspend the device
will be kept active after the transfer.

To handle both issues above, use pm_runtime_force_suspend|resume() from
the system suspend|resume callbacks.

Cc: Alessandro Rubini <rubini@unipv.it>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

Do note, this patch were sent during the previous kernel release cycle, as
a part of another patchset on the PM core. Back then, it provided proof of
concept, for the new runtime PM helper functions:
pm_runtime_force_suspend|resume().

---
 drivers/i2c/busses/i2c-nomadik.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Linus Walleij April 10, 2014, 6:49 p.m. | #1
On Thu, Apr 10, 2014 at 3:59 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:

> For !CONFIG_PM_RUNTIME, the device were never put back into active
> state while resuming.
>
> For CONFIG_PM_RUNTIME, we blindly trusted the device to be inactive
> while we were about to handle it at suspend late, which is just too
> optimistic.
>
> Even if the driver uses pm_runtime_put_sync() after each tranfer to
> return it's runtime PM resources, there are no guarantees this will
> actually mean the device will inactivated. The reason is that the PM
> core will prevent runtime suspend during system suspend, and thus when
> a transfer occurs during the early phases of system suspend the device
> will be kept active after the transfer.
>
> To handle both issues above, use pm_runtime_force_suspend|resume() from
> the system suspend|resume callbacks.
>
> Cc: Alessandro Rubini <rubini@unipv.it>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson May 6, 2014, 9:31 a.m. | #2
On 10 April 2014 20:49, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Thu, Apr 10, 2014 at 3:59 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
>> For !CONFIG_PM_RUNTIME, the device were never put back into active
>> state while resuming.
>>
>> For CONFIG_PM_RUNTIME, we blindly trusted the device to be inactive
>> while we were about to handle it at suspend late, which is just too
>> optimistic.
>>
>> Even if the driver uses pm_runtime_put_sync() after each tranfer to
>> return it's runtime PM resources, there are no guarantees this will
>> actually mean the device will inactivated. The reason is that the PM
>> core will prevent runtime suspend during system suspend, and thus when
>> a transfer occurs during the early phases of system suspend the device
>> will be kept active after the transfer.
>>
>> To handle both issues above, use pm_runtime_force_suspend|resume() from
>> the system suspend|resume callbacks.
>>
>> Cc: Alessandro Rubini <rubini@unipv.it>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: Wolfram Sang <wsa@the-dreams.de>
>> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

Hi Wolfram,

This patch as has been around for a while (in some other versions as
well), would you mind picking it up for 3.16?

Kind regards
Ulf Hansson

>
> Yours,
> Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson May 15, 2014, 7:15 a.m. | #3
On 6 May 2014 11:31, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 10 April 2014 20:49, Linus Walleij <linus.walleij@linaro.org> wrote:
>> On Thu, Apr 10, 2014 at 3:59 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>>
>>> For !CONFIG_PM_RUNTIME, the device were never put back into active
>>> state while resuming.
>>>
>>> For CONFIG_PM_RUNTIME, we blindly trusted the device to be inactive
>>> while we were about to handle it at suspend late, which is just too
>>> optimistic.
>>>
>>> Even if the driver uses pm_runtime_put_sync() after each tranfer to
>>> return it's runtime PM resources, there are no guarantees this will
>>> actually mean the device will inactivated. The reason is that the PM
>>> core will prevent runtime suspend during system suspend, and thus when
>>> a transfer occurs during the early phases of system suspend the device
>>> will be kept active after the transfer.
>>>
>>> To handle both issues above, use pm_runtime_force_suspend|resume() from
>>> the system suspend|resume callbacks.
>>>
>>> Cc: Alessandro Rubini <rubini@unipv.it>
>>> Cc: Linus Walleij <linus.walleij@linaro.org>
>>> Cc: Wolfram Sang <wsa@the-dreams.de>
>>> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> Hi Wolfram,
>
> This patch as has been around for a while (in some other versions as
> well), would you mind picking it up for 3.16?
>

Ping.

I noticed you merged my other i2c-nomadik patch yesterday - thought I
might remind you about this one as well.

Kind regards
Ulf Hansson
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wolfram Sang May 15, 2014, 7:48 a.m. | #4
> I noticed you merged my other i2c-nomadik patch yesterday - thought I
> might remind you about this one as well.

I was working on for-current. I'll start working on for-next these days.
I use patchwork, as long as you cc the list, patches won't be forgotten
;)
Ulf Hansson May 15, 2014, 3:36 p.m. | #5
On 15 May 2014 09:48, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> I noticed you merged my other i2c-nomadik patch yesterday - thought I
>> might remind you about this one as well.
>
> I was working on for-current. I'll start working on for-next these days.
> I use patchwork, as long as you cc the list, patches won't be forgotten
> ;)

Thanks Wolfram, sorry for nagging! :-)

Kind regards
Ulf Hansson

>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wolfram Sang May 21, 2014, 8:33 a.m. | #6
On Thu, Apr 10, 2014 at 03:59:36PM +0200, Ulf Hansson wrote:
> For !CONFIG_PM_RUNTIME, the device were never put back into active
> state while resuming.
> 
> For CONFIG_PM_RUNTIME, we blindly trusted the device to be inactive
> while we were about to handle it at suspend late, which is just too
> optimistic.
> 
> Even if the driver uses pm_runtime_put_sync() after each tranfer to
> return it's runtime PM resources, there are no guarantees this will
> actually mean the device will inactivated. The reason is that the PM
> core will prevent runtime suspend during system suspend, and thus when
> a transfer occurs during the early phases of system suspend the device
> will be kept active after the transfer.
> 
> To handle both issues above, use pm_runtime_force_suspend|resume() from
> the system suspend|resume callbacks.
> 
> Cc: Alessandro Rubini <rubini@unipv.it>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Applied to for-next, thanks!

Patch

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 28cbe1b..7d27eee 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -879,19 +879,19 @@  static irqreturn_t i2c_irq_handler(int irq, void *arg)
 #ifdef CONFIG_PM_SLEEP
 static int nmk_i2c_suspend_late(struct device *dev)
 {
-	pinctrl_pm_select_sleep_state(dev);
+	int ret;
 
+	ret = pm_runtime_force_suspend(dev);
+	if (ret)
+		return ret;
+
+	pinctrl_pm_select_sleep_state(dev);
 	return 0;
 }
 
 static int nmk_i2c_resume_early(struct device *dev)
 {
-	/* First go to the default state */
-	pinctrl_pm_select_default_state(dev);
-	/* Then let's idle the pins until the next transfer happens */
-	pinctrl_pm_select_idle_state(dev);
-
-	return 0;
+	return pm_runtime_force_resume(dev);
 }
 #endif