Commit 69ddce94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Just a few small fixes:

   - a fix for the recursive work cancellation in a specific HD-audio
     operation mode

   - a fix for potentially uninitialized memory access via rawmidi

   - the register bit access fixes for ASoC HD-audio"

* tag 'sound-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda: Fix several mismatch for register mask and value
  ALSA: rawmidi: Initialize allocated buffers
  ALSA: hda - Fix cancel_work_sync() stall from jackpoll work
parents a49a9dcc f7c50fa6

sound/core/rawmidi.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream) 
		runtime->avail = 0;

	else

		runtime->avail = runtime->buffer_size;

	runtime->buffer = kvmalloc(runtime->buffer_size, GFP_KERNEL);

	runtime->buffer = kvzalloc(runtime->buffer_size, GFP_KERNEL);

	if (!runtime->buffer) {

		kfree(runtime);

		return -ENOMEM;
@@ -655,7 +655,7 @@ static int resize_runtime_buffer(struct snd_rawmidi_runtime *runtime, 
	if (params->avail_min < 1 || params->avail_min > params->buffer_size)

		return -EINVAL;

	if (params->buffer_size != runtime->buffer_size) {

		newbuf = kvmalloc(params->buffer_size, GFP_KERNEL);

		newbuf = kvzalloc(params->buffer_size, GFP_KERNEL);

		if (!newbuf)

			return -ENOMEM;

		spin_lock_irq(&runtime->lock);

sound/hda/ext/hdac_ext_stream.c

+7 −15
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_decouple); 
 */

void snd_hdac_ext_link_stream_start(struct hdac_ext_stream *stream)

{

	snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL, 0, AZX_PPLCCTL_RUN);

	snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL,

			 AZX_PPLCCTL_RUN, AZX_PPLCCTL_RUN);

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_link_stream_start);
@@ -171,7 +172,8 @@ void snd_hdac_ext_link_stream_reset(struct hdac_ext_stream *stream) 


	snd_hdac_ext_link_stream_clear(stream);



	snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL, 0, AZX_PPLCCTL_STRST);

	snd_hdac_updatel(stream->pplc_addr, AZX_REG_PPLCCTL,

			 AZX_PPLCCTL_STRST, AZX_PPLCCTL_STRST);

	udelay(3);

	timeout = 50;

	do {
@@ -242,7 +244,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_link_set_stream_id); 
void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link,

				 int stream)

{

	snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV, 0, (1 << stream));

	snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV, (1 << stream), 0);

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_link_clear_stream_id);
@@ -415,7 +417,6 @@ void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *bus, 
				 bool enable, int index)

{

	u32 mask = 0;

	u32 register_mask = 0;



	if (!bus->spbcap) {

		dev_err(bus->dev, "Address of SPB capability is NULL\n");
@@ -424,12 +425,8 @@ void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *bus, 


	mask |= (1 << index);



	register_mask = readl(bus->spbcap + AZX_REG_SPB_SPBFCCTL);



	mask |= register_mask;



	if (enable)

		snd_hdac_updatel(bus->spbcap, AZX_REG_SPB_SPBFCCTL, 0, mask);

		snd_hdac_updatel(bus->spbcap, AZX_REG_SPB_SPBFCCTL, mask, mask);

	else

		snd_hdac_updatel(bus->spbcap, AZX_REG_SPB_SPBFCCTL, mask, 0);

}
@@ -503,7 +500,6 @@ void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus, 
				bool enable, int index)

{

	u32 mask = 0;

	u32 register_mask = 0;



	if (!bus->drsmcap) {

		dev_err(bus->dev, "Address of DRSM capability is NULL\n");
@@ -512,12 +508,8 @@ void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus, 


	mask |= (1 << index);



	register_mask = readl(bus->drsmcap + AZX_REG_SPB_SPBFCCTL);



	mask |= register_mask;



	if (enable)

		snd_hdac_updatel(bus->drsmcap, AZX_REG_DRSM_CTL, 0, mask);

		snd_hdac_updatel(bus->drsmcap, AZX_REG_DRSM_CTL, mask, mask);

	else

		snd_hdac_updatel(bus->drsmcap, AZX_REG_DRSM_CTL, mask, 0);

}

sound/pci/hda/hda_codec.c

+2 −1
Original line number Diff line number Diff line
@@ -3935,6 +3935,7 @@ void snd_hda_bus_reset_codecs(struct hda_bus *bus) 


	list_for_each_codec(codec, bus) {

		/* FIXME: maybe a better way needed for forced reset */

		if (current_work() != &codec->jackpoll_work.work)

			cancel_delayed_work_sync(&codec->jackpoll_work);

#ifdef CONFIG_PM

		if (hda_codec_is_power_on(codec)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE