Commit 1742bcd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Things look good and calming down; the only change to ALSA core is the
  fix for racy rawmidi buffer accesses spotted by syzkaller, and the
  rest are all small device-specific quirks for HD-audio and USB-audio
  devices"

* tag 'sound-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek - Limit int mic boost for Thinkpad T530
  ALSA: hda/realtek - Add COEF workaround for ASUS ZenBook UX431DA
  ALSA: hda/realtek: Enable headset mic of ASUS UX581LV with ALC295
  ALSA: hda/realtek - Enable headset mic of ASUS UX550GE with ALC295
  ALSA: hda/realtek - Enable headset mic of ASUS GL503VM with ALC295
  ALSA: hda/realtek: Add quirk for Samsung Notebook
  ALSA: rawmidi: Fix racy buffer resize under concurrent accesses
  ALSA: usb-audio: add mapping for ASRock TRX40 Creator
  ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse
  Revert "ALSA: hda/realtek: Fix pop noise on ALC225"
  ALSA: firewire-lib: fix 'function sizeof not defined' error of tracepoints format
  ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset
parents e7cea790 b590b38c

include/sound/rawmidi.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct snd_rawmidi_runtime { 
	size_t avail_min;	/* min avail for wakeup */

	size_t avail;		/* max used buffer for wakeup */

	size_t xruns;		/* over/underruns counter */

	int buffer_ref;		/* buffer reference count */

	/* misc */

	spinlock_t lock;

	wait_queue_head_t sleep;

sound/core/rawmidi.c

+27 −4
Original line number Diff line number Diff line
@@ -120,6 +120,17 @@ static void snd_rawmidi_input_event_work(struct work_struct *work) 
		runtime->event(runtime->substream);

}



/* buffer refcount management: call with runtime->lock held */

static inline void snd_rawmidi_buffer_ref(struct snd_rawmidi_runtime *runtime)

{

	runtime->buffer_ref++;

}



static inline void snd_rawmidi_buffer_unref(struct snd_rawmidi_runtime *runtime)

{

	runtime->buffer_ref--;

}



static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream)

{

	struct snd_rawmidi_runtime *runtime;
@@ -669,6 +680,11 @@ static int resize_runtime_buffer(struct snd_rawmidi_runtime *runtime, 
		if (!newbuf)

			return -ENOMEM;

		spin_lock_irq(&runtime->lock);

		if (runtime->buffer_ref) {

			spin_unlock_irq(&runtime->lock);

			kvfree(newbuf);

			return -EBUSY;

		}

		oldbuf = runtime->buffer;

		runtime->buffer = newbuf;

		runtime->buffer_size = params->buffer_size;
@@ -1019,8 +1035,10 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, 
	long result = 0, count1;

	struct snd_rawmidi_runtime *runtime = substream->runtime;

	unsigned long appl_ptr;

	int err = 0;



	spin_lock_irqsave(&runtime->lock, flags);

	snd_rawmidi_buffer_ref(runtime);

	while (count > 0 && runtime->avail) {

		count1 = runtime->buffer_size - runtime->appl_ptr;

		if (count1 > count)
@@ -1039,16 +1057,19 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, 
		if (userbuf) {

			spin_unlock_irqrestore(&runtime->lock, flags);

			if (copy_to_user(userbuf + result,

					 runtime->buffer + appl_ptr, count1)) {

				return result > 0 ? result : -EFAULT;

			}

					 runtime->buffer + appl_ptr, count1))

				err = -EFAULT;

			spin_lock_irqsave(&runtime->lock, flags);

			if (err)

				goto out;

		}

		result += count1;

		count -= count1;

	}

 out:

	snd_rawmidi_buffer_unref(runtime);

	spin_unlock_irqrestore(&runtime->lock, flags);

	return result;

	return result > 0 ? result : err;

}



long snd_rawmidi_kernel_read(struct snd_rawmidi_substream *substream,
@@ -1342,6 +1363,7 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, 
			return -EAGAIN;

		}

	}

	snd_rawmidi_buffer_ref(runtime);

	while (count > 0 && runtime->avail > 0) {

		count1 = runtime->buffer_size - runtime->appl_ptr;

		if (count1 > count)
@@ -1373,6 +1395,7 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, 
	}

      __end:

	count1 = runtime->avail < runtime->buffer_size;

	snd_rawmidi_buffer_unref(runtime);

	spin_unlock_irqrestore(&runtime->lock, flags);

	if (count1)

		snd_rawmidi_output_trigger(substream, 1);

sound/firewire/amdtp-stream-trace.h

+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ TRACE_EVENT(amdtp_packet, 
		__entry->irq,

		__entry->index,

		__print_array(__get_dynamic_array(cip_header),

			      __get_dynamic_array_len(cip_header),

			      sizeof(u8)))

			      __get_dynamic_array_len(cip_header), 1))

);



#endif

sound/pci/hda/patch_realtek.c

+71 −3
Original line number Diff line number Diff line
@@ -5856,6 +5856,15 @@ static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec, 
	}

}



