Commit 58cf05f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes that came up recently for 5.11.

  The majority of fixes are usual HD-audio and USB-audio quirks, with a
  few PCM core fixes for addressing the information leak and yet more
  UBSAN fixes in the core side"

* tag 'sound-fix-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA/hda: apply jack fixup for the Acer Veriton N4640G/N6640G/N2510G
  ALSA: hda/realtek: Apply jack fixup for Quanta NL3
  ALSA: usb-audio: Add implicit feeback support for the BOSS GT-1
  ALSA: usb-audio: Add alias entry for ASUS PRIME TRX40 PRO-S
  ALSA: core: Remove redundant comments
  ALSA: hda/realtek: Add quirk for MSI-GP73
  ALSA: pcm: oss: Fix a few more UBSAN fixes
  ALSA: pcm: Clear the full allocated memory at hw_params
  ALSA: memalloc: Align buffer allocations in page size
  ALSA: usb-audio: Disable sample read check if firmware doesn't give back
  ALSA: pcm: Remove snd_pcm_lib_preallocate_dma_free()
  ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices
  ALSA: core: memalloc: add page alignment for iram
  ALSA: hda/realtek - Supported Dell fixed type headset
  ALSA: hda/realtek: Remove dummy lineout on Acer TravelMate P648/P658
parents a0881596 13be30f1

sound/core/init.c

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ static void release_card_device(struct device *dev) 
 *  @extra_size: allocate this extra size after the main soundcard structure

 *  @card_ret: the pointer to store the created card instance

 *

 *  Creates and initializes a soundcard structure.

 *

 *  The function allocates snd_card instance via kzalloc with the given

 *  space for the driver to use freely.  The allocated struct is stored

 *  in the given card_ret pointer.

sound/core/memalloc.c

+3 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size) 
	/* Assign the pool into private_data field */

	dmab->private_data = pool;



	dmab->area = gen_pool_dma_alloc(pool, size, &dmab->addr);

	dmab->area = gen_pool_dma_alloc_align(pool, size, &dmab->addr,

					PAGE_SIZE);

}



/**
@@ -132,6 +133,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, 
	if (WARN_ON(!dmab))

		return -ENXIO;



	size = PAGE_ALIGN(size);

	dmab->dev.type = type;

	dmab->dev.dev = device;

	dmab->bytes = 0;

sound/core/oss/pcm_oss.c

+14 −8
Original line number Diff line number Diff line
@@ -693,6 +693,8 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream, 


	oss_buffer_size = snd_pcm_plug_client_size(substream,

						   snd_pcm_hw_param_value_max(slave_params, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, NULL)) * oss_frame_size;

	if (!oss_buffer_size)

		return -EINVAL;

	oss_buffer_size = rounddown_pow_of_two(oss_buffer_size);

	if (atomic_read(&substream->mmap_count)) {

		if (oss_buffer_size > runtime->oss.mmap_bytes)
@@ -728,17 +730,21 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream, 


	min_period_size = snd_pcm_plug_client_size(substream,

						   snd_pcm_hw_param_value_min(slave_params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, NULL));

	if (min_period_size) {

		min_period_size *= oss_frame_size;

		min_period_size = roundup_pow_of_two(min_period_size);

		if (oss_period_size < min_period_size)

			oss_period_size = min_period_size;

	}



	max_period_size = snd_pcm_plug_client_size(substream,

						   snd_pcm_hw_param_value_max(slave_params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, NULL));

	if (max_period_size) {

		max_period_size *= oss_frame_size;

		max_period_size = rounddown_pow_of_two(max_period_size);

		if (oss_period_size > max_period_size)

			oss_period_size = max_period_size;

	}



	oss_periods = oss_buffer_size / oss_period_size;

sound/core/pcm_memory.c

+1 −9
Original line number Diff line number Diff line
@@ -89,14 +89,6 @@ static int preallocate_pcm_pages(struct snd_pcm_substream *substream, size_t siz 
	return 0;

}



/*

 * release the preallocated buffer if not yet done.

 */

static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream)

{

	do_free_pages(substream->pcm->card, &substream->dma_buffer);

}



/**

 * snd_pcm_lib_preallocate_free - release the preallocated buffer of the specified substream.

 * @substream: the pcm substream instance
@@ -105,7 +97,7 @@ static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream 
 */

void snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)

{

	snd_pcm_lib_preallocate_dma_free(substream);

	do_free_pages(substream->pcm->card, &substream->dma_buffer);

}



/**

sound/core/pcm_native.c

+7 −2
Original line number Diff line number Diff line
@@ -755,8 +755,13 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, 
		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);

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

		size_t size = runtime->dma_bytes;



		if (runtime->info & SNDRV_PCM_INFO_MMAP)

			size = PAGE_ALIGN(size);

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

	}



	snd_pcm_timer_resolution_change(substream);

	snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE