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

[email protected]

author

2011-03-29 06:17 UTC #0 lore raw

PATCH 1/1 mfd: call disable_irq()/enable_irq() in suspend/resume

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 |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

drivers/mfd/tps6586x.c +20 -0

index b600808..c7bd96b 100644
@@ -569,6 +569,22 @@ 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)
+{
+	if (client->irq)
+		disable_irq(client->irq);
+	return 0;
+}
+
+static int tps6586x_resume(struct i2c_client *client)
+{
+	if (client->irq)
+		enable_irq(client->irq);
+	return 0;
+}
+#endif
+
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",

@@ -577,6 +593,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)

Signature · 1 line

1.7.0

Wei Ni

author

2011-03-30 06:19 UTC #1 lore raw

Hi, all
Could anyone review this patch?

Thanks
Wei.

-----Original Message-----
From: Wei Ni
Sent: Tuesday, March 29, 2011 2:17 PM
To: [email protected]; [email protected]
Cc: [email protected]; Varun Wadekar; Wei Ni
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 |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

drivers/mfd/tps6586x.c +20 -0

index b600808..c7bd96b 100644
@@ -569,6 +569,22 @@ 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)
+{
+	if (client->irq)
+		disable_irq(client->irq);
+	return 0;
+}
+
+static int tps6586x_resume(struct i2c_client *client)
+{
+	if (client->irq)
+		enable_irq(client->irq);
+	return 0;
+}
+#endif
+
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",

@@ -577,6 +593,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)

Signature · 1 line

1.7.0

Wei Ni

author

2011-04-18 09:57 UTC #2 lore raw

Hi, all
Does there have any updates for this patch?

Thanks
Wei.

-----Original Message-----
From: Wei Ni
Sent: Wednesday, March 30, 2011 2:20 PM
To: [email protected]; [email protected]
Cc: [email protected]; Varun Wadekar; Wei Ni; Emily Jiang
Subject: RE: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

Hi, all
Could anyone review this patch?

Thanks
Wei.

-----Original Message-----
From: Wei Ni
Sent: Tuesday, March 29, 2011 2:17 PM
To: [email protected]; [email protected]
Cc: [email protected]; Varun Wadekar; Wei Ni
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 |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

drivers/mfd/tps6586x.c +20 -0

index b600808..c7bd96b 100644
@@ -569,6 +569,22 @@ 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)
+{
+	if (client->irq)
+		disable_irq(client->irq);
+	return 0;
+}
+
+static int tps6586x_resume(struct i2c_client *client)
+{
+	if (client->irq)
+		enable_irq(client->irq);
+	return 0;
+}
+#endif
+
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",

@@ -577,6 +593,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)

Signature · 1 line

1.7.0

Samuel Ortiz

2011-05-02 13:16 UTC #3 lore raw

Hi Wei,

Quoted 9 lines

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.

I think something like this would make more sense:

drivers/mfd/tps6586x.c +26 -0

index bba26d9..a5feeb5 100644
@@ -569,10 +569,36 @@ static const struct i2c_device_id tps6586x_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
 
+#ifdef CONFIG_PM
+static int tps6586x_suspend(struct device *dev)
+{
+	struct i2c_client *i2c = to_i2c_client(dev);
+
+	if (device_may_wakeup(&i2c->dev) && i2c->irq)
+		enable_irq_wake(i2c->irq);
+
+	return 0;
+}
+
+static int tps6586x_resume(struct device *dev)
+{
+	struct i2c_client *i2c = to_i2c_client(dev);
+
+	if (device_may_wakeup(&i2c->dev) && i2c->irq)
+		disable_irq_wake(i2c->irq);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_suspend, tps6586x_resume,
+			    NULL);
+
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",
 		.owner	= THIS_MODULE,
+		.pm     = tps6586x_pm_ops,
 	},
 	.probe		= tps6586x_i2c_probe,
 	.remove		= __devexit_p(tps6586x_i2c_remove),

Could you please try ?

Cheers,
Samuel.

Signature · 2 lines

Intel Open Source Technology Centre
http://oss.intel.com/

Wei Ni

author

2011-05-04 06:49 UTC #4 lore raw

Hi, Samuel
I tried your codes, it looks ok, the error messages disappeared. Could you submit your patch?