static void alc225_fixup_s3_pop_noise(struct hda_codec *codec,

				      const struct hda_fixup *fix, int action)

{

	if (action != HDA_FIXUP_ACT_PRE_PROBE)

		return;



	codec->power_save_node = 1;

}



/* Forcibly assign NID 0x03 to HP/LO while NID 0x02 to SPK for EQ */

static void alc274_fixup_bind_dacs(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)
@@ -5960,6 +5969,7 @@ enum { 
	ALC269_FIXUP_HP_LINE1_MIC1_LED,

	ALC269_FIXUP_INV_DMIC,

	ALC269_FIXUP_LENOVO_DOCK,

	ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST,

	ALC269_FIXUP_NO_SHUTUP,

	ALC286_FIXUP_SONY_MIC_NO_PRESENCE,

	ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
@@ -6045,6 +6055,7 @@ enum { 
	ALC233_FIXUP_ACER_HEADSET_MIC,

	ALC294_FIXUP_LENOVO_MIC_LOCATION,

	ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE,

	ALC225_FIXUP_S3_POP_NOISE,

	ALC700_FIXUP_INTEL_REFERENCE,

	ALC274_FIXUP_DELL_BIND_DACS,

	ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
@@ -6080,9 +6091,12 @@ enum { 
	ALC294_FIXUP_ASUS_DUAL_SPK,

	ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	ALC294_FIXUP_ASUS_HPE,

	ALC294_FIXUP_ASUS_COEF_1B,

	ALC285_FIXUP_HP_GPIO_LED,

	ALC285_FIXUP_HP_MUTE_LED,

	ALC236_FIXUP_HP_MUTE_LED,

	ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,

	ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -6280,6 +6294,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT

	},

	[ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,

		.chained = true,

		.chain_id = ALC269_FIXUP_LENOVO_DOCK,

	},

	[ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,
@@ -6932,6 +6952,12 @@ static const struct hda_fixup alc269_fixups[] = { 
			{ }

		},

		.chained = true,

		.chain_id = ALC225_FIXUP_S3_POP_NOISE

	},

	[ALC225_FIXUP_S3_POP_NOISE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc225_fixup_s3_pop_noise,

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC

	},

	[ALC700_FIXUP_INTEL_REFERENCE] = {
@@ -7204,6 +7230,17 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC

	},

	[ALC294_FIXUP_ASUS_COEF_1B] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			/* Set bit 10 to correct noisy output after reboot from

			 * Windows 10 (due to pop noise reduction?)

			 */

			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x1b },

			{ 0x20, AC_VERB_SET_PROC_COEF, 0x4e4b },

			{ }

		},

	},

	[ALC285_FIXUP_HP_GPIO_LED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_gpio_led,
@@ -7216,6 +7253,22 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc236_fixup_hp_mute_led,

	},

	[ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc5 },

			{ }

		},

	},

	[ALC295_FIXUP_ASUS_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7383,8 +7436,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x19ce, "ASUS B9450FA", ALC294_FIXUP_ASUS_HPE),

	SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),

	SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),

	SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -7410,6 +7465,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),

	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),

	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),

	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),

	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
@@ -7426,7 +7483,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x21f3, "Thinkpad T430", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
@@ -7565,6 +7622,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC269_FIXUP_HEADSET_MODE, .name = "headset-mode"},

	{.id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, .name = "headset-mode-no-hp-mic"},

	{.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},

	{.id = ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST, .name = "lenovo-dock-limit-boost"},

	{.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},

	{.id = ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED, .name = "hp-dock-gpio-mic1-led"},

	{.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
@@ -7993,6 +8051,18 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x12, 0x90a60130},

		{0x17, 0x90170110},

		{0x21, 0x03211020}),

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,

		{0x12, 0x90a60120},

		{0x17, 0x90170110},

		{0x21, 0x04211030}),

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,

		{0x12, 0x90a60130},

		{0x17, 0x90170110},

		{0x21, 0x03211020}),

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,

		{0x12, 0x90a60130},

		{0x17, 0x90170110},

		{0x21, 0x03211020}),

	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,

		{0x14, 0x90170110},

		{0x21, 0x04211020}),
@@ -8209,8 +8279,6 @@ static int patch_alc269(struct hda_codec *codec) 
		spec->gen.mixer_nid = 0;

		break;

	case 0x10ec0225:

		codec->power_save_node = 1;

		/* fall through */

	case 0x10ec0295:

	case 0x10ec0299:

		spec->codec_variant = ALC269_TYPE_ALC225;

sound/usb/mixer_maps.c

+5 −0
Original line number Diff line number Diff line
@@ -549,6 +549,11 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { 
		.map = trx40_mobo_map,

		.connector_map = trx40_mobo_connector_map,

	},

	{	/* Asrock TRX40 Creator */

		.id = USB_ID(0x26ce, 0x0a01),

		.map = trx40_mobo_map,

		.connector_map = trx40_mobo_connector_map,

	},

	{ 0 } /* terminator */

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE