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

Commit d1fea655 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: hda: Add driver blacklist 

commit 3c6fd1f07ed03a04debbb9a9d782205f1ef5e2ab upstream.

The recent AMD platform exposes an HD-audio bus but without any actual
codecs, which is internally tied with a USB-audio device, supposedly.
It results in "no codecs" error of HD-audio bus driver, and it's
nothing but a waste of resources.

This patch introduces a static blacklist table for skipping such a
known bogus PCI SSID entry.  As of writing this patch, the known SSIDs
are:
* 1043:874f - ASUS ROG Zenith II / Strix
* 1462:cb59 - MSI TRX40 Creator
* 1462:cb60 - MSI TRX40

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206543
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200408140449.22319-2-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2754914b

sound/pci/hda/hda_intel.c

+16 −0
Original line number Diff line number Diff line
@@ -2219,6 +2219,17 @@ static const struct hdac_io_ops pci_hda_io_ops = { 
	.dma_free_pages = dma_free_pages,

};



/* Blacklist for skipping the whole probe:

 * some HD-audio PCI entries are exposed without any codecs, and such devices

 * should be ignored from the beginning.

 */

static const struct snd_pci_quirk driver_blacklist[] = {

	SND_PCI_QUIRK(0x1043, 0x874f, "ASUS ROG Zenith II / Strix", 0),

	SND_PCI_QUIRK(0x1462, 0xcb59, "MSI TRX40 Creator", 0),

	SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0),

	{}

};



static const struct hda_controller_ops pci_hda_ops = {

	.disable_msi_reset_irq = disable_msi_reset_irq,

	.substream_alloc_pages = substream_alloc_pages,
@@ -2238,6 +2249,11 @@ static int azx_probe(struct pci_dev *pci, 
	bool schedule_probe;

	int err;



	if (snd_pci_quirk_lookup(pci, driver_blacklist)) {

		dev_info(&pci->dev, "Skipping the blacklisted device\n");

		return -ENODEV;

	}



	if (dev >= SNDRV_CARDS)

		return -ENODEV;

	if (!enable[dev]) {