ASoC: qcom: Fix for DMA interrupt clear reg overwriting

PATCH In review Srinivasa Rao Mandadapu 4 participants 7 messages Jun 9, 2021 – Jun 21, 2021

Subsystems (4)

Sound Arm Qualcomm mailing list ASoC Qualcomm audio (ASoC) drivers

lore

Share & tools

lore

Srinivasa Rao Mandadapu

author

2021-06-09 07:24 UTC #0 lore raw

PATCH v3 1/1 ASoC: qcom: Fix for DMA interrupt clear reg overwriting

The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.

Fixes commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver")

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

---
Changes since v2:
-- Removed redundant variables.
Changes since v1:
-- Subject lines changed.

 sound/soc/qcom/lpass-platform.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

sound/soc/qcom/lpass-platform.c +6 -6

index 0df9481ea4c6..f9df76d37858 100644
@@ -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,10 +650,11 @@ 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, val, mask;
 	struct regmap *map;
 	unsigned int dai_id = cpu_dai->driver->id;
 
+	mask = LPAIF_IRQ_ALL(chan);
 	switch (dai_id) {
 	case LPASS_DP_RX:
 		map = drvdata->hdmiif_map;

@@ -676,8 +677,7 @@ 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);
+		rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val));
 		if (rv) {
 			dev_err(soc_runtime->dev,
 				"error writing to irqclear reg: %d\n", rv);

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

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

Signature · 2 lines

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

Srinivas Kandagatla

Reviewed-by on v3 1/1

2021-06-09 08:00 UTC #1 lore raw

Quoted 10 lines · Srinivasa Rao Mandadapu

The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.
Fixes commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver")
Signed-off-by Srinivasa Rao Mandadapu <[email protected]>

LGTM

Reviewed-by Srinivas Kandagatla <[email protected]>

--srini

Quoted 63 lines

---
Changes since v2:
-- Removed redundant variables.
Changes since v1:
-- Subject lines changed.

  sound/soc/qcom/lpass-platform.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

sound/soc/qcom/lpass-platform.c +6 -6

index 0df9481ea4c6..f9df76d37858 100644
@@ -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,10 +650,11 @@ 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, val, mask;
  	struct regmap *map;
  	unsigned int dai_id = cpu_dai->driver->id;
 
+	mask = LPAIF_IRQ_ALL(chan);
  	switch (dai_id) {
  	case LPASS_DP_RX:
  		map = drvdata->hdmiif_map;

@@ -676,8 +677,7 @@ 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);
+		rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val));
  		if (rv) {
  			dev_err(soc_runtime->dev,
  				"error writing to irqclear reg: %d\n", rv);

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

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

Mark Brown

maintainer

2021-06-14 19:55 UTC #2 lore raw

In reply to Srinivasa Rao Mandadapu

Quoted 8 lines · Srinivasa Rao Mandadapu

The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.
[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: qcom: Fix for DMA interrupt clear reg overwriting

      commit: da0363f7bfd3c32f8d5918e40bfddb9905c86ee1

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Marek Szyprowski

2021-06-17 19:35 UTC #3 lore raw

In reply to Srinivasa Rao Mandadapu

Hi,

Quoted 10 lines · Srinivasa Rao Mandadapu

The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.
Fixes commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver")
Signed-off-by Srinivasa Rao Mandadapu <[email protected]>

This patch landed recently in linux-next as commit da0363f7bfd3 ("ASoC:
qcom: Fix for DMA interrupt clear reg overwriting"). It breaks ALSA playback on DragonBoard 410c (arch/arm64/boot/dts/qcom/apq8016-sbc.dts). After applying this patch, running 'speaker-test -l1' never finishes. There is no error nor kernel warning message. Before that commit, the playback worked fine on that board.

Quoted 54 lines

---
Changes since v2:
-- Removed redundant variables.
Changes since v1:
-- Subject lines changed.

  sound/soc/qcom/lpass-platform.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

sound/soc/qcom/lpass-platform.c +5 -5

index 0df9481ea4c6..f9df76d37858 100644
@@ -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,10 +650,11 @@ 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, val, mask;
  	struct regmap *map;
  	unsigned int dai_id = cpu_dai->driver->id;
 
+	mask = LPAIF_IRQ_ALL(chan);
  	switch (dai_id) {
  	case LPASS_DP_RX:
  		map = drvdata->hdmiif_map;

@@ -676,8 +677,7 @@ 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);
+		rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val));
  		if (rv) {
  			dev_err(soc_runtime->dev,
  				"error writing to irqclear reg: %d\n", rv);

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

sound/soc/qcom/lpass-platform.c static irqreturn_t lpass_dma_interrupt_handler( · line 706

Quoted 8 lines

sound/soc/qcom/lpass-platform.c +1 -1

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

Best regards

Signature · 2 lines

Marek Szyprowski, PhD
Samsung R&D Institute Poland

Srinivas Kandagatla

2021-06-18 11:41 UTC #4 lore raw

Hi Marek,

Thanks for testing next and reporting this back.

Quoted 12 lines · Marek Szyprowski

Hi,
Quoted 9 lines · Srinivasa Rao Mandadapu
The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.
Fixes commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver")

Quoted 8 lines

Quoted 1 line
Signed-off-by Srinivasa Rao Mandadapu <[email protected]>
This patch landed recently in linux-next as commit da0363f7bfd3 ("ASoC:
qcom: Fix for DMA interrupt clear reg overwriting"). It breaks ALSA playback on DragonBoard 410c (arch/arm64/boot/dts/qcom/apq8016-sbc.dts). After applying this patch, running 'speaker-test -l1' never finishes. There is no error nor kernel warning message. Before that commit, the playback worked fine on that board.

TBH, I should have looked at the hw register description that is being updated in the patch. This is a software write only and hardware readable register for which update_bits really does not make sense at all. While digging out I found an issue with regmap_cache reads which should have reported an error while attempting to even do this. I sent out a patch to fix this.

Now for this patch itself, We should send a patch to revert it.

thanks,
srini

Quoted 66 lines

Quoted 55 lines

---
Changes since v2:
-- Removed redundant variables.
Changes since v1:
-- Subject lines changed.

   sound/soc/qcom/lpass-platform.c | 12 ++++++------
   1 file changed, 6 insertions(+), 6 deletions(-)

sound/soc/qcom/lpass-platform.c +5 -5

index 0df9481ea4c6..f9df76d37858 100644
@@ -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,10 +650,11 @@ 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, val, mask;
   	struct regmap *map;
   	unsigned int dai_id = cpu_dai->driver->id;
 
+	mask = LPAIF_IRQ_ALL(chan);
   	switch (dai_id) {
   	case LPASS_DP_RX:
   		map = drvdata->hdmiif_map;

@@ -676,8 +677,7 @@ 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);
+		rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val));
   		if (rv) {
   			dev_err(soc_runtime->dev,
   				"error writing to irqclear reg: %d\n", rv);

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

sound/soc/qcom/lpass-platform.c static irqreturn_t lpass_dma_interrupt_handler( · line 706

Quoted 8 lines

sound/soc/qcom/lpass-platform.c +1 -1

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

Best regards

Srinivas Kandagatla

2021-06-21 12:52 UTC #5 lore raw

In reply to Marek Szyprowski

Hi Marek/Srinivasa,

Quoted 14 lines · Marek Szyprowski

Hi,
Quoted 10 lines · Srinivasa Rao Mandadapu
The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.
Fixes commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver")
Signed-off-by Srinivasa Rao Mandadapu <[email protected]>

Can you please try this patch and let us know if this fixes the issue

------------------------->cut<-------------------------------

Author: Srinivas Kandagatla <[email protected]>
Date:   Mon Jun 21 12:38:43 2021 +0100

ASoC: qcom: lpass-cpu: mark IRQ_CLEAR register as volatile and readable

Currently IRQ_CLEAR register is marked as write-only, however using regmap_update_bits on this register will have some side effects. so mark IRQ_CLEAR register appropriately as readable and volatile.

Signed-off-by Srinivas Kandagatla <[email protected]>

sound/soc/qcom/lpass-cpu.c +6 -1

index 0b9cbf2ce505..8998697cd1e1 100644
@@ -525,6 +525,8 @@ static bool lpass_cpu_regmap_readable(struct device *dev, unsigned int reg)
                        return true;
 
        for (i = 0; i < v->irq_ports; ++i) {
+               if (reg == LPAIF_IRQCLEAR_REG(v, i))
+                       return true;
                if (reg == LPAIF_IRQEN_REG(v, i))
                        return true;
                if (reg == LPAIF_IRQSTAT_REG(v, i))

@@ -566,9 +568,12 @@ static bool lpass_cpu_regmap_volatile(struct device *dev, unsigned int reg)
        struct lpass_variant *v = drvdata->variant;
        int i;
 
-       for (i = 0; i < v->irq_ports; ++i)
+       for (i = 0; i < v->irq_ports; ++i) {
+               if (reg == LPAIF_IRQCLEAR_REG(v, i))
+                       return true;
                if (reg == LPAIF_IRQSTAT_REG(v, i))
                        return true;
+       }
 
        for (i = 0; i < v->rdma_channels; ++i)
                if (reg == LPAIF_RDMACURR_REG(v, i))

------------------------->cut<-------------------------------

--srini

Quoted 72 lines

Quoted 54 lines

---
Changes since v2:
-- Removed redundant variables.
Changes since v1:
-- Subject lines changed.

   sound/soc/qcom/lpass-platform.c | 12 ++++++------
   1 file changed, 6 insertions(+), 6 deletions(-)

sound/soc/qcom/lpass-platform.c +5 -5

index 0df9481ea4c6..f9df76d37858 100644
@@ -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,10 +650,11 @@ 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, val, mask;
   	struct regmap *map;
   	unsigned int dai_id = cpu_dai->driver->id;
 
+	mask = LPAIF_IRQ_ALL(chan);
   	switch (dai_id) {
   	case LPASS_DP_RX:
   		map = drvdata->hdmiif_map;

@@ -676,8 +677,7 @@ 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);
+		rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val));
   		if (rv) {
   			dev_err(soc_runtime->dev,
   				"error writing to irqclear reg: %d\n", rv);

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

sound/soc/qcom/lpass-platform.c static irqreturn_t lpass_dma_interrupt_handler( · line 706

Quoted 8 lines

sound/soc/qcom/lpass-platform.c +1 -1

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

Best regards

Marek Szyprowski

Tested-by

2021-06-21 13:47 UTC #6 lore raw

Hi,

Quoted 21 lines · Srinivas Kandagatla

Quoted 9 lines · Marek Szyprowski
Quoted 7 lines · Srinivasa Rao Mandadapu
The DMA interrupt clear register overwritten during simultaneous playback and capture in lpass platform interrupt handler. It's causing playback or capture stuck in similtaneous plaback on speaker and capture on dmic test. Update appropriate reg fields of corresponding channel instead of entire register write.
Quoted 4 lines
Quoted 3 lines
Fixes commit c5c8635a04711 ("ASoC: qcom: Add LPASS platform driver")
Signed-off-by Srinivasa Rao Mandadapu <[email protected]>
Can you please try this patch and let us know if this fixes the issue
------------------------->cut<-------------------------------
Author: Srinivas Kandagatla <[email protected]> Date: Mon Jun 21 12:38:43 2021 +0100

Quoted 8 lines

ASoC: qcom: lpass-cpu: mark IRQ_CLEAR register as volatile and readable
Currently IRQ_CLEAR register is marked as write-only, however using regmap_update_bits on this register will have some side effects. so mark IRQ_CLEAR register appropriately as readable and volatile.
Signed-off-by Srinivas Kandagatla <[email protected]>

This fixes the issue observed on DragonBoard410c. Feel free to add:

Reported-by Marek Szyprowski <[email protected]>

Tested-by Marek Szyprowski <[email protected]>

Quoted 30 lines

sound/soc/qcom/lpass-cpu.c +2 -0

index 0b9cbf2ce505..8998697cd1e1 100644
@@ -525,6 +525,8 @@ static bool lpass_cpu_regmap_readable(struct 
 device *dev, unsigned int reg)
                         return true;
 
         for (i = 0; i < v->irq_ports; ++i) {
+               if (reg == LPAIF_IRQCLEAR_REG(v, i))
+                       return true;
                 if (reg == LPAIF_IRQEN_REG(v, i))
                         return true;

if (reg == LPAIF_IRQSTAT_REG(v, i))

sound/soc/qcom/lpass-cpu.c +4 -1

@@ -566,9 +568,12 @@ static bool lpass_cpu_regmap_volatile(struct 
 device *dev, unsigned int reg)
         struct lpass_variant *v = drvdata->variant;
         int i;
 
-       for (i = 0; i < v->irq_ports; ++i)
+       for (i = 0; i < v->irq_ports; ++i) {
+               if (reg == LPAIF_IRQCLEAR_REG(v, i))
+                       return true;
                 if (reg == LPAIF_IRQSTAT_REG(v, i))
                         return true;
+       }
 
         for (i = 0; i < v->rdma_channels; ++i)

if (reg == LPAIF_RDMACURR_REG(v, i))

Quoted 78 lines

------------------------->cut<-------------------------------

--srini

Quoted 73 lines

Quoted 65 lines

---
Changes since v2:
-- Removed redundant variables.
Changes since v1:
-- Subject lines changed. sound/soc/qcom/lpass-platform.c | 12 ++++++------

   1 file changed, 6 insertions(+), 6 deletions(-)

sound/soc/qcom/lpass-platform.c +1 -0

index 0df9481ea4c6..f9df76d37858 100644
@@ -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;

sound/soc/qcom/lpass-platform.c +1 -1

@@ -650,10 +650,11 @@ 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, val, mask;
        struct regmap *map;
        unsigned int dai_id = cpu_dai->driver->id;
    +    mask = LPAIF_IRQ_ALL(chan);
        switch (dai_id) {

case LPASS_DP_RX:
map = drvdata->hdmiif_map;

sound/soc/qcom/lpass-platform.c +1 -2

@@ -676,8 +677,7 @@ 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);
+        rv = regmap_update_bits(map, reg, mask, 
 (LPAIF_IRQ_PER(chan) | val));
            if (rv) {
                dev_err(soc_runtime->dev,

"error writing to irqclear reg: %d\n", rv);

sound/soc/qcom/lpass-platform.c +2 -2

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

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

Best regards

Signature · 2 lines

Marek Szyprowski, PhD
Samsung R&D Institute Poland