BTW, what kernel version do you use?
In my 2.6.39, the SIMPLE_DEV_PM_OPS only have 3 arguments,
and it should be" .pm = &tps6586x_pm_ops,"

Thanks
Wei.

-----Original Message-----
From: Samuel Ortiz [mailto:[email protected]]
Sent: Monday, May 02, 2011 9:16 PM
To: Wei Ni
Cc: [email protected]; [email protected]; Varun Wadekar; Emily Jiang
Subject: Re: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

Hi Wei,

Quoted 9 lines

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.

I think something like this would make more sense:

drivers/mfd/tps6586x.c +26 -0

index bba26d9..a5feeb5 100644
@@ -569,10 +569,36 @@ static const struct i2c_device_id tps6586x_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
 
+#ifdef CONFIG_PM
+static int tps6586x_suspend(struct device *dev)
+{
+	struct i2c_client *i2c = to_i2c_client(dev);
+
+	if (device_may_wakeup(&i2c->dev) && i2c->irq)
+		enable_irq_wake(i2c->irq);
+
+	return 0;
+}
+
+static int tps6586x_resume(struct device *dev)
+{
+	struct i2c_client *i2c = to_i2c_client(dev);
+
+	if (device_may_wakeup(&i2c->dev) && i2c->irq)
+		disable_irq_wake(i2c->irq);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_suspend, tps6586x_resume,
+			    NULL);
+
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",
 		.owner	= THIS_MODULE,
+		.pm     = tps6586x_pm_ops,
 	},
 	.probe		= tps6586x_i2c_probe,
 	.remove		= __devexit_p(tps6586x_i2c_remove),

Could you please try ?

Cheers,
Samuel.

Signature · 2 lines

Intel Open Source Technology Centre
http://oss.intel.com/

Wei Ni

author

2011-05-10 08:24 UTC #5 lore raw

Hi, Samuel
I tried your codes again, it seems have some problems, it still have the error message when resume.
My changes works fine on my side.
The enable_irq_wake/disable_irq_wake will call desc->irq_data.chip->irq_set_wake() But it seems the tps6586x didn't define the irq_set_wake(), so this function will not affect the irq.

Thanks
Wei.

-----Original Message-----
From: Wei Ni
Sent: Wednesday, May 04, 2011 2:49 PM
To: 'Samuel Ortiz'
Cc: [email protected]; [email protected]; Varun Wadekar
Subject: RE: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

Hi, Samuel
I tried your codes, it looks ok, the error messages disappeared. Could you submit your patch?

BTW, what kernel version do you use?
In my 2.6.39, the SIMPLE_DEV_PM_OPS only have 3 arguments,
and it should be" .pm = &tps6586x_pm_ops,"

Thanks
Wei.

-----Original Message-----
From: Samuel Ortiz [mailto:[email protected]]
Sent: Monday, May 02, 2011 9:16 PM
To: Wei Ni
Cc: [email protected]; [email protected]; Varun Wadekar; Emily Jiang
Subject: Re: [PATCH] mfd: call disable_irq()/enable_irq() in suspend/resume

Hi Wei,

Quoted 9 lines

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.

I think something like this would make more sense:

drivers/mfd/tps6586x.c +26 -0

index bba26d9..a5feeb5 100644
@@ -569,10 +569,36 @@ static const struct i2c_device_id tps6586x_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
 
+#ifdef CONFIG_PM
+static int tps6586x_suspend(struct device *dev)
+{
+	struct i2c_client *i2c = to_i2c_client(dev);
+
+	if (device_may_wakeup(&i2c->dev) && i2c->irq)
+		enable_irq_wake(i2c->irq);
+
+	return 0;
+}
+
+static int tps6586x_resume(struct device *dev)
+{
+	struct i2c_client *i2c = to_i2c_client(dev);
+
+	if (device_may_wakeup(&i2c->dev) && i2c->irq)
+		disable_irq_wake(i2c->irq);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_suspend, tps6586x_resume,
+			    NULL);
+
 static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",
 		.owner	= THIS_MODULE,
+		.pm     = tps6586x_pm_ops,
 	},
 	.probe		= tps6586x_i2c_probe,
 	.remove		= __devexit_p(tps6586x_i2c_remove),

Could you please try ?

Cheers,
Samuel.

Signature · 2 lines

Intel Open Source Technology Centre
http://oss.intel.com/