Commit 80a0c2e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A slightly high amount at this time, but all good and small fixes:

   - A PCM core fix that initializes the buffer properly for avoiding
     information leaks; it is a long-standing minor problem, but good to
     fix better now

   - A few ASoC core fixes for the init / cleanup ordering issues that
     surfaced after the recent refactoring

   - Lots of SOF and topology-related fixes went in, as usual as such
     hot topics

   - Several ASoC codec and platform-specific small fixes: wm89xx,
     realtek, and max98090, AMD, Intel-SST

   - A fix for the previous incomplete regression of HD-audio, now
     hitting Nvidia HDMI

   - A few HD-audio CA0132 codec fixes"

* tag 'sound-5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (27 commits)
  ALSA: hda - Downgrade error message for single-cmd fallback
  ASoC: wm8962: fix lambda value
  ALSA: hda: Fix regression by strip mask fix
  ALSA: hda/ca0132 - Fix work handling in delayed HP detection
  ALSA: hda/ca0132 - Avoid endless loop
  ALSA: hda/ca0132 - Keep power on during processing DSP response
  ALSA: pcm: Avoid possible info leaks from PCM stream buffers
  ASoC: Intel: common: work-around incorrect ACPI HID for CML boards
  ASoC: SOF: Intel: split cht and byt debug window sizes
  ASoC: SOF: loader: fix snd_sof_fw_parse_ext_data
  ASoC: SOF: loader: snd_sof_fw_parse_ext_data log warning on unknown header
  ASoC: simple-card: Don't create separate link when platform is present
  ASoC: topology: Check return value for soc_tplg_pcm_create()
  ASoC: topology: Check return value for snd_soc_add_dai_link()
  ASoC: core: only flush inited work during free
  ASoC: Intel: bytcr_rt5640: Update quirk for Teclast X89
  ASoC: core: Init pcm runtime work early to avoid warnings
  ASoC: Intel: sst: Add missing include <linux/io.h>
  ASoC: max98090: fix possible race conditions
  ASoC: max98090: exit workaround earlier if PLL is locked
  ...
parents 2187f215 7c497d79

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,7 @@ struct snd_soc_pcm_runtime { 
	unsigned int num_codecs;



	struct delayed_work delayed_work;

	void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd);

#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_dpcm_root;

#endif

sound/core/pcm_native.c

+4 −0
Original line number Diff line number Diff line
@@ -739,6 +739,10 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, 
	while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size)

		runtime->boundary *= 2;



	/* clear the buffer for avoiding possible kernel info leaks */

	if (runtime->dma_area && !substream->ops->copy_user)

		memset(runtime->dma_area, 0, runtime->dma_bytes);



	snd_pcm_timer_resolution_change(substream);

	snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP);

sound/hda/hdac_stream.c

+1 −3
Original line number Diff line number Diff line
@@ -120,10 +120,8 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev) 
	snd_hdac_stream_updateb(azx_dev, SD_CTL,

				SD_CTL_DMA_START | SD_INT_MASK, 0);

	snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */

	if (azx_dev->stripe) {

	if (azx_dev->stripe)

		snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);

		azx_dev->stripe = 0;

	}

	azx_dev->running = false;

}

EXPORT_SYMBOL_GPL(snd_hdac_stream_clear);

sound/pci/hda/hda_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr, 
		return -EAGAIN; /* give a chance to retry */

	}



	dev_WARN(chip->card->dev,

	dev_err(chip->card->dev,

		"azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n",

		bus->last_cmd[addr]);

	chip->single_cmd = 1;

sound/pci/hda/patch_ca0132.c

+19 −4
Original line number Diff line number Diff line
@@ -1809,13 +1809,14 @@ struct scp_msg { 


static void dspio_clear_response_queue(struct hda_codec *codec)

{

	unsigned long timeout = jiffies + msecs_to_jiffies(1000);

	unsigned int dummy = 0;

	int status = -1;

	int status;



	/* clear all from the response queue */

	do {

		status = dspio_read(codec, &dummy);

	} while (status == 0);

	} while (status == 0 && time_before(jiffies, timeout));

}



static int dspio_get_response_data(struct hda_codec *codec)
@@ -7588,12 +7589,14 @@ static void ca0132_process_dsp_response(struct hda_codec *codec, 
	struct ca0132_spec *spec = codec->spec;



	codec_dbg(codec, "ca0132_process_dsp_response\n");

	snd_hda_power_up_pm(codec);

	if (spec->wait_scp) {

		if (dspio_get_response_data(codec) >= 0)

			spec->wait_scp = 0;

	}



	dspio_clear_response_queue(codec);

	snd_hda_power_down_pm(codec);

}



static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
@@ -7604,11 +7607,10 @@ static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb) 
	/* Delay enabling the HP amp, to let the mic-detection

	 * state machine run.

	 */

	cancel_delayed_work(&spec->unsol_hp_work);

	schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500));

	tbl = snd_hda_jack_tbl_get(codec, cb->nid);

	if (tbl)

		tbl->block_report = 1;

	schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500));

}



static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
@@ -8454,12 +8456,25 @@ static void ca0132_reboot_notify(struct hda_codec *codec) 
	codec->patch_ops.free(codec);

}



#ifdef CONFIG_PM

static int ca0132_suspend(struct hda_codec *codec)

{

	struct ca0132_spec *spec = codec->spec;



	cancel_delayed_work_sync(&spec->unsol_hp_work);

	return 0;

}

#endif



static const struct hda_codec_ops ca0132_patch_ops = {

	.build_controls = ca0132_build_controls,

	.build_pcms = ca0132_build_pcms,

	.init = ca0132_init,

	.free = ca0132_free,

	.unsol_event = snd_hda_jack_unsol_event,

#ifdef CONFIG_PM

	.suspend = ca0132_suspend,

#endif

	.reboot_notify = ca0132_reboot_notify,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE