Skip to content

Commit 2e7c665

Browse files
reddysujithbroonie
authored andcommitted
ASoC: SOF: amd: Fix for handling spurious interrupts from DSP
As interrupts are Level-triggered,unless and until we deassert the register the interrupts are generated which causes spurious interrupts unhandled. Now we deasserted the interrupt at top half which solved the below "nobody cared" warning. warning reported in dmesg: irq 80: nobody cared (try booting with the "irqpoll" option) CPU: 5 PID: 2735 Comm: irq/80-AudioDSP Not tainted 5.15.86-15817-g4c19f3e06d49 #1 1bd3fd932cf58caacc95b0504d6ea1e3eab22289 Hardware name: Google Skyrim/Skyrim, BIOS Google_Skyrim.15303.0.0 01/03/2023 Call Trace: <IRQ> dump_stack_lvl+0x69/0x97 __report_bad_irq+0x3a/0xae note_interrupt+0x1a9/0x1e3 handle_irq_event_percpu+0x4b/0x6e handle_irq_event+0x36/0x5b handle_fasteoi_irq+0xae/0x171 __common_interrupt+0x48/0xc4 </IRQ> handlers: acp_irq_handler [snd_sof_amd_acp] threaded [<000000007e089f34>] acp_irq_thread [snd_sof_amd_acp] Disabling IRQ #80 Signed-off-by: V sujith kumar Reddy <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 2036890 commit 2e7c665

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

sound/soc/sof/amd/acp.c

+15-21
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ static irqreturn_t acp_irq_thread(int irq, void *context)
318318
{
319319
struct snd_sof_dev *sdev = context;
320320
const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata);
321-
unsigned int base = desc->dsp_intr_base;
322321
unsigned int val, count = ACP_HW_SEM_RETRY_COUNT;
323322

324323
val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, desc->ext_intr_stat);
@@ -328,28 +327,20 @@ static irqreturn_t acp_irq_thread(int irq, void *context)
328327
return IRQ_HANDLED;
329328
}
330329

331-
val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, base + DSP_SW_INTR_STAT_OFFSET);
332-
if (val & ACP_DSP_TO_HOST_IRQ) {
333-
while (snd_sof_dsp_read(sdev, ACP_DSP_BAR, desc->hw_semaphore_offset)) {
334-
/* Wait until acquired HW Semaphore lock or timeout */
335-
count--;
336-
if (!count) {
337-
dev_err(sdev->dev, "%s: Failed to acquire HW lock\n", __func__);
338-
return IRQ_NONE;
339-
}
330+
while (snd_sof_dsp_read(sdev, ACP_DSP_BAR, desc->hw_semaphore_offset)) {
331+
/* Wait until acquired HW Semaphore lock or timeout */
332+
count--;
333+
if (!count) {
334+
dev_err(sdev->dev, "%s: Failed to acquire HW lock\n", __func__);
335+
return IRQ_NONE;
340336
}
341-
342-
sof_ops(sdev)->irq_thread(irq, sdev);
343-
val |= ACP_DSP_TO_HOST_IRQ;
344-
snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + DSP_SW_INTR_STAT_OFFSET, val);
345-
346-
/* Unlock or Release HW Semaphore */
347-
snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->hw_semaphore_offset, 0x0);
348-
349-
return IRQ_HANDLED;
350337
}
351338

352-
return IRQ_NONE;
339+
sof_ops(sdev)->irq_thread(irq, sdev);
340+
/* Unlock or Release HW Semaphore */
341+
snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->hw_semaphore_offset, 0x0);
342+
343+
return IRQ_HANDLED;
353344
};
354345

355346
static irqreturn_t acp_irq_handler(int irq, void *dev_id)
@@ -360,8 +351,11 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id)
360351
unsigned int val;
361352

362353
val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, base + DSP_SW_INTR_STAT_OFFSET);
363-
if (val)
354+
if (val) {
355+
val |= ACP_DSP_TO_HOST_IRQ;
356+
snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + DSP_SW_INTR_STAT_OFFSET, val);
364357
return IRQ_WAKE_THREAD;
358+
}
365359

366360
return IRQ_NONE;
367361
}

0 commit comments

Comments
 (0)