ASoC: SOF: Intel: hda-ipc: re-enable IPC IRQ at end of handler

Align with Skylake driver and enable the IRQ at end of handler,
instead of at beginning.

Also add an error log if we have nothing to do in this handler.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c
index 1f01897fa6e32786fd404a3cf8f2193243137898..04972f27ffe62bf28718b1bc27f9d5520c218666 100644 (file)
--- a/sound/soc/sof/intel/hda-ipc.c
+++ b/sound/soc/sof/intel/hda-ipc.c
@@ -131,7 +131,6 @@ static bool hda_dsp_ipc_is_sof(uint32_t msg)
 irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
 {
        struct snd_sof_dev *sdev = context;
-       irqreturn_t ret = IRQ_NONE;
        u32 hipci;
        u32 hipcie;
        u32 hipct;
@@ -139,6 +138,7 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
        u32 hipcctl;
        u32 msg;
        u32 msg_ext;
+       bool ipc_irq = false;
 
        /* read IPC status */
        hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR,
@@ -148,10 +148,6 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
        hipci = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCI);
        hipcte = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_HIPCTE);
 
-       /* reenable IPC interrupt */
-       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC,
-                               HDA_DSP_ADSPIC_IPC, HDA_DSP_ADSPIC_IPC);
-
        /* is this a reply message from the DSP */
        if (hipcie & HDA_DSP_REG_HIPCIE_DONE &&
            hipcctl & HDA_DSP_REG_HIPCCTL_DONE) {
@@ -196,7 +192,7 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
 
                spin_unlock_irq(&sdev->ipc_lock);
 
-               ret = IRQ_HANDLED;
+               ipc_irq = true;
        }
 
        /* is this a new message from DSP */
@@ -225,10 +221,22 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
 
                hda_dsp_ipc_host_done(sdev);
 
-               ret = IRQ_HANDLED;
+               ipc_irq = true;
        }
 
-       return ret;
+       if (!ipc_irq) {
+               /*
+                * This interrupt is not shared so no need to return IRQ_NONE.
+                */
+               dev_err_ratelimited(sdev->dev,
+                                   "error: nothing to do in IRQ thread\n");
+       }
+
+       /* re-enable IPC interrupt */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPIC,
+                               HDA_DSP_ADSPIC_IPC, HDA_DSP_ADSPIC_IPC);
+
+       return IRQ_HANDLED;
 }
 
 /* is this IRQ for ADSP ? - we only care about IPC here */