ASoC: ts3a227e: do not report jack status when there is i2c read err
PATCH 1/1 ASoC: ts3a227e: do not report jack status when there is i2c read err
From: "Fang, Yang A" <[email protected]>
After suspend -> resume the ts3a227e_interrupt sometimes comes before i2c controller resume is called .regmap_read will return incorrect status and report a wrong jack status.We should return if there is read err,the interrupt will come again since it is level triggered and we are not yet clear the interrupt. In addtion,cht_bsw_max98090_ti machine driver registered additional notifier base on jack event which will program the audio codec.there will be codec timeout err if such event occurs prior to i2c controller is resumed.
--- sound/soc/codecs/ts3a227e.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
sound/soc/codecs/ts3a227e.c +16 -2
@@ -23,6 +23,7 @@#include "ts3a227e.h" struct ts3a227e { +struct device *dev;struct regmap *regmap;struct snd_soc_jack *jack;bool plugged;
@@ -189,16 +190,28 @@ static irqreturn_t ts3a227e_interrupt(int irq, void *data)struct ts3a227e *ts3a227e = (struct ts3a227e *)data;struct regmap *regmap = ts3a227e->regmap;unsigned int int_reg, kp_int_reg, acc_reg, i; +struct device *dev = ts3a227e->dev; +int ret;/* Check for plug/unplug. */ -regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); + ret =regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); +if (ret) { +dev_err (dev,"failed to clear interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +if (int_reg & (DETECTION_COMPLETE_EVENT |INS_REM_EVENT )) {regmap_read (regmap,TS3A227E_REG_ACCESSORY_STATUS , &acc_reg);ts3a227e_new_jack_state (ts3a227e, acc_reg); }/* Report any key events. */ -regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); + ret =regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); +if (ret) { +dev_err (dev,"failed to clear key interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +for (i =0 ; i <TS3A227E_NUM_BUTTONS ; i++) {if (kp_int_reg &PRESS_MASK (i)) ts3a227e->buttons_held |= (1 << i);
@@ -283,6 +296,7 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return -ENOMEM ;i2c_set_clientdata (i2c, ts3a227e); + ts3a227e->dev = dev; ts3a227e->regmap =devm_regmap_init_i2c (i2c, &ts3a227e_regmap_config);if (IS_ERR (ts3a227e->regmap))
Signature · 1 line
1.7.9.5
Quoted 10 lines · On Tue, Jun 30, 2015 at 9:18 PM, <[email protected]> wrote:
From: "Fang, Yang A" <[email protected]>
After suspend -> resume the
ts3a227e_interruptsometimes comes before i2c controller resume is called .regmap_read will return incorrect status and report a wrong jack status.We should return if there is read err,the interrupt will come again since it is level triggered and we are not yet clear the interrupt. In addtion,cht_bsw_max98090_ti machine driver registered additional notifier base on jack event which will program the audio codec.there will be codec timeout err if such event occurs prior to i2c controller is resumed.
Thanks, I think the error checking is good to have anyway, but should the interrupt also be disabled across suspend/resume? I'd hope this device's resume callback wouldn't happen until after the parent i2c bus is ready.
Quoted 64 lines
Signed-off-by Fang, Yang A <[email protected]>--- sound/soc/codecs/ts3a227e.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)sound/soc/codecs/ts3a227e.c +16
-3@@ -23,6 +23,7 @@#include "ts3a227e.h" struct ts3a227e { +struct device *dev;struct regmap *regmap;struct snd_soc_jack *jack;bool plugged;@@ -189,16 +190,28 @@ static irqreturn_t ts3a227e_interrupt(int irq, void *data)struct ts3a227e *ts3a227e = (struct ts3a227e *)data;struct regmap *regmap = ts3a227e->regmap;unsigned int int_reg, kp_int_reg, acc_reg, i; +struct device *dev = ts3a227e->dev; +int ret;/* Check for plug/unplug. */ -regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); + ret =regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); +if (ret) { +dev_err (dev,"failed to clear interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +if (int_reg & (DETECTION_COMPLETE_EVENT |INS_REM_EVENT )) {regmap_read (regmap,TS3A227E_REG_ACCESSORY_STATUS , &acc_reg);ts3a227e_new_jack_state (ts3a227e, acc_reg); }/* Report any key events. */ -regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); + ret =regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); +if (ret) { +dev_err (dev,"failed to clear key interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +for (i =0 ; i <TS3A227E_NUM_BUTTONS ; i++) {if (kp_int_reg &PRESS_MASK (i)) ts3a227e->buttons_held |= (1 << i);@@ -283,6 +296,7 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return -ENOMEM ;i2c_set_clientdata (i2c, ts3a227e); + ts3a227e->dev = dev; ts3a227e->regmap =devm_regmap_init_i2c (i2c, &ts3a227e_regmap_config);if (IS_ERR (ts3a227e->regmap)) --1.7.9.5
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 12 lines · Dylan Reid
Quoted 10 lines · On Tue, Jun 30, 2015 at 9:18 PM, <[email protected]> wrote:
From: "Fang, Yang A" <[email protected]>
After suspend -> resume the
ts3a227e_interruptsometimes comes before i2c controller resume is called .regmap_read will return incorrect status and report a wrong jack status.We should return if there is read err,the interrupt will come again since it is level triggered and we are not yet clear the interrupt. In addtion,cht_bsw_max98090_ti machine driver registered additional notifier base on jack event which will program the audio codec.there will be codec timeout err if such event occurs prior to i2c controller is resumed.
Quoted 4 lines
Thanks, I think the error checking is good to have anyway, but should the interrupt also be disabled across suspend/resume? I'd hope this device's resume callback wouldn't happen until after the parent i2c bus is ready.
I am looping Mika. I was expecting that interrupt would come after i2c bus is ready. but with current pinctrl-cherryview driver the interrupt comes in random order after resume.
Quoted 65 lines
Quoted 65 lines
Signed-off-by Fang, Yang A <[email protected]>--- sound/soc/codecs/ts3a227e.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)sound/soc/codecs/ts3a227e.c +16
-3@@ -23,6 +23,7 @@#include "ts3a227e.h" struct ts3a227e { +struct device *dev;struct regmap *regmap;struct snd_soc_jack *jack;bool plugged;@@ -189,16 +190,28 @@ static irqreturn_t ts3a227e_interrupt(int irq, void *data)struct ts3a227e *ts3a227e = (struct ts3a227e *)data;struct regmap *regmap = ts3a227e->regmap;unsigned int int_reg, kp_int_reg, acc_reg, i; +struct device *dev = ts3a227e->dev; +int ret;/* Check for plug/unplug. */ -regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); + ret =regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); +if (ret) { +dev_err (dev,"failed to clear interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +if (int_reg & (DETECTION_COMPLETE_EVENT |INS_REM_EVENT )) {regmap_read (regmap,TS3A227E_REG_ACCESSORY_STATUS , &acc_reg);ts3a227e_new_jack_state (ts3a227e, acc_reg); }/* Report any key events. */ -regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); + ret =regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); +if (ret) { +dev_err (dev,"failed to clear key interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +for (i =0 ; i <TS3A227E_NUM_BUTTONS ; i++) {if (kp_int_reg &PRESS_MASK (i)) ts3a227e->buttons_held |= (1 << i);@@ -283,6 +296,7 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return -ENOMEM ;i2c_set_clientdata (i2c, ts3a227e); + ts3a227e->dev = dev; ts3a227e->regmap =devm_regmap_init_i2c (i2c, &ts3a227e_regmap_config);if (IS_ERR (ts3a227e->regmap)) --1.7.9.5
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerQuoted 10 lines · Yang Fang
Quoted 4 lines · Dylan Reid
Thanks, I think the error checking is good to have anyway, but should the interrupt also be disabled across suspend/resume? I'd hope this device's resume callback wouldn't happen until after the parent i2c bus is ready.
I am looping Mika. I was expecting that interrupt would come after i2c bus is ready. but with current pinctrl-cherryview driver the interrupt comes in random order after resume.
I wouldn't rely on this, it's not going to be true in general - the interrupt could flag at any time after the interrupt controller is resumed so unless the I2C controller takes steps to ensure it is resumed before interrupts (which has its own complications) you could get an interrupt delivered prior to the I2C controller being ready. Look at how arizona handles this for one example of dealing with this problem, though it's not ideal.
Quoted 24 lines
-----Original Message-----
From: Mark Brown [mailto:[email protected]]
Sent: Wednesday, July 01, 2015 11:05 AM
To: Fang, Yang A
Cc: Dylan Reid; Liam Girdwood; [email protected]; Sripathi, Srinivas; Jain, Praveen K; Iriawan, Denny; Nujella, Sathyanarayana; [email protected]; [email protected]
Subject: Re: [alsa-devel] [PATCH] ASoC: ts3a227e: do not report jack status when there is i2c read errQuoted 10 lines · Yang Fang
Quoted 4 lines · Dylan Reid
Thanks, I think the error checking is good to have anyway, but should the interrupt also be disabled across suspend/resume? I'd hope this device's resume callback wouldn't happen until after the parent i2c bus is ready.
I am looping Mika. I was expecting that interrupt would come after i2c bus is ready. but with current pinctrl-cherryview driver the interrupt comes in random order after resume.
Quoted 6 lines
I wouldn't rely on this, it's not going to be true in general - the interrupt could flag at any time after the interrupt controller is resumed so unless the I2C controller takes steps to ensure it is resumed before interrupts (which has its own complications) you could get an interrupt delivered prior to the I2C controller being ready. Look at how arizona handles this for one example of dealing with this problem, though it's not ideal.
Thanks. i did a quick look at Arizona-core.c it disabled irq on suspend and enable irq on resume. I will give a try if this is what you referred to.
In addition, current patch can address the issue even if the interrupt came prior to I2c bus is reumed . can I keep the err checking ?
Quoted 42 lines
-----Original Message-----
From: Fang, Yang A
Sent: Wednesday, July 01, 2015 11:25 AM
To: 'Mark Brown'
Cc: Dylan Reid; Liam Girdwood; [email protected]; Sripathi, Srinivas; Jain, Praveen K; Iriawan, Denny; Nujella, Sathyanarayana; [email protected]; [email protected]
Subject: RE: [alsa-devel] [PATCH] ASoC: ts3a227e: do not report jack status when there is i2c read errQuoted 22 lines
-----Original Message-----
From: Mark Brown [mailto:[email protected]]
Sent: Wednesday, July 01, 2015 11:05 AM
To: Fang, Yang A
Cc: Dylan Reid; Liam Girdwood; [email protected]; Sripathi, Srinivas; Jain, Praveen K; Iriawan, Denny; Nujella, Sathyanarayana; [email protected]; [email protected]
Subject: Re: [alsa-devel] [PATCH] ASoC: ts3a227e: do not report jack status when there is i2c read errQuoted 10 lines · Yang Fang
Quoted 4 lines · Dylan Reid
Thanks, I think the error checking is good to have anyway, but should the interrupt also be disabled across suspend/resume? I'd hope this device's resume callback wouldn't happen until after the parent i2c bus is ready.
I am looping Mika. I was expecting that interrupt would come after i2c bus is ready. but with current pinctrl-cherryview driver the interrupt comes in random order after resume.
Quoted 6 lines
I wouldn't rely on this, it's not going to be true in general - the interrupt could flag at any time after the interrupt controller is resumed so unless the I2C controller takes steps to ensure it is resumed before interrupts (which has its own complications) you could get an interrupt delivered prior to the I2C controller being ready. Look at how arizona handles this for one example of dealing with this
Quoted 7 lines
problem, though it's not ideal.
Thanks. i did a quick look at
Arizona-core.cit disabled irq on suspend and enable irq on resume. I will give a try if this is what you referred to.In addition, current patch can address the issue even if the interrupt came prior to I2c bus is reumed . can I keep the err checking ?
Disable irq on suspend and enable irq on resume works well. I saw interrupt
occurs after TI resume. I will post V2 patch
PATCH v2 1/1 ASoC: ts3a227e: do not report jack status when there is i2c read err
In reply to [email protected]From: "Fang, Yang A" <[email protected]>
After suspend -> resume the ts3a227e_interrupt sometimes comes before i2c controller resume is called .regmap_read will return incorrect status and report a wrong jack status.This patch will disable irq on suspend and enable irq again on the resume to make sure interrupt is coming after TI resumes. Also We should return if there is read err,the interrupt will come again since it is level triggered and we are not yet clear the interrupt.
In addtion,cht_bsw_max98090_ti machine driver registered additional notifier base on jack event which will program the audio codec.there will be codec timeout err if such event occurs prior to i2c controller is resumed.
--- sound/soc/codecs/ts3a227e.c | 47 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-)
sound/soc/codecs/ts3a227e.c +45 -2
@@ -23,11 +23,13 @@#include "ts3a227e.h" struct ts3a227e { +struct device *dev;struct regmap *regmap;struct snd_soc_jack *jack;bool plugged;bool mic_present;unsigned int buttons_held; +int irq; };/* Button values to be reported on the jack */
@@ -189,16 +191,28 @@ static irqreturn_t ts3a227e_interrupt(int irq, void *data)struct ts3a227e *ts3a227e = (struct ts3a227e *)data;struct regmap *regmap = ts3a227e->regmap;unsigned int int_reg, kp_int_reg, acc_reg, i; +struct device *dev = ts3a227e->dev; +int ret;/* Check for plug/unplug. */ -regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); + ret =regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); +if (ret) { +dev_err (dev,"failed to clear interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +if (int_reg & (DETECTION_COMPLETE_EVENT |INS_REM_EVENT )) {regmap_read (regmap,TS3A227E_REG_ACCESSORY_STATUS , &acc_reg);ts3a227e_new_jack_state (ts3a227e, acc_reg); }/* Report any key events. */ -regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); + ret =regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); +if (ret) { +dev_err (dev,"failed to clear key interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + } +for (i =0 ; i <TS3A227E_NUM_BUTTONS ; i++) {if (kp_int_reg &PRESS_MASK (i)) ts3a227e->buttons_held |= (1 << i);
@@ -283,6 +297,8 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return -ENOMEM ;i2c_set_clientdata (i2c, ts3a227e); + ts3a227e->dev = dev; + ts3a227e->irq = i2c->irq; ts3a227e->regmap =devm_regmap_init_i2c (i2c, &ts3a227e_regmap_config);if (IS_ERR (ts3a227e->regmap))
@@ -320,6 +336,32 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return 0 ; } +#ifdef CONFIG_PM_SLEEP +static int ts3a227e_suspend (struct device *dev) +{ +struct ts3a227e *ts3a227e =dev_get_drvdata (dev); + +dev_dbg (ts3a227e->dev,"suspend disable irq\n" ); +disable_irq (ts3a227e->irq); + +return 0 ; +} + +static int ts3a227e_resume (struct device *dev) +{ +struct ts3a227e *ts3a227e =dev_get_drvdata (dev); + +dev_dbg (ts3a227e->dev,"resume enable irq\n" ); +enable_irq (ts3a227e->irq); + +return 0 ; +} +#endif + +static const struct dev_pm_ops ts3a227e_pm = { +SET_SYSTEM_SLEEP_PM_OPS (ts3a227e_suspend, ts3a227e_resume) +}; +static const struct i2c_device_id ts3a227e_i2c_ids[] = { {"ts3a227e" ,0 }, { }
@@ -336,6 +378,7 @@ static struct i2c_driver ts3a227e_driver = { .driver = { .name = "ts3a227e", .owner = THIS_MODULE, + .pm = &ts3a227e_pm, .of_match_table = of_match_ptr(ts3a227e_of_match), }, .probe = ts3a227e_i2c_probe,
Signature · 1 line
1.7.9.5
Mark Brown
maintainersound/soc/codecs/ts3a227e.c static irqreturn_t ts3a227e_interrupt(int irq, void *data) · line 202
Quoted 9 lines · On Wed, Jul 01, 2015 at 04:24:48PM -0700, [email protected] wrote:
after TI resumes. Also We should return if there is read err,the interrupt will come again since it is level triggered and we are not yet clear the interrupt.
sound/soc/codecs/ts3a227e.c +5
-0+ ret =regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); +if (ret) { +dev_err (dev,"failed to clear interrupt ret=%d\n" , ret); +return IRQ_HANDLED ; + }
This should return IRQ_NONE not IRQ_HANDLED - we didn't actually successfully handle the interrupt. This lets the genirq code error handling kick in if for some reason things are really broken and we just can't interact with the device any more, it will eventually disable the interrupt in that case.
PATCH v3 1/1 ASoC: ts3a227e: do not report jack status when there is i2c read err
In reply to [email protected]From: "Fang, Yang A" <[email protected]>
After suspend -> resume the ts3a227e_interrupt sometimes comes before i2c controller resume is called .regmap_read will return incorrect status and report a wrong jack status.This patch will disable irq on suspend and enable irq again on the resume to make sure interrupt is coming after TI resumes. Also We should return if there is read err,the interrupt will come again since it is level triggered and we are not yet clear the interrupt.
In addtion,cht_bsw_max98090_ti machine driver registered additional notifier base on jack event which will program the audio codec.there will be codec timeout err if such event occurs prior to i2c controller is resumed.
--- sound/soc/codecs/ts3a227e.c | 47 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-)
sound/soc/codecs/ts3a227e.c +45 -2
@@ -23,11 +23,13 @@#include "ts3a227e.h" struct ts3a227e { +struct device *dev;struct regmap *regmap;struct snd_soc_jack *jack;bool plugged;bool mic_present;unsigned int buttons_held; +int irq; };/* Button values to be reported on the jack */
@@ -189,16 +191,28 @@ static irqreturn_t ts3a227e_interrupt(int irq, void *data)struct ts3a227e *ts3a227e = (struct ts3a227e *)data;struct regmap *regmap = ts3a227e->regmap;unsigned int int_reg, kp_int_reg, acc_reg, i; +struct device *dev = ts3a227e->dev; +int ret;/* Check for plug/unplug. */ -regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); + ret =regmap_read (regmap,TS3A227E_REG_INTERRUPT , &int_reg); +if (ret) { +dev_err (dev,"failed to clear interrupt ret=%d\n" , ret); +return IRQ_NONE ; + } +if (int_reg & (DETECTION_COMPLETE_EVENT |INS_REM_EVENT )) {regmap_read (regmap,TS3A227E_REG_ACCESSORY_STATUS , &acc_reg);ts3a227e_new_jack_state (ts3a227e, acc_reg); }/* Report any key events. */ -regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); + ret =regmap_read (regmap,TS3A227E_REG_KP_INTERRUPT , &kp_int_reg); +if (ret) { +dev_err (dev,"failed to clear key interrupt ret=%d\n" , ret); +return IRQ_NONE ; + } +for (i =0 ; i <TS3A227E_NUM_BUTTONS ; i++) {if (kp_int_reg &PRESS_MASK (i)) ts3a227e->buttons_held |= (1 << i);
@@ -283,6 +297,8 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return -ENOMEM ;i2c_set_clientdata (i2c, ts3a227e); + ts3a227e->dev = dev; + ts3a227e->irq = i2c->irq; ts3a227e->regmap =devm_regmap_init_i2c (i2c, &ts3a227e_regmap_config);if (IS_ERR (ts3a227e->regmap))
@@ -320,6 +336,32 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,return 0 ; } +#ifdef CONFIG_PM_SLEEP +static int ts3a227e_suspend (struct device *dev) +{ +struct ts3a227e *ts3a227e =dev_get_drvdata (dev); + +dev_dbg (ts3a227e->dev,"suspend disable irq\n" ); +disable_irq (ts3a227e->irq); + +return 0 ; +} + +static int ts3a227e_resume (struct device *dev) +{ +struct ts3a227e *ts3a227e =dev_get_drvdata (dev); + +dev_dbg (ts3a227e->dev,"resume enable irq\n" ); +enable_irq (ts3a227e->irq); + +return 0 ; +} +#endif + +static const struct dev_pm_ops ts3a227e_pm = { +SET_SYSTEM_SLEEP_PM_OPS (ts3a227e_suspend, ts3a227e_resume) +}; +static const struct i2c_device_id ts3a227e_i2c_ids[] = { {"ts3a227e" ,0 }, { }
@@ -336,6 +378,7 @@ static struct i2c_driver ts3a227e_driver = { .driver = { .name = "ts3a227e", .owner = THIS_MODULE, + .pm = &ts3a227e_pm, .of_match_table = of_match_ptr(ts3a227e_of_match), }, .probe = ts3a227e_i2c_probe,
Signature · 1 line
1.7.9.5