Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5952155 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman
Browse files

ALSA/ASoC: hda: move/rename snd_hdac_ext_stop_streams to hdac_stream.c 



[ Upstream commit 12054f0ce8be7d2003ec068ab27c9eb608397b98 ]

snd_hdac_ext_stop_streams() has really nothing to do with the
extension, it just loops over the bus streams.

Move it to the hdac_stream layer and rename to remove the 'ext'
prefix and add the precision that the chip will also be stopped.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211216231128.344321-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Stable-dep-of: 171107237246 ("ASoC: Intel: Skylake: Fix driver hang during shutdown")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bdc2d33f

include/sound/hdaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ int snd_hdac_stream_set_params(struct hdac_stream *azx_dev, 
void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start);

void snd_hdac_stream_clear(struct hdac_stream *azx_dev);

void snd_hdac_stream_stop(struct hdac_stream *azx_dev);

void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus);

void snd_hdac_stream_reset(struct hdac_stream *azx_dev);

void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,

				  unsigned int streams, unsigned int reg);

include/sound/hdaudio_ext.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus, 
				  struct hdac_ext_stream *azx_dev, bool decouple);

void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,

				struct hdac_ext_stream *azx_dev, bool decouple);

void snd_hdac_ext_stop_streams(struct hdac_bus *bus);



int snd_hdac_ext_stream_set_spib(struct hdac_bus *bus,

				 struct hdac_ext_stream *stream, u32 value);

sound/hda/ext/hdac_ext_stream.c

+0 −17
Original line number Diff line number Diff line
@@ -475,23 +475,6 @@ int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_bus *bus, 
}

EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_get_spbmaxfifo);





/**

 * snd_hdac_ext_stop_streams - stop all stream if running

 * @bus: HD-audio core bus

 */

void snd_hdac_ext_stop_streams(struct hdac_bus *bus)

{

	struct hdac_stream *stream;



	if (bus->chip_init) {

		list_for_each_entry(stream, &bus->stream_list, list)

			snd_hdac_stream_stop(stream);

		snd_hdac_bus_stop_chip(bus);

	}

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_stop_streams);



/**

 * snd_hdac_ext_stream_drsm_enable - enable DMA resume for a stream

 * @bus: HD-audio core bus

sound/hda/hdac_stream.c

+16 −0
Original line number Diff line number Diff line
@@ -142,6 +142,22 @@ void snd_hdac_stream_stop(struct hdac_stream *azx_dev) 
}

EXPORT_SYMBOL_GPL(snd_hdac_stream_stop);



/**

 * snd_hdac_stop_streams_and_chip - stop all streams and chip if running

 * @bus: HD-audio core bus

 */

void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus)

{

	struct hdac_stream *stream;



	if (bus->chip_init) {

		list_for_each_entry(stream, &bus->stream_list, list)

			snd_hdac_stream_stop(stream);

		snd_hdac_bus_stop_chip(bus);

	}

}

EXPORT_SYMBOL_GPL(snd_hdac_stop_streams_and_chip);



/**

 * snd_hdac_stream_reset - reset a stream

 * @azx_dev: HD-audio core stream to reset

sound/soc/intel/skylake/skl.c

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int skl_free(struct hdac_bus *bus) 


	skl->init_done = 0; /* to be sure */



	snd_hdac_ext_stop_streams(bus);

	snd_hdac_stop_streams_and_chip(bus);



	if (bus->irq >= 0)

		free_irq(bus->irq, (void *)bus);
@@ -1116,7 +1116,7 @@ static void skl_shutdown(struct pci_dev *pci) 
	if (!skl->init_done)

		return;



	snd_hdac_ext_stop_streams(bus);

	snd_hdac_stop_streams_and_chip(bus);

	list_for_each_entry(s, &bus->stream_list, list) {

		stream = stream_to_hdac_ext_stream(s);

		snd_hdac_ext_stream_decouple(bus, stream, false);