ASoC: SOF: Intel: hda-codec: add hda_codec_check_rirb_status() helper

move existing functionality to new helper.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221027193540.259520-13-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
index e1cd52ead7eb351e904cef0a728e5c32fcca26f8..da76d2a2301a14b9509184616264090644113b57 100644 (file)
--- a/sound/soc/sof/intel/hda-codec.c
+++ b/sound/soc/sof/intel/hda-codec.c
@@ -295,6 +295,29 @@ void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status)
 }
 EXPORT_SYMBOL_NS_GPL(hda_codec_set_codec_wakeup, SND_SOC_SOF_HDA_AUDIO_CODEC);
 
+bool hda_codec_check_rirb_status(struct snd_sof_dev *sdev)
+{
+       struct hdac_bus *bus = sof_to_bus(sdev);
+       bool active = false;
+       u32 rirb_status;
+
+       rirb_status = snd_hdac_chip_readb(bus, RIRBSTS);
+       if (rirb_status & RIRB_INT_MASK) {
+               /*
+                * Clearing the interrupt status here ensures
+                * that no interrupt gets masked after the RIRB
+                * wp is read in snd_hdac_bus_update_rirb.
+                */
+               snd_hdac_chip_writeb(bus, RIRBSTS,
+                                    RIRB_INT_MASK);
+               active = true;
+               if (rirb_status & RIRB_INT_RESPONSE)
+                       snd_hdac_bus_update_rirb(bus);
+       }
+       return active;
+}
+EXPORT_SYMBOL_NS_GPL(hda_codec_check_rirb_status, SND_SOC_SOF_HDA_AUDIO_CODEC);
+
 void hda_codec_device_remove(struct snd_sof_dev *sdev)
 {
        struct hdac_bus *bus = sof_to_bus(sdev);

diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c
index 59a3c0c9c21f4daf4937194c28634c6267ad88d7..8e3f058576326ae78c51d8dbb706106f77c49aa0 100644 (file)
--- a/sound/soc/sof/intel/hda-stream.c
+++ b/sound/soc/sof/intel/hda-stream.c
@@ -765,9 +765,6 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context)
 {
        struct snd_sof_dev *sdev = context;
        struct hdac_bus *bus = sof_to_bus(sdev);
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
-       u32 rirb_status;
-#endif
        bool active;
        u32 status;
        int i;
@@ -785,23 +782,9 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context)
                active = hda_dsp_stream_check(bus, status);
 
                /* check and clear RIRB interrupt */
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
                if (status & AZX_INT_CTRL_EN) {
-                       rirb_status = snd_hdac_chip_readb(bus, RIRBSTS);
-                       if (rirb_status & RIRB_INT_MASK) {
-                               /*
-                                * Clearing the interrupt status here ensures
-                                * that no interrupt gets masked after the RIRB
-                                * wp is read in snd_hdac_bus_update_rirb.
-                                */
-                               snd_hdac_chip_writeb(bus, RIRBSTS,
-                                                    RIRB_INT_MASK);
-                               active = true;
-                               if (rirb_status & RIRB_INT_RESPONSE)
-                                       snd_hdac_bus_update_rirb(bus);
-                       }
+                       active |= hda_codec_check_rirb_status(sdev);
                }
-#endif
                spin_unlock_irq(&bus->reg_lock);
        }
 

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 8fefff6fcce6ecaa6a626f2e716fa684bc0c84c5..3b3e05e716636ca402b748ab1831f1835a855020 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -722,6 +722,7 @@ void hda_codec_init_cmd_io(struct snd_sof_dev *sdev);
 void hda_codec_stop_cmd_io(struct snd_sof_dev *sdev);
 void hda_codec_detect_mask(struct snd_sof_dev *sdev);
 void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev);
+bool hda_codec_check_rirb_status(struct snd_sof_dev *sdev);
 void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status);
 void hda_codec_device_remove(struct snd_sof_dev *sdev);
 
@@ -735,6 +736,7 @@ static inline void hda_codec_init_cmd_io(struct snd_sof_dev *sdev) { }
 static inline void hda_codec_stop_cmd_io(struct snd_sof_dev *sdev) { }
 static inline void hda_codec_detect_mask(struct snd_sof_dev *sdev) { }
 static inline void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev) { }
+static inline bool hda_codec_check_rirb_status(struct snd_sof_dev *sdev) { return false; }
 static inline void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status) { }
 static inline void hda_codec_device_remove(struct snd_sof_dev *sdev) { }