Commit 0e957950 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes for 6.15 final. It became slightly a
  higher amount than expected, but all look easy and safe to apply:

   - A fix for PCM core race spotted by fuzzing

   - ASoC topology fix for single DAI link

   - UAF fix for ASoC SOF Intel HD-audio at reloading

   - ASoC SOF Intel and Mediatek fixes

   - Trivial HD-audio quirks as usual"

* tag 'sound-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek - Add new HP ZBook laptop with micmute led fixup
  ALSA: hda/realtek: Add support for HP Agusta using CS35L41 HDA
  ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10
  ALSA: hda/realtek - restore auto-mute mode for Dell Chrome platform
  ALSA: pcm: Fix race of buffer access at PCM OSS layer
  ASoC: SOF: Intel: hda: Fix UAF when reloading module
  ASoc: SOF: topology: connect DAI to a single DAI link
  ASoC: SOF: Intel: hda-bus: Use PIO mode on ACE2+ platforms
  ASoC: SOF: ipc4-pcm: Delay reporting is only supported for playback direction
  ASoC: SOF: ipc4-control: Use SOF_CTRL_CMD_BINARY as numid for bytes_ext
  ASoC: mediatek: mt8188-mt6359: Depend on MT6359_ACCDET set or disabled
  ASoC: mediatek: mt8188-mt6359: select CONFIG_SND_SOC_MT6359_ACCDET
parents d608703f f709b78a

include/sound/pcm.h

+2 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,8 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s 
#define snd_pcm_lib_mmap_iomem	NULL

#endif



void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime);



/**

 * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer

 * @dma: DMA number

sound/core/oss/pcm_oss.c

+1 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,7 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream) 
	runtime->oss.params = 0;

	runtime->oss.prepare = 1;

	runtime->oss.buffer_used = 0;

	if (runtime->dma_area)

		snd_pcm_format_set_silence(runtime->format, runtime->dma_area, bytes_to_samples(runtime, runtime->dma_bytes));

	snd_pcm_runtime_buffer_set_silence(runtime);



	runtime->oss.period_frames = snd_pcm_alsa_frames(substream, oss_period_size);

sound/core/pcm_native.c

+11 −0
Original line number Diff line number Diff line
@@ -723,6 +723,17 @@ static void snd_pcm_buffer_access_unlock(struct snd_pcm_runtime *runtime) 
	atomic_inc(&runtime->buffer_accessing);

}



/* fill the PCM buffer with the current silence format; called from pcm_oss.c */

void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime)

{

	snd_pcm_buffer_access_lock(runtime);

	if (runtime->dma_area)

		snd_pcm_format_set_silence(runtime->format, runtime->dma_area,

					   bytes_to_samples(runtime, runtime->dma_bytes));

	snd_pcm_buffer_access_unlock(runtime);

}

EXPORT_SYMBOL_GPL(snd_pcm_runtime_buffer_set_silence);



#if IS_ENABLED(CONFIG_SND_PCM_OSS)

#define is_oss_stream(substream)	((substream)->oss.oss)

#else

sound/pci/hda/patch_realtek.c

+8 −1
Original line number Diff line number Diff line
@@ -6830,6 +6830,9 @@ static void alc256_fixup_chromebook(struct hda_codec *codec, 


	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		if (codec->core.subsystem_id == 0x10280d76)

			spec->gen.suppress_auto_mute = 0;

		else

			spec->gen.suppress_auto_mute = 1;

		spec->gen.suppress_auto_mic = 1;

		spec->en_3kpull_low = false;
@@ -10882,9 +10885,12 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e1b, "HP EliteBook G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e1c, "HP EliteBook G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),

	SND_PCI_QUIRK(0x103c, 0x8e1d, "HP ZBook X Gli 16 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e2c, "HP EliteBook 16 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e36, "HP 14 Enstrom OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e37, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e3a, "HP Agusta", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e3b, "HP Agusta", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),
@@ -11300,6 +11306,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x38fd, "ThinkBook plus Gen5 Hybrid", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x390d, "Lenovo Yoga Pro 7 14ASP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),

	SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x391f, "Yoga S990-16 pro Quad YC Quad", ALC287_FIXUP_TAS2781_I2C),

	SND_PCI_QUIRK(0x17aa, 0x3920, "Yoga S990-16 pro Quad VECO Quad", ALC287_FIXUP_TAS2781_I2C),

sound/soc/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ config SND_SOC_MT8188 
config SND_SOC_MT8188_MT6359

	tristate "ASoC Audio driver for MT8188 with MT6359 and I2S codecs"

	depends on SND_SOC_MT8188 && MTK_PMIC_WRAP

	depends on SND_SOC_MT6359_ACCDET || !SND_SOC_MT6359_ACCDET

	depends on I2C

	select SND_SOC_MT6359

	select SND_SOC_HDMI_CODEC