Skip to contentSkip to conversation

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

PATCH In review [email protected] 2 participants 3 messages Mar 29, 2011 Multifunction devices (MFD)

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 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(-)
drivers/mfd/tps6586x.c +18 -0
index b600808..1842b98 100644
@@ -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)
Signature · 1 line
1.7.0
#1 lore raw

+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)".

Quoted 53 lines · Wei Ni

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(-)
drivers/mfd/tps6586x.c +18 -0
index b600808..1842b98 100644
@@ -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)
author
#2 lore raw

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)".

Quoted 53 lines · Wei Ni

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(-)
drivers/mfd/tps6586x.c +18 -0
index b600808..1842b98 100644
@@ -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)