Unverified Commit 87f42300 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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



move existing functionality to new helper.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221027193540.259520-13-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8da5bceb

sound/soc/sof/intel/hda-codec.c

+23 −0
Original line number Diff line number Diff line
@@ -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);

sound/soc/sof/intel/hda-stream.c

+1 −18
Original line number Diff line number Diff line
@@ -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);

	}

sound/soc/sof/intel/hda.h

+2 −0
Original line number Diff line number Diff line
@@ -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) { }