Commit da0363f7 authored by Srinivasa Rao Mandadapu's avatar Srinivasa Rao Mandadapu Committed by Mark Brown

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 c5c8635a ("ASoC: qcom: Add LPASS platform driver")
Signed-off-by: default avatarSrinivasa Rao Mandadapu <srivasam@codeaurora.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210609072310.26099-1-srivasam@codeaurora.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 116b1e12
...@@ -526,7 +526,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component, ...@@ -526,7 +526,7 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component,
return -EINVAL; return -EINVAL;
} }
ret = regmap_write(map, reg_irqclr, val_irqclr); ret = regmap_update_bits(map, reg_irqclr, val_irqclr, val_irqclr);
if (ret) { if (ret) {
dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", ret); dev_err(soc_runtime->dev, "error writing to irqclear reg: %d\n", ret);
return ret; return ret;
...@@ -650,10 +650,11 @@ static irqreturn_t lpass_dma_interrupt_handler( ...@@ -650,10 +650,11 @@ static irqreturn_t lpass_dma_interrupt_handler(
struct lpass_variant *v = drvdata->variant; struct lpass_variant *v = drvdata->variant;
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
int rv; int rv;
unsigned int reg = 0, val = 0; unsigned int reg, val, mask;
struct regmap *map; struct regmap *map;
unsigned int dai_id = cpu_dai->driver->id; unsigned int dai_id = cpu_dai->driver->id;
mask = LPAIF_IRQ_ALL(chan);
switch (dai_id) { switch (dai_id) {
case LPASS_DP_RX: case LPASS_DP_RX:
map = drvdata->hdmiif_map; map = drvdata->hdmiif_map;
...@@ -676,8 +677,7 @@ static irqreturn_t lpass_dma_interrupt_handler( ...@@ -676,8 +677,7 @@ static irqreturn_t lpass_dma_interrupt_handler(
return -EINVAL; return -EINVAL;
} }
if (interrupts & LPAIF_IRQ_PER(chan)) { if (interrupts & LPAIF_IRQ_PER(chan)) {
rv = regmap_update_bits(map, reg, mask, (LPAIF_IRQ_PER(chan) | val));
rv = regmap_write(map, reg, LPAIF_IRQ_PER(chan) | val);
if (rv) { if (rv) {
dev_err(soc_runtime->dev, dev_err(soc_runtime->dev,
"error writing to irqclear reg: %d\n", rv); "error writing to irqclear reg: %d\n", rv);
...@@ -688,7 +688,7 @@ static irqreturn_t lpass_dma_interrupt_handler( ...@@ -688,7 +688,7 @@ static irqreturn_t lpass_dma_interrupt_handler(
} }
if (interrupts & LPAIF_IRQ_XRUN(chan)) { 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) { if (rv) {
dev_err(soc_runtime->dev, dev_err(soc_runtime->dev,
"error writing to irqclear reg: %d\n", rv); "error writing to irqclear reg: %d\n", rv);
...@@ -700,7 +700,7 @@ static irqreturn_t lpass_dma_interrupt_handler( ...@@ -700,7 +700,7 @@ static irqreturn_t lpass_dma_interrupt_handler(
} }
if (interrupts & LPAIF_IRQ_ERR(chan)) { 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) { if (rv) {
dev_err(soc_runtime->dev, dev_err(soc_runtime->dev,
"error writing to irqclear reg: %d\n", rv); "error writing to irqclear reg: %d\n", rv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment