From: Greg Kroah-Hartman Date: Fri, 8 May 2020 09:52:42 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.4.223~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c845430fa924ad8be9c5a6b53988adb41f64b1ca;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch --- diff --git a/queue-4.4/alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch b/queue-4.4/alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch new file mode 100644 index 00000000000..f4f3dc79b2c --- /dev/null +++ b/queue-4.4/alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch @@ -0,0 +1,54 @@ +From 977dfef40c8996b69afe23a9094d184049efb7bb Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 24 Apr 2020 08:12:22 +0200 +Subject: ALSA: hda: Match both PCI ID and SSID for driver blacklist + +From: Takashi Iwai + +commit 977dfef40c8996b69afe23a9094d184049efb7bb upstream. + +The commit 3c6fd1f07ed0 ("ALSA: hda: Add driver blacklist") added a +new blacklist for the devices that are known to have empty codecs, and +one of the entries was ASUS ROG Zenith II (PCI SSID 1043:874f). +However, it turned out that the very same PCI SSID is used for the +previous model that does have the valid HD-audio codecs and the change +broke the sound on it. + +Since the empty codec problem appear on the certain AMD platform (PCI +ID 1022:1487), this patch changes the blacklist matching to both PCI +ID and SSID using pci_match_id(). Also, the entry that was removed by +the previous fix for ASUS ROG Zenigh II is re-added. + +Link: https://lore.kernel.org/r/20200424061222.19792-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -1977,9 +1977,10 @@ static const struct hdac_io_ops pci_hda_ + * 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(0x1462, 0xcb59, "MSI TRX40 Creator", 0), +- SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0), ++static const struct pci_device_id driver_blacklist[] = { ++ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */ ++ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */ ++ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */ + {} + }; + +@@ -2002,7 +2003,7 @@ static int azx_probe(struct pci_dev *pci + bool schedule_probe; + int err; + +- if (snd_pci_quirk_lookup(pci, driver_blacklist)) { ++ if (pci_match_id(driver_blacklist, pci)) { + dev_info(&pci->dev, "Skipping the blacklisted device\n"); + return -ENODEV; + } diff --git a/queue-4.4/series b/queue-4.4/series index b1b96ba7675..07a96dbf861 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -319,3 +319,4 @@ net-skbuff-remove-errornous-length-validation-in-skb_vlan_pop.patch net-ep93xx_eth-do-not-crash-unloading-module.patch macvlan-fix-potential-use-after-free-for-broadcasts.patch sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch +alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch