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

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

Pull sound fixes from Takashi Iwai:
 "The amount of the changes isn't as quite small as wished, nevertheless
  they are straight fixes that deserve merging to 4.14 final.

  Most of fixes are about ALSA core bugs spotted by fuzzer: a follow-up
  fix for the previous nested rwsem patch, a fix to avoid the resource
  hogs due to too many concurrent ALSA timer invocations, and a fix for
  a crash with SYSEX MIDI transfer over OSS sequencer emulation that is
  used by none but fuzzer.

  The rest are usual HD-audio and USB-audio device-specific quirks,
  which are safe to apply"

* tag 'sound-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - fix headset mic problem for Dell machines with alc274
  ALSA: seq: Fix OSS sysex delivery in OSS emulation
  ALSA: seq: Avoid invalid lockdep class warning
  ALSA: timer: Limit max instances per timer
  ALSA: usb-audio: support new Amanero Combo384 firmware version
parents d1041cdc 75ee94b2

include/sound/seq_kernel.h

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ typedef union snd_seq_timestamp snd_seq_timestamp_t; 
#define SNDRV_SEQ_DEFAULT_CLIENT_EVENTS	200



/* max delivery path length */

#define SNDRV_SEQ_MAX_HOPS		10

/* NOTE: this shouldn't be greater than MAX_LOCKDEP_SUBCLASSES */

#define SNDRV_SEQ_MAX_HOPS		8



/* max size of event size */

#define SNDRV_SEQ_MAX_EVENT_LEN		0x3fffffff

include/sound/timer.h

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ struct snd_timer { 
	struct list_head ack_list_head;

	struct list_head sack_list_head; /* slow ack list head */

	struct tasklet_struct task_queue;

	int max_instances;	/* upper limit of timer instances */

	int num_instances;	/* current number of timer instances */

};



struct snd_timer_instance {

sound/core/hrtimer.c

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static int __init snd_hrtimer_init(void) 
	timer->hw = hrtimer_hw;

	timer->hw.resolution = resolution;

	timer->hw.ticks = NANO_SEC / resolution;

	timer->max_instances = 100; /* lower the limit */



	err = snd_timer_global_register(timer);

	if (err < 0) {

sound/core/seq/oss/seq_oss_midi.c

+1 −3
Original line number Diff line number Diff line
@@ -612,9 +612,7 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq 
	if (!dp->timer->running)

		len = snd_seq_oss_timer_start(dp->timer);

	if (ev->type == SNDRV_SEQ_EVENT_SYSEX) {

		if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) == SNDRV_SEQ_EVENT_LENGTH_VARIABLE)

			snd_seq_oss_readq_puts(dp->readq, mdev->seq_device,

					       ev->data.ext.ptr, ev->data.ext.len);

		snd_seq_oss_readq_sysex(dp->readq, mdev->seq_device, ev);

	} else {

		len = snd_midi_event_decode(mdev->coder, msg, sizeof(msg), ev);

		if (len > 0)

sound/core/seq/oss/seq_oss_readq.c

+29 −0
Original line number Diff line number Diff line
@@ -117,6 +117,35 @@ snd_seq_oss_readq_puts(struct seq_oss_readq *q, int dev, unsigned char *data, in 
	return 0;

}



/*

 * put MIDI sysex bytes; the event buffer may be chained, thus it has

 * to be expanded via snd_seq_dump_var_event().

 */

struct readq_sysex_ctx {

	struct seq_oss_readq *readq;

	int dev;

};



static int readq_dump_sysex(void *ptr, void *buf, int count)

{

	struct readq_sysex_ctx *ctx = ptr;



	return snd_seq_oss_readq_puts(ctx->readq, ctx->dev, buf, count);

}



int snd_seq_oss_readq_sysex(struct seq_oss_readq *q, int dev,

			    struct snd_seq_event *ev)

{

	struct readq_sysex_ctx ctx = {

		.readq = q,

		.dev = dev

	};



	if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE)

		return 0;

	return snd_seq_dump_var_event(ev, readq_dump_sysex, &ctx);

}



/*

 * copy an event to input queue:

 * return zero if enqueued

CRA Git | Maintained and supported by SUSTech CRA and CCSE