sound fixes for 4.14
Linus,
please pull sound fixes for v4.14 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.14
The topmost commit is 75ee94b20b46459e3d29f5ac2c3af3cebdeef777
----------------------------------------------------------------
sound fixes for 4.14
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.
----------------------------------------------------------------
Hui Wang (1):
ALSA: hda - fix headset mic problem for Dell machines with alc274
Jussi Laako (1):
ALSA: usb-audio: support new Amanero Combo384 firmware version
Takashi Iwai (3):
ALSA: timer: Limit max instances per timer
ALSA: seq: Avoid invalid lockdep class warning
ALSA: seq: Fix OSS sysex delivery in OSS emulation
--- include/sound/seq_kernel.h | 3 +- include/sound/timer.h | 2 ++ sound/core/hrtimer.c | 1 + sound/core/seq/oss/seq_oss_midi.c | 4 +-- sound/core/seq/oss/seq_oss_readq.c | 29 +++++++++++++++++ sound/core/seq/oss/seq_oss_readq.h | 2 ++ sound/core/timer.c | 67 ++++++++++++++++++++++++++++++-------- sound/pci/hda/patch_realtek.c | 5 +++ sound/usb/quirks.c | 1 + 9 files changed, 97 insertions(+), 17 deletions(-)
include/sound/seq_kernel.h +2 -1
@@ -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
@@ -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
@@ -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
@@ -612,9 +612,7 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seqif (!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
@@ -117,6 +117,35 @@ snd_seq_oss_readq_puts(struct seq_oss_readq *q, int dev, unsigned char *data, inreturn 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
sound/core/seq/oss/seq_oss_readq.h +2 -0
@@ -44,6 +44,8 @@ void snd_seq_oss_readq_delete(struct seq_oss_readq *q);void snd_seq_oss_readq_clear (struct seq_oss_readq *readq);unsigned int snd_seq_oss_readq_poll (struct seq_oss_readq *readq,struct file *file,poll_table *wait);int snd_seq_oss_readq_puts (struct seq_oss_readq *readq,int dev,unsigned char *data,int len); +int snd_seq_oss_readq_sysex (struct seq_oss_readq *q,int dev, +struct snd_seq_event *ev);int snd_seq_oss_readq_put_event (struct seq_oss_readq *readq,union evrec *ev);int snd_seq_oss_readq_put_timestamp (struct seq_oss_readq *readq,unsigned long curt,int seq_mode);int snd_seq_oss_readq_pick (struct seq_oss_readq *q,union evrec *rec);
sound/core/timer.c +54 -13
173 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +5 -0
@@ -6544,6 +6544,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x1b, 0x90a70130}, {0x21, 0x03211020}), + SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, + {0x12, 0xb7a60130}, + {0x13, 0xb8a61140}, + {0x16, 0x90170110}, + {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, {0x12, 0x90a60130}, {0x14, 0x90170110},
sound/usb/quirks.c +1 -0
@@ -1375,6 +1375,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,case 0x199 :return SNDRV_PCM_FMTBIT_DSD_U32_LE ;case 0x19b : +case 0x203 :return SNDRV_PCM_FMTBIT_DSD_U32_BE ;default :break ;