Commit 517363b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes. Majority of changes are device-specific
  fixes and quirks, while there are a few core fixes to address
  regressions and corner cases spotted by fuzzers.

   - Fix of spinlock range that wrongly covered kvfree() call in rawmidi

   - Fix potential NULL dereference at PCM mmap

   - Fix incorrectly advertised MIDI 2.0 UMP Function Block info

   - Various ASoC AMD quirks and fixes

   - ASoC SOF Intel, Mediatek, HDMI-codec fixes

   - A few more quirks and TAS2781 codec fix for HD-audio

   - A couple of fixes for USB-audio for malicious USB descriptors"

* tag 'sound-fix-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
  ALSA: hda: improve bass speaker support for ASUS Zenbook UM5606WA
  ALSA: hda/realtek: Apply quirk for Medion E15433
  ASoC: amd: yc: Add a quirk for microfone on Lenovo ThinkPad P14s Gen 5 21MES00B00
  ASoC: SOF: ipc3-topology: Convert the topology pin index to ALH dai index
  ASoC: mediatek: Check num_codecs is not zero to avoid panic during probe
  ASoC: amd: yc: Fix for enabling DMIC on acp6x via _DSD entry
  ALSA: ump: Fix evaluation of MIDI 1.0 FB info
  ALSA: core: Fix possible NULL dereference caused by kunit_kzalloc()
  ALSA: hda: Show the codec quirk info at probing
  ALSA: asihpi: Remove unused variable
  ALSA: hda/realtek: Set PCBeep to default value for ALC274
  ALSA: hda/tas2781: Add speaker id check for ASUS projects
  ALSA: hda/realtek: Update ALC225 depop procedure
  ALSA: hda/realtek: Enable speaker pins for Medion E15443 platform
  ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook X G1i
  ALSA: usb-audio: Fix out of bounds reads when finding clock sources
  ALSA: rawmidi: Fix kvfree() call in spinlock
  ALSA: hda/realtek: Fix Internal Speaker and Mic boost of Infinix Y4 Max
  ASoC: amd: yc: Add quirk for microphone on Lenovo Thinkpad T14s Gen 6 21M1CTO1WW
  ASoC: doc: dapm: Add location information for dapm-graph tool
  ...
parents 2eff01ee 2e5bf5b6

Documentation/sound/hd-audio/notes.rst

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ If you are interested in the deep debugging of HD-audio, read the 
HD-audio specification at first.  The specification is found on

Intel's web page, for example:



* https://www.intel.com/standards/hdaudio/

* https://www.intel.com/content/www/us/en/standards/high-definition-audio-specification.html





HD-Audio Controller

Documentation/sound/soc/dapm.rst

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ The graph for the STM32MP1-DK1 sound card is shown in picture: 
    :alt:   Example DAPM graph

    :align: center



You can also generate compatible graph for your sound card using

`tools/sound/dapm-graph` utility.



DAPM power domains

==================

include/sound/tas2781.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct tasdevice_priv { 
	struct tasdevice_rca rcabin;

	struct calidata cali_data;

	struct tasdevice_fw *fmw;

	struct gpio_desc *speaker_id;

	struct gpio_desc *reset;

	struct mutex codec_lock;

	struct regmap *regmap;

sound/ac97/bus.c

+3 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int ac97_bus_reset(struct ac97_controller *ac97_ctrl) 


/**

 * snd_ac97_codec_driver_register - register an AC97 codec driver

 * @dev: AC97 driver codec to register

 * @drv: AC97 driver codec to register

 *

 * Register an AC97 codec driver to the ac97 bus driver, aka. the AC97 digital

 * controller.
@@ -196,7 +196,7 @@ EXPORT_SYMBOL_GPL(snd_ac97_codec_driver_register); 


/**

 * snd_ac97_codec_driver_unregister - unregister an AC97 codec driver

 * @dev: AC97 codec driver to unregister

 * @drv: AC97 codec driver to unregister

 *

 * Unregister a previously registered ac97 codec driver.

 */
@@ -338,6 +338,7 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl) 
 * @dev: the device providing the ac97 DC function

 * @slots_available: mask of the ac97 codecs that can be scanned and probed

 *                   bit0 => codec 0, bit1 => codec 1 ... bit 3 => codec 3

 * @codecs_pdata: codec platform data

 *

 * Register a digital controller which can control up to 4 ac97 codecs. This is

 * the controller side of the AC97 AC-link, while the slave side are the codecs.

sound/core/pcm_native.c

+4 −2
Original line number Diff line number Diff line
@@ -3813,9 +3813,11 @@ static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf) 
		return VM_FAULT_SIGBUS;

	if (substream->ops->page)

		page = substream->ops->page(substream, offset);

	else if (!snd_pcm_get_dma_buf(substream))

	else if (!snd_pcm_get_dma_buf(substream)) {

		if (WARN_ON_ONCE(!runtime->dma_area))

			return VM_FAULT_SIGBUS;

		page = virt_to_page(runtime->dma_area + offset);

	else

	} else

		page = snd_sgbuf_get_page(snd_pcm_get_dma_buf(substream), offset);

	if (!page)

		return VM_FAULT_SIGBUS;