Commit e7562a00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes, mostly covering device-specific
  regressions and bugs over ASoC, HD-audio and USB-audio, while
  the ALSA PCM core received a few additional fixes for the
  possible (new and old) regressions"

* tag 'sound-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits)
  ALSA: usb-audio: Add registration quirk for JBL Quantum headsets
  ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10
  ALSA: pcm: Fix mmap without buffer preallocation
  ALSA: pcm: Fix mmap capability check
  ALSA: hda: intel-dsp-cfg: add missing ElkhartLake PCI ID
  ASoC: ti: j721e-evm: Check for not initialized parent_clk_id
  ASoC: ti: j721e-evm: Fix unbalanced domain activity tracking during startup
  ALSA: hda/realtek: Fix pop noise and 2 Front Mic issues on a machine
  ALSA: hdmi: Expose all pins on MSI MS-7C94 board
  ALSA: sb: Fix potential ABBA deadlock in CSP driver
  ASoC: rt5682: Fix the issue of garbled recording after powerd_dbus_suspend
  ASoC: amd: reverse stop sequence for stoneyridge platform
  ASoC: soc-pcm: add a flag to reverse the stop sequence
  ASoC: codecs: wcd938x: setup irq during component bind
  ASoC: dt-bindings: renesas: rsnd: Fix incorrect 'port' regex schema
  ALSA: usb-audio: Add missing proc text entry for BESPOKEN type
  ASoC: codecs: wcd938x: make sdw dependency explicit in Kconfig
  ASoC: SOF: Intel: Update ADL descriptor to use ACPI power states
  ASoC: rt5631: Fix regcache sync errors on resume
  ALSA: pcm: Call substream ack() method upon compat mmap commit
  ...
parents 8baef638 b0084afd

Documentation/devicetree/bindings/sound/renesas,rsnd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ properties: 


  ports:

    $ref: /schemas/graph.yaml#/properties/ports

    properties:

    patternProperties:

      port(@[0-9a-f]+)?:

        $ref: audio-graph-port.yaml#

        unevaluatedProperties: false

include/sound/soc.h

+6 −0
Original line number Diff line number Diff line
@@ -712,6 +712,12 @@ struct snd_soc_dai_link { 
	/* Do not create a PCM for this DAI link (Backend link) */

	unsigned int ignore:1;



	/* This flag will reorder stop sequence. By enabling this flag

	 * DMA controller stop sequence will be invoked first followed by

	 * CPU DAI driver stop sequence

	 */

	unsigned int stop_dma_first:1;



#ifdef CONFIG_SND_SOC_TOPOLOGY

	struct snd_soc_dobj dobj; /* For topology */

#endif

sound/core/pcm_native.c

+20 −7
Original line number Diff line number Diff line
@@ -246,13 +246,19 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) 
	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP))

		return false;



	if (substream->ops->mmap ||

	    (substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV &&

	     substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV_UC))

	if (substream->ops->mmap)

		return true;



	switch (substream->dma_buffer.dev.type) {

	case SNDRV_DMA_TYPE_UNKNOWN:

		return false;

	case SNDRV_DMA_TYPE_CONTINUOUS:

	case SNDRV_DMA_TYPE_VMALLOC:

		return true;

	default:

		return dma_can_mmap(substream->dma_buffer.dev.dev);

	}

}



static int constrain_mask_params(struct snd_pcm_substream *substream,

				 struct snd_pcm_hw_params *params)
@@ -3063,9 +3069,14 @@ static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream, 
		boundary = 0x7fffffff;

	snd_pcm_stream_lock_irq(substream);

	/* FIXME: we should consider the boundary for the sync from app */

	if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))

		control->appl_ptr = scontrol.appl_ptr;

	else

	if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL)) {

		err = pcm_lib_apply_appl_ptr(substream,

				scontrol.appl_ptr);

		if (err < 0) {

			snd_pcm_stream_unlock_irq(substream);

			return err;

		}

	} else

		scontrol.appl_ptr = control->appl_ptr % boundary;

	if (!(sflags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))

		control->avail_min = scontrol.avail_min;
@@ -3664,6 +3675,8 @@ 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))

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

	else

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

	if (!page)

sound/hda/intel-dsp-config.c

+4 −0
Original line number Diff line number Diff line
@@ -319,6 +319,10 @@ static const struct config_entry config_table[] = { 
		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,

		.device = 0x4b55,

	},

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,

		.device = 0x4b58,

	},

#endif



/* Alder Lake */

sound/isa/sb/sb16_csp.c

+4 −0
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channel 
	mixR = snd_sbmixer_read(p->chip, SB_DSP4_PCM_DEV + 1);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL & 0x7);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR & 0x7);

	spin_unlock_irqrestore(&p->chip->mixer_lock, flags);



	spin_lock(&p->chip->reg_lock);

	set_mode_register(p->chip, 0xc0);	/* c0 = STOP */
@@ -855,6 +856,7 @@ static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channel 
	spin_unlock(&p->chip->reg_lock);



	/* restore PCM volume */

	spin_lock_irqsave(&p->chip->mixer_lock, flags);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR);

	spin_unlock_irqrestore(&p->chip->mixer_lock, flags);
@@ -880,6 +882,7 @@ static int snd_sb_csp_stop(struct snd_sb_csp * p) 
	mixR = snd_sbmixer_read(p->chip, SB_DSP4_PCM_DEV + 1);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL & 0x7);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR & 0x7);

	spin_unlock_irqrestore(&p->chip->mixer_lock, flags);



	spin_lock(&p->chip->reg_lock);

	if (p->running & SNDRV_SB_CSP_ST_QSOUND) {
@@ -894,6 +897,7 @@ static int snd_sb_csp_stop(struct snd_sb_csp * p) 
	spin_unlock(&p->chip->reg_lock);



	/* restore PCM volume */

	spin_lock_irqsave(&p->chip->mixer_lock, flags);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV, mixL);

	snd_sbmixer_write(p->chip, SB_DSP4_PCM_DEV + 1, mixR);

	spin_unlock_irqrestore(&p->chip->mixer_lock, flags);