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

Commit 2acee31c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Still more incoming fixes than wished at this stage, but all look like
  small and reasonable fixes.

  In addition to the usual HD-audio and USB-audio quirks for various
  devices, two notable changes are included:

   - a fix for USB-audio UAF at probing a malformed descriptor

   - workarounds for PCM rwsem mutex starvation"

* tag 'sound-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Fix mic issue on Acer AIO Veriton Z4860G/Z6860G
  ALSA: hda/realtek: Fix mic issue on Acer AIO Veriton Z4660G
  ALSA: hda/realtek - Add support for Acer Aspire C24-860 headset mic
  ALSA: hda/realtek: ALC286 mic and headset-mode fixups for Acer Aspire U27-880
  ALSA: usb-audio: Fix UAF decrement if card has no live interfaces in card.c
  ALSA: hda/realtek - Fix speaker output regression on Thinkpad T570
  ALSA: pcm: Fix interval evaluation with openmin/max
  ALSA: hda: Add support for AMD Stoney Ridge
  ALSA: usb-audio: Add SMSL D1 to quirks for native DSD support
  ALSA: pcm: Fix starvation on down_write_nonblock()
  ALSA: pcm: Call snd_pcm_unlink() conditionally at closing
parents 002f421a b72f936f

include/sound/pcm_params.h

+3 −1
Original line number Diff line number Diff line
@@ -254,11 +254,13 @@ static inline int snd_interval_empty(const struct snd_interval *i) 
static inline int snd_interval_single(const struct snd_interval *i)

{

	return (i->min == i->max || 

		(i->min + 1 == i->max && i->openmax));

		(i->min + 1 == i->max && (i->openmin || i->openmax)));

}



static inline int snd_interval_value(const struct snd_interval *i)

{

	if (i->openmin && !i->openmax)

		return i->max;

	return i->min;

}

sound/core/pcm_native.c

+8 −6
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <sound/timer.h>

#include <sound/minors.h>

#include <linux/uio.h>

#include <linux/delay.h>



#include "pcm_local.h"
@@ -91,12 +92,12 @@ static DECLARE_RWSEM(snd_pcm_link_rwsem); 
 * and this may lead to a deadlock when the code path takes read sem

 * twice (e.g. one in snd_pcm_action_nonatomic() and another in

 * snd_pcm_stream_lock()).  As a (suboptimal) workaround, let writer to

 * spin until it gets the lock.

 * sleep until all the readers are completed without blocking by writer.

 */

static inline void down_write_nonblock(struct rw_semaphore *lock)

static inline void down_write_nonfifo(struct rw_semaphore *lock)

{

	while (!down_write_trylock(lock))

		cond_resched();

		msleep(1);

}



#define PCM_LOCK_DEFAULT	0
@@ -1967,7 +1968,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd) 
		res = -ENOMEM;

		goto _nolock;

	}

	down_write_nonblock(&snd_pcm_link_rwsem);

	down_write_nonfifo(&snd_pcm_link_rwsem);

	write_lock_irq(&snd_pcm_link_rwlock);

	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN ||

	    substream->runtime->status->state != substream1->runtime->status->state ||
@@ -2014,7 +2015,7 @@ static int snd_pcm_unlink(struct snd_pcm_substream *substream) 
	struct snd_pcm_substream *s;

	int res = 0;



	down_write_nonblock(&snd_pcm_link_rwsem);

	down_write_nonfifo(&snd_pcm_link_rwsem);

	write_lock_irq(&snd_pcm_link_rwlock);

	if (!snd_pcm_stream_linked(substream)) {

		res = -EALREADY;
@@ -2369,6 +2370,7 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream) 


static void pcm_release_private(struct snd_pcm_substream *substream)

{

	if (snd_pcm_stream_linked(substream))

		snd_pcm_unlink(substream);

}

sound/pci/hda/hda_intel.c

+4 −0
Original line number Diff line number Diff line
@@ -2498,6 +2498,10 @@ static const struct pci_device_id azx_ids[] = { 
	/* AMD Hudson */

	{ PCI_DEVICE(0x1022, 0x780d),

	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },

	/* AMD Stoney */

	{ PCI_DEVICE(0x1022, 0x157a),

	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |

			 AZX_DCAPS_PM_RUNTIME },

	/* AMD Raven */

	{ PCI_DEVICE(0x1022, 0x15e3),

	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |

sound/pci/hda/patch_realtek.c

+27 −0
Original line number Diff line number Diff line
@@ -4988,9 +4988,18 @@ static void alc_fixup_tpt470_dock(struct hda_codec *codec, 
		{ 0x19, 0x21a11010 }, /* dock mic */

		{ }

	};

	/* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise

	 * the speaker output becomes too low by some reason on Thinkpads with

	 * ALC298 codec

	 */

	static hda_nid_t preferred_pairs[] = {

		0x14, 0x03, 0x17, 0x02, 0x21, 0x02,

		0

	};

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->gen.preferred_dacs = preferred_pairs;

		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;

		snd_hda_apply_pincfgs(codec, pincfgs);

	} else if (action == HDA_FIXUP_ACT_INIT) {
@@ -5510,6 +5519,7 @@ enum { 
	ALC221_FIXUP_HP_HEADSET_MIC,

	ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,

	ALC295_FIXUP_HP_AUTO_MUTE,

	ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -6387,6 +6397,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_auto_mute_via_amp,

	},

	[ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

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

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

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MIC

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -6401,7 +6420,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),

	SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),

	SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),

	SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),

	SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),

	SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X),
@@ -7065,6 +7088,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x14, 0x90170110},

		{0x19, 0x04a11040},

		{0x21, 0x04211020}),

	SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,

		{0x12, 0x90a60130},

		{0x17, 0x90170110},

		{0x21, 0x02211020}),

	SND_HDA_PIN_QUIRK(0x10ec0288, 0x1028, "Dell", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60120},

		{0x14, 0x90170110},

sound/usb/card.c

+4 −1
Original line number Diff line number Diff line
@@ -682,9 +682,12 @@ static int usb_audio_probe(struct usb_interface *intf, 


 __error:

	if (chip) {

		/* chip->active is inside the chip->card object,

		 * decrement before memory is possibly returned.

		 */

		atomic_dec(&chip->active);

		if (!chip->num_interfaces)

			snd_card_free(chip->card);

		atomic_dec(&chip->active);

	}

	mutex_unlock(&register_mutex);

	return err;