Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull sound fixes from Takashi Iwai:
 "Unfortunately we still have received a significant amount of changes
  at the late stage, but at least all are small and clear fixes.

  There are two fixes for ALSA core stuff, yet another timer race fix
  and sequencer lockdep annotation fix. Both are spotted by syzkaller,
  and not too serious but better to paper over quickly.

  All other commits are about ASoC drivers, most notably, a revert of
  RT5514 hotword control that was included in 4.14-rc (due to a kind of
  abuse of kctl TLV ABI), together with topology API fixes and other
  device-specific small fixes that should go for stable, too"

* tag 'sound-4.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: seq: Fix nested rwsem annotation for lockdep splat
  ALSA: timer: Add missing mutex lock for compat ioctls
  ASoC: rt5616: fix 0x91 default value
  ASoC: rt5659: connect LOUT Amp with Charge Pump
  ASoC: rt5659: register power bit of LOUT Amp
  ASoC: rt5663: Change the dev getting function in rt5663_irq
  ASoC: rt5514: Revert Hotword Model control
  ASoC: topology: Fix a potential memory leak in 'soc_tplg_dapm_widget_denum_create()'
  ASoC: topology: Fix a potential NULL pointer dereference in 'soc_tplg_dapm_widget_denum_create()'
  ASoC: rt5514-spi: check irq status to schedule data copy
  ASoC: adau17x1: Workaround for noise bug in ADC
parents 6965f1aa a53a0ab8

sound/core/seq/seq_clientmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static int deliver_to_subscribers(struct snd_seq_client *client, 
	if (atomic)

		read_lock(&grp->list_lock);

	else

		down_read(&grp->list_mutex);

		down_read_nested(&grp->list_mutex, hop);

	list_for_each_entry(subs, &grp->list_head, src_list) {

		/* both ports ready? */

		if (atomic_read(&subs->ref_count) != 2)

sound/core/timer_compat.c

+15 −2
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ enum { 
#endif /* CONFIG_X86_X32 */

};



static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)

static long __snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd,

					  unsigned long arg)

{

	void __user *argp = compat_ptr(arg);
@@ -153,7 +154,7 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns 
	case SNDRV_TIMER_IOCTL_PAUSE:

	case SNDRV_TIMER_IOCTL_PAUSE_OLD:

	case SNDRV_TIMER_IOCTL_NEXT_DEVICE:

		return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);

		return __snd_timer_user_ioctl(file, cmd, (unsigned long)argp);

	case SNDRV_TIMER_IOCTL_GPARAMS32:

		return snd_timer_user_gparams_compat(file, argp);

	case SNDRV_TIMER_IOCTL_INFO32:
@@ -167,3 +168,15 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns 
	}

	return -ENOIOCTLCMD;

}



static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd,

					unsigned long arg)

{

	struct snd_timer_user *tu = file->private_data;

	long ret;



	mutex_lock(&tu->ioctl_lock);

	ret = __snd_timer_user_ioctl_compat(file, cmd, arg);

	mutex_unlock(&tu->ioctl_lock);

	return ret;

}

sound/soc/codecs/adau17x1.c

+23 −1
Original line number Diff line number Diff line
@@ -90,6 +90,27 @@ static int adau17x1_pll_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int adau17x1_adc_fixup(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct adau *adau = snd_soc_codec_get_drvdata(codec);



	/*

	 * If we are capturing, toggle the ADOSR bit in Converter Control 0 to

	 * avoid losing SNR (workaround from ADI). This must be done after

	 * the ADC(s) have been enabled. According to the data sheet, it is

	 * normally illegal to set this bit when the sampling rate is 96 kHz,

	 * but according to ADI it is acceptable for this workaround.

	 */

	regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER0,

		ADAU17X1_CONVERTER0_ADOSR, ADAU17X1_CONVERTER0_ADOSR);

	regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER0,

		ADAU17X1_CONVERTER0_ADOSR, 0);



	return 0;

}



static const char * const adau17x1_mono_stereo_text[] = {

	"Stereo",

	"Mono Left Channel (L+R)",
@@ -121,7 +142,8 @@ static const struct snd_soc_dapm_widget adau17x1_dapm_widgets[] = { 
	SND_SOC_DAPM_MUX("Right DAC Mode Mux", SND_SOC_NOPM, 0, 0,

		&adau17x1_dac_mode_mux),



	SND_SOC_DAPM_ADC("Left Decimator", NULL, ADAU17X1_ADC_CONTROL, 0, 0),

	SND_SOC_DAPM_ADC_E("Left Decimator", NULL, ADAU17X1_ADC_CONTROL, 0, 0,

			   adau17x1_adc_fixup, SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_ADC("Right Decimator", NULL, ADAU17X1_ADC_CONTROL, 1, 0),

	SND_SOC_DAPM_DAC("Left DAC", NULL, ADAU17X1_DAC_CONTROL0, 0, 0),

	SND_SOC_DAPM_DAC("Right DAC", NULL, ADAU17X1_DAC_CONTROL0, 1, 0),

sound/soc/codecs/adau17x1.h

+2 −0
Original line number Diff line number Diff line
@@ -129,5 +129,7 @@ bool adau17x1_has_dsp(struct adau *adau); 


#define ADAU17X1_CONVERTER0_CONVSR_MASK		0x7



#define ADAU17X1_CONVERTER0_ADOSR		BIT(3)





#endif

sound/soc/codecs/rt5514-spi.c

+15 −2
Original line number Diff line number Diff line
@@ -145,9 +145,8 @@ static void rt5514_spi_copy_work(struct work_struct *work) 
	mutex_unlock(&rt5514_dsp->dma_lock);

}



static irqreturn_t rt5514_spi_irq(int irq, void *data)

static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp)

{

	struct rt5514_dsp *rt5514_dsp = data;

	u8 buf[8];



	rt5514_dsp->get_size = 0;
@@ -180,6 +179,13 @@ static irqreturn_t rt5514_spi_irq(int irq, void *data) 
	if (rt5514_dsp->buf_base && rt5514_dsp->buf_limit &&

		rt5514_dsp->buf_rp && rt5514_dsp->buf_size)

		schedule_delayed_work(&rt5514_dsp->copy_work, 0);

}



static irqreturn_t rt5514_spi_irq(int irq, void *data)

{

	struct rt5514_dsp *rt5514_dsp = data;



	rt5514_schedule_copy(rt5514_dsp);



	return IRQ_HANDLED;

}
@@ -199,12 +205,19 @@ static int rt5514_spi_hw_params(struct snd_pcm_substream *substream, 
	struct rt5514_dsp *rt5514_dsp =

			snd_soc_platform_get_drvdata(rtd->platform);

	int ret;

	u8 buf[8];



	mutex_lock(&rt5514_dsp->dma_lock);

	ret = snd_pcm_lib_alloc_vmalloc_buffer(substream,

			params_buffer_bytes(hw_params));

	rt5514_dsp->substream = substream;

	rt5514_dsp->dma_offset = 0;



	/* Read IRQ status and schedule copy accordingly. */

	rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf));

	if (buf[0] & RT5514_IRQ_STATUS_BIT)

		rt5514_schedule_copy(rt5514_dsp);



	mutex_unlock(&rt5514_dsp->dma_lock);



	return ret;