2021-06-03 05:08:28

by Srinivasa Rao Mandadapu

Subject: [PATCH] ASoC: qcom: Fix for DMA interrupt clear reg overwriting

This patch fixes the DMA interrupt registers overwriting
issue in lpass platform interrupt handler.

Signed-off-by: Srinivasa Rao Mandadapu <[email protected]>
---
sound/soc/qcom/lpass-platform.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 0df9481ea4c6..e02caa121fa4 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -526,7 +526,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component,
return -EINVAL;
}

- ret = regmap_write(map, reg_irqclr, val_irqclr);
+ ret = regmap_update_bits(map, reg_irqclr, val_irqclr, val_irqclr);
if (ret) {
dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", ret);
return ret;
@@ -650,7 +650,7 @@ static irqreturn_t lpass_dma_interrupt_handler(
struct lpass_variant *v = drvdata->variant;
irqreturn_t ret = IRQ_NONE;
int rv;
- unsigned int reg = 0, val = 0;
+ unsigned int reg = 0, val = 0, val_clr = 0, val_mask = 0;
struct regmap *map;
unsigned int dai_id = cpu_dai->driver->id;

@@ -676,8 +676,9 @@ static irqreturn_t lpass_dma_interrupt_handler(
return -EINVAL;
}
if (interrupts & LPAIF_IRQ_PER(chan)) {
-
- rv = regmap_write(map, reg, LPAIF_IRQ_PER(chan) | val);
+ val_clr = (LPAIF_IRQ_PER(chan) | val);
+ val_mask = LPAIF_IRQ_ALL(chan);
+ rv = regmap_update_bits(map, reg, val_mask, val_clr);
if (rv) {
dev_err(soc_runtime->dev,
"error writing to irqclear reg: %d\n", rv);
@@ -688,7 +689,9 @@ static irqreturn_t lpass_dma_interrupt_handler(
}

if (interrupts & LPAIF_IRQ_XRUN(chan)) {
- rv = regmap_write(map, reg, LPAIF_IRQ_XRUN(chan) | val);
+ val_clr = (LPAIF_IRQ_XRUN(chan) | val);
+ val_mask = LPAIF_IRQ_ALL(chan);
+ rv = regmap_update_bits(map, reg, val_mask, val_clr);
if (rv) {
dev_err(soc_runtime->dev,
"error writing to irqclear reg: %d\n", rv);
@@ -700,7 +703,9 @@ static irqreturn_t lpass_dma_interrupt_handler(
}

if (interrupts & LPAIF_IRQ_ERR(chan)) {
- rv = regmap_write(map, reg, LPAIF_IRQ_ERR(chan) | val);
+ val_clr = (LPAIF_IRQ_ERR(chan) | val);
+ val_mask = LPAIF_IRQ_ALL(chan);
+ rv = regmap_update_bits(map, reg, val_mask, val_clr);
if (rv) {
dev_err(soc_runtime->dev,
"error writing to irqclear reg: %d\n", rv);
--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2021-06-03 06:20:13

by Stephen Boyd

Subject: Re: [PATCH] ASoC: qcom: Fix for DMA interrupt clear reg overwriting

Quoting Srinivasa Rao Mandadapu (2021-06-02 22:05:30)
> This patch fixes the DMA interrupt registers overwriting

$ git grep "This patch" -- Documentation/process

> issue in lpass platform interrupt handler.

Can you describe the issue more?

>
> Signed-off-by: Srinivasa Rao Mandadapu <[email protected]>
> ---

Any Fixes tag?

> sound/soc/qcom/lpass-platform.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
> index 0df9481ea4c6..e02caa121fa4 100644
> --- a/sound/soc/qcom/lpass-platform.c
> +++ b/sound/soc/qcom/lpass-platform.c
> @@ -650,7 +650,7 @@ static irqreturn_t lpass_dma_interrupt_handler(
> struct lpass_variant *v = drvdata->variant;
> irqreturn_t ret = IRQ_NONE;
> int rv;
> - unsigned int reg = 0, val = 0;
> + unsigned int reg = 0, val = 0, val_clr = 0, val_mask = 0;

Why assign to 0 and then overwrite it?

> struct regmap *map;
> unsigned int dai_id = cpu_dai->driver->id;
>
> @@ -676,8 +676,9 @@ static irqreturn_t lpass_dma_interrupt_handler(
> return -EINVAL;
> }
> if (interrupts & LPAIF_IRQ_PER(chan)) {
> -
> - rv = regmap_write(map, reg, LPAIF_IRQ_PER(chan) | val);
> + val_clr = (LPAIF_IRQ_PER(chan) | val);

Is the extra parenthesis useful?

> + val_mask = LPAIF_IRQ_ALL(chan);
> + rv = regmap_update_bits(map, reg, val_mask, val_clr);
> if (rv) {
> dev_err(soc_runtime->dev,
> "error writing to irqclear reg: %d\n", rv);

2021-06-05 10:33:47

by Srinivasa Rao Mandadapu

Subject: Re: [PATCH] ASoC: qcom: Fix for DMA interrupt clear reg overwriting

Hi Stephen,

Thanks for Your Time for review comments!!!

On 6/3/2021 11:47 AM, Stephen Boyd wrote:
> Quoting Srinivasa Rao Mandadapu (2021-06-02 22:05:30)
>> This patch fixes the DMA interrupt registers overwriting
> $ git grep "This patch" -- Documentation/process
Okay will change description.
>
>> issue in lpass platform interrupt handler.
> Can you describe the issue more?
Sure. will elaborate more.
>
>> Signed-off-by: Srinivasa Rao Mandadapu <[email protected]>
>> ---
> Any Fixes tag?
>
>> sound/soc/qcom/lpass-platform.c | 17 +++++++++++------
>> 1 file changed, 11 insertions(+), 6 deletions(-)
>>
>> diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
>> index 0df9481ea4c6..e02caa121fa4 100644
>> --- a/sound/soc/qcom/lpass-platform.c
>> +++ b/sound/soc/qcom/lpass-platform.c
>> @@ -650,7 +650,7 @@ static irqreturn_t lpass_dma_interrupt_handler(
>> struct lpass_variant *v = drvdata->variant;
>> irqreturn_t ret = IRQ_NONE;
>> int rv;
>> - unsigned int reg = 0, val = 0;
>> + unsigned int reg = 0, val = 0, val_clr = 0, val_mask = 0;
> Why assign to 0 and then overwrite it?
Okay. Will remove initialization.
>
>> struct regmap *map;
>> unsigned int dai_id = cpu_dai->driver->id;
>>
>> @@ -676,8 +676,9 @@ static irqreturn_t lpass_dma_interrupt_handler(
>> return -EINVAL;
>> }
>> if (interrupts & LPAIF_IRQ_PER(chan)) {
>> -
>> - rv = regmap_write(map, reg, LPAIF_IRQ_PER(chan) | val);
>> + val_clr = (LPAIF_IRQ_PER(chan) | val);
> Is the extra parenthesis useful?
Not exactly. Will remove it.
>
>> + val_mask = LPAIF_IRQ_ALL(chan);
>> + rv = regmap_update_bits(map, reg, val_mask, val_clr);
>> if (rv) {
>> dev_err(soc_runtime->dev,
>> "error writing to irqclear reg: %d\n", rv);

--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.