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

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

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

Pull sound fixes from Takashi Iwai:
 "In this rc, we've got more volume than previous rc, unsurprisingly;
  the majority of updates in ASoC are about Intel drivers, and another
  major changes are the continued plumbing of ALSA timer bugs revealed
  by syzkaller fuzzer.  Hopefully both settle down now.

  Other than that, HD-audio received a couple of code fixes as well as
  the usual quirks, and various small fixes are found for FireWire
  devices, ASoC codecs and drivers"

* tag 'sound-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (50 commits)
  ASoC: arizona: fref must be limited in pseudo-fractional mode
  ASoC: sigmadsp: Fix missleading return value
  ALSA: timer: Fix race at concurrent reads
  ALSA: firewire-digi00x: Drop bogus const type qualifier on dot_scrt()
  ALSA: hda - Fix bad dereference of jack object
  ALSA: timer: Fix race between stop and interrupt
  ALSA: timer: Fix wrong instance passed to slave callbacks
  ASoC: Intel: Add module tags for common match module
  ASoC: Intel: Load the atom DPCM driver only
  ASoC: Intel: Create independent acpi match module
  ASoC: Intel: Revert "ASoC: Intel: fix ACPI probe regression with Atom DPCM driver"
  ALSA: dummy: Implement timer backend switching more safely
  ALSA: hda - Fix speaker output from VAIO AiO machines
  Revert "ALSA: hda - Fix noise on Gigabyte Z170X mobo"
  ALSA: firewire-tascam: remove needless member for control and status message
  ALSA: firewire-tascam: remove a flag for controller
  ALSA: firewire-tascam: add support for FW-1804
  ALSA: firewire-tascam: fix NULL pointer dereference when model identification fails
  ALSA: hda - Fix static checker warning in patch_hdmi.c
  ASoC: Intel: Skylake: Remove autosuspend delay
  ...
parents 14379cdc 86c2ee16

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently: 
 "fsl,imx-audio-sgtl5000"

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)



 "fsl,imx-audio-wm8960"



Required properties:



  - compatible		: Contains one of entries in the compatible list.

sound/core/timer.c

+20 −20
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) 
	spin_lock_irqsave(&timer->lock, flags);

	list_for_each_entry(ts, &ti->slave_active_head, active_list)

		if (ts->ccallback)

			ts->ccallback(ti, event + 100, &tstamp, resolution);

			ts->ccallback(ts, event + 100, &tstamp, resolution);

	spin_unlock_irqrestore(&timer->lock, flags);

}
@@ -518,9 +518,13 @@ static int _snd_timer_stop(struct snd_timer_instance *timeri, int event) 
			spin_unlock_irqrestore(&slave_active_lock, flags);

			return -EBUSY;

		}

		if (timeri->timer)

			spin_lock(&timeri->timer->lock);

		timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING;

		list_del_init(&timeri->ack_list);

		list_del_init(&timeri->active_list);

		if (timeri->timer)

			spin_unlock(&timeri->timer->lock);

		spin_unlock_irqrestore(&slave_active_lock, flags);

		goto __end;

	}
@@ -1929,6 +1933,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 
{

	struct snd_timer_user *tu;

	long result = 0, unit;

	int qhead;

	int err = 0;



	tu = file->private_data;
@@ -1940,7 +1945,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 


			if ((file->f_flags & O_NONBLOCK) != 0 || result > 0) {

				err = -EAGAIN;

				break;

				goto _error;

			}



			set_current_state(TASK_INTERRUPTIBLE);
@@ -1955,42 +1960,37 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 


			if (tu->disconnected) {

				err = -ENODEV;

				break;

				goto _error;

			}

			if (signal_pending(current)) {

				err = -ERESTARTSYS;

				break;

				goto _error;

			}

		}



		qhead = tu->qhead++;

		tu->qhead %= tu->queue_size;

		spin_unlock_irq(&tu->qlock);

		if (err < 0)

			goto _error;



		if (tu->tread) {

			if (copy_to_user(buffer, &tu->tqueue[tu->qhead++],

					 sizeof(struct snd_timer_tread))) {

			if (copy_to_user(buffer, &tu->tqueue[qhead],

					 sizeof(struct snd_timer_tread)))

				err = -EFAULT;

				goto _error;

			}

		} else {

			if (copy_to_user(buffer, &tu->queue[tu->qhead++],

					 sizeof(struct snd_timer_read))) {

			if (copy_to_user(buffer, &tu->queue[qhead],

					 sizeof(struct snd_timer_read)))

				err = -EFAULT;

				goto _error;

			}

		}



		tu->qhead %= tu->queue_size;



		result += unit;

		buffer += unit;



		spin_lock_irq(&tu->qlock);

		tu->qused--;

		if (err < 0)

			goto _error;

		result += unit;

		buffer += unit;

	}

	spin_unlock_irq(&tu->qlock);

 _error:

	spin_unlock_irq(&tu->qlock);

	return result > 0 ? result : err;

}

sound/drivers/dummy.c

+19 −18
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-128) for dummy driver."); 
module_param(fake_buffer, bool, 0444);

MODULE_PARM_DESC(fake_buffer, "Fake buffer allocations.");

#ifdef CONFIG_HIGH_RES_TIMERS

module_param(hrtimer, bool, 0444);

module_param(hrtimer, bool, 0644);

MODULE_PARM_DESC(hrtimer, "Use hrtimer as the timer source.");

#endif
@@ -109,6 +109,9 @@ struct dummy_timer_ops { 
	snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *);

};



#define get_dummy_ops(substream) \

	(*(const struct dummy_timer_ops **)(substream)->runtime->private_data)



struct dummy_model {

	const char *name;

	int (*playback_constraints)(struct snd_pcm_runtime *runtime);
@@ -137,7 +140,6 @@ struct snd_dummy { 
	int iobox;

	struct snd_kcontrol *cd_volume_ctl;

	struct snd_kcontrol *cd_switch_ctl;

	const struct dummy_timer_ops *timer_ops;

};



/*
@@ -231,6 +233,8 @@ static struct dummy_model *dummy_models[] = { 
 */



struct dummy_systimer_pcm {

	/* ops must be the first item */

	const struct dummy_timer_ops *timer_ops;

	spinlock_t lock;

	struct timer_list timer;

	unsigned long base_time;
@@ -366,6 +370,8 @@ static const struct dummy_timer_ops dummy_systimer_ops = { 
 */



struct dummy_hrtimer_pcm {

	/* ops must be the first item */

	const struct dummy_timer_ops *timer_ops;

	ktime_t base_time;

	ktime_t period_time;

	atomic_t running;
@@ -492,31 +498,25 @@ static const struct dummy_timer_ops dummy_hrtimer_ops = { 


static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

		return dummy->timer_ops->start(substream);

		return get_dummy_ops(substream)->start(substream);

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

		return dummy->timer_ops->stop(substream);

		return get_dummy_ops(substream)->stop(substream);

	}

	return -EINVAL;

}



static int dummy_pcm_prepare(struct snd_pcm_substream *substream)

{

	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);



	return dummy->timer_ops->prepare(substream);

	return get_dummy_ops(substream)->prepare(substream);

}



static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream)

{

	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);



	return dummy->timer_ops->pointer(substream);

	return get_dummy_ops(substream)->pointer(substream);

}



static struct snd_pcm_hardware dummy_pcm_hardware = {
@@ -562,17 +562,19 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) 
	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);

	struct dummy_model *model = dummy->model;

	struct snd_pcm_runtime *runtime = substream->runtime;

	const struct dummy_timer_ops *ops;

	int err;



	dummy->timer_ops = &dummy_systimer_ops;

	ops = &dummy_systimer_ops;

#ifdef CONFIG_HIGH_RES_TIMERS

	if (hrtimer)

		dummy->timer_ops = &dummy_hrtimer_ops;

		ops = &dummy_hrtimer_ops;

#endif



	err = dummy->timer_ops->create(substream);

	err = ops->create(substream);

	if (err < 0)

		return err;

	get_dummy_ops(substream) = ops;



	runtime->hw = dummy->pcm_hw;

	if (substream->pcm->device & 1) {
@@ -594,7 +596,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) 
			err = model->capture_constraints(substream->runtime);

	}

	if (err < 0) {

		dummy->timer_ops->free(substream);

		get_dummy_ops(substream)->free(substream);

		return err;

	}

	return 0;
@@ -602,8 +604,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) 


static int dummy_pcm_close(struct snd_pcm_substream *substream)

{

	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);

	dummy->timer_ops->free(substream);

	get_dummy_ops(substream)->free(substream);

	return 0;

}

sound/firewire/digi00x/amdtp-dot.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct amdtp_dot { 
#define BYTE_PER_SAMPLE (4)

#define MAGIC_DOT_BYTE (2)

#define MAGIC_BYTE_OFF(x) (((x) * BYTE_PER_SAMPLE) + MAGIC_DOT_BYTE)

static const u8 dot_scrt(const u8 idx, const unsigned int off)

static u8 dot_scrt(const u8 idx, const unsigned int off)

{

	/*

	 * the length of the added pattern only depends on the lower nibble

sound/firewire/tascam/tascam-transaction.c

+6 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ int snd_tscm_transaction_register(struct snd_tscm *tscm) 
	return err;

error:

	fw_core_remove_address_handler(&tscm->async_handler);

	tscm->async_handler.callback_data = NULL;

	return err;

}
@@ -276,6 +277,9 @@ void snd_tscm_transaction_unregister(struct snd_tscm *tscm) 
	__be32 reg;

	unsigned int i;



	if (tscm->async_handler.callback_data == NULL)

		return;



	/* Turn off FireWire LED. */

	reg = cpu_to_be32(0x0000008e);

	snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST,
@@ -297,6 +301,8 @@ void snd_tscm_transaction_unregister(struct snd_tscm *tscm) 
			   &reg, sizeof(reg), 0);



	fw_core_remove_address_handler(&tscm->async_handler);

	tscm->async_handler.callback_data = NULL;



	for (i = 0; i < TSCM_MIDI_OUT_PORT_MAX; i++)

		snd_fw_async_midi_port_destroy(&tscm->out_ports[i]);

}