2011-03-29 05:54:43

by Wei Ni

[permalink] [raw]
Subject: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

From: Wei Ni <[email protected]>

When use rtc tps6586x wakealarm to suspend/resume system,
it will show a lot error messages:
"tps6586x 4-0034: failed to read interrupt status
tps6586x 4-0034: failed reading from 0xb5"
After resume, the system will call the mfd tps6586x driver's interrupt handle
tps6586x_irq(). This handle will read tps6586x interrupt status (0xb5), but at
that time the i2c driver didn't resume yet, so the reading will be failed.
I call the disble_irq in the suspend, and enable_irq in the resume, which will
delay the delivery of the irq until the i2c driver has been resumed.

Signed-off-by: Wei Ni <[email protected]>
---
drivers/mfd/tps6586x.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index b600808..1842b98 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -569,6 +569,20 @@ static const struct i2c_device_id tps6586x_id_table[] = {
};
MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);

+#ifdef CONFIG_PM
+static int tps6586x_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+ disable_irq(client->irq);
+ return 0;
+}
+
+static int tps6586x_resume(struct i2c_client *client)
+{
+ enable_irq(client->irq);
+ return 0;
+}
+#endif
+
static struct i2c_driver tps6586x_driver = {
.driver = {
.name = "tps6586x",
@@ -577,6 +591,10 @@ static struct i2c_driver tps6586x_driver = {
.probe = tps6586x_i2c_probe,
.remove = __devexit_p(tps6586x_i2c_remove),
.id_table = tps6586x_id_table,
+#ifdef CONFIG_PM
+ .suspend = tps6586x_suspend,
+ .resume = tps6586x_resume,
+#endif
};

static int __init tps6586x_init(void)
--
1.7.0


2011-03-29 05:59:12

by Varun Wadekar

[permalink] [raw]
Subject: Re: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

+static int tps6586x_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+ disable_irq(client->irq);
+ return 0;
+}
+
+static int tps6586x_resume(struct i2c_client *client)
+{
+ enable_irq(client->irq);
+ return 0;
+}


disable_irq and enable_irq should be under "if (client->irq)".

On Tuesday 29 March 2011 11:21 AM, Wei Ni wrote:
> From: Wei Ni <[email protected]>
>
> When use rtc tps6586x wakealarm to suspend/resume system,
> it will show a lot error messages:
> "tps6586x 4-0034: failed to read interrupt status
> tps6586x 4-0034: failed reading from 0xb5"
> After resume, the system will call the mfd tps6586x driver's interrupt handle
> tps6586x_irq(). This handle will read tps6586x interrupt status (0xb5), but at
> that time the i2c driver didn't resume yet, so the reading will be failed.
> I call the disble_irq in the suspend, and enable_irq in the resume, which will
> delay the delivery of the irq until the i2c driver has been resumed.
>
> Signed-off-by: Wei Ni <[email protected]>
> ---
> drivers/mfd/tps6586x.c | 18 ++++++++++++++++++
> 1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index b600808..1842b98 100644
> --- a/drivers/mfd/tps6586x.c
> +++ b/drivers/mfd/tps6586x.c
> @@ -569,6 +569,20 @@ static const struct i2c_device_id tps6586x_id_table[] = {
> };
> MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
>
> +#ifdef CONFIG_PM
> +static int tps6586x_suspend(struct i2c_client *client, pm_message_t mesg)
> +{
> + disable_irq(client->irq);
> + return 0;
> +}
> +
> +static int tps6586x_resume(struct i2c_client *client)
> +{
> + enable_irq(client->irq);
> + return 0;
> +}
> +#endif
> +
> static struct i2c_driver tps6586x_driver = {
> .driver = {
> .name = "tps6586x",
> @@ -577,6 +591,10 @@ static struct i2c_driver tps6586x_driver = {
> .probe = tps6586x_i2c_probe,
> .remove = __devexit_p(tps6586x_i2c_remove),
> .id_table = tps6586x_id_table,
> +#ifdef CONFIG_PM
> + .suspend = tps6586x_suspend,
> + .resume = tps6586x_resume,
> +#endif
> };
>
> static int __init tps6586x_init(void)

2011-03-29 06:04:23

by Wei Ni

[permalink] [raw]
Subject: RE: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

Oh, sorry, it's my mistake.
I will create a new patch.

Thanks
Wei.

-----Original Message-----
From: Varun Wadekar [mailto:[email protected]]
Sent: Tuesday, March 29, 2011 1:59 PM
To: Wei Ni
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

+static int tps6586x_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+ disable_irq(client->irq);
+ return 0;
+}
+
+static int tps6586x_resume(struct i2c_client *client)
+{
+ enable_irq(client->irq);
+ return 0;
+}


disable_irq and enable_irq should be under "if (client->irq)".

On Tuesday 29 March 2011 11:21 AM, Wei Ni wrote:
> From: Wei Ni <[email protected]>
>
> When use rtc tps6586x wakealarm to suspend/resume system,
> it will show a lot error messages:
> "tps6586x 4-0034: failed to read interrupt status
> tps6586x 4-0034: failed reading from 0xb5"
> After resume, the system will call the mfd tps6586x driver's interrupt handle
> tps6586x_irq(). This handle will read tps6586x interrupt status (0xb5), but at
> that time the i2c driver didn't resume yet, so the reading will be failed.
> I call the disble_irq in the suspend, and enable_irq in the resume, which will
> delay the delivery of the irq until the i2c driver has been resumed.
>
> Signed-off-by: Wei Ni <[email protected]>
> ---
> drivers/mfd/tps6586x.c | 18 ++++++++++++++++++
> 1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index b600808..1842b98 100644
> --- a/drivers/mfd/tps6586x.c
> +++ b/drivers/mfd/tps6586x.c
> @@ -569,6 +569,20 @@ static const struct i2c_device_id tps6586x_id_table[] = {
> };
> MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
>
> +#ifdef CONFIG_PM
> +static int tps6586x_suspend(struct i2c_client *client, pm_message_t mesg)
> +{
> + disable_irq(client->irq);
> + return 0;
> +}
> +
> +static int tps6586x_resume(struct i2c_client *client)
> +{
> + enable_irq(client->irq);
> + return 0;
> +}
> +#endif
> +
> static struct i2c_driver tps6586x_driver = {
> .driver = {
> .name = "tps6586x",
> @@ -577,6 +591,10 @@ static struct i2c_driver tps6586x_driver = {
> .probe = tps6586x_i2c_probe,
> .remove = __devexit_p(tps6586x_i2c_remove),
> .id_table = tps6586x_id_table,
> +#ifdef CONFIG_PM
> + .suspend = tps6586x_suspend,
> + .resume = tps6586x_resume,
> +#endif
> };
>
> static int __init tps6586x_init(void)