5.6-stable patches

added patches:
	alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch
	x86-kvm-fix-a-missing-prototypes-vmread_error.patch

diff --git a/queue-5.6/alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch b/queue-5.6/alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch
new file mode 100644 (file)
index 0000000..3322a16
--- /dev/null
+++ b/queue-5.6/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 <tiwai@suse.de>
+Date: Fri, 24 Apr 2020 08:12:22 +0200
+Subject: ALSA: hda: Match both PCI ID and SSID for driver blacklist
+
+From: Takashi Iwai <tiwai@suse.de>
+
+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 <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -2075,9 +2075,10 @@ static void pcm_mmap_prepare(struct snd_
+  * 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 */
+       {}
+ };
+ 
+@@ -2097,7 +2098,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-5.6/series b/queue-5.6/series
index eec77dec3464a4de0b770c38a901e28d205b7912..c46b2fff823510ba635083f348fb302367d42db9 100644 (file)
--- a/queue-5.6/series
+++ b/queue-5.6/series
@@ -40,3 +40,5 @@ net-systemport-suppress-warnings-on-failed-rx-skb-al.patch
 tools-runqslower-ensure-own-vmlinux.h-is-picked-up-f.patch
 sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch
 drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch
+alsa-hda-match-both-pci-id-and-ssid-for-driver-blacklist.patch
+x86-kvm-fix-a-missing-prototypes-vmread_error.patch

diff --git a/queue-5.6/x86-kvm-fix-a-missing-prototypes-vmread_error.patch b/queue-5.6/x86-kvm-fix-a-missing-prototypes-vmread_error.patch
new file mode 100644 (file)
index 0000000..f775520
--- /dev/null
+++ b/queue-5.6/x86-kvm-fix-a-missing-prototypes-vmread_error.patch
@@ -0,0 +1,36 @@
+From 514ccc194971d0649e4e7ec8a9b3a6e33561d7bf Mon Sep 17 00:00:00 2001
+From: Qian Cai <cai@lca.pw>
+Date: Thu, 2 Apr 2020 11:39:55 -0400
+Subject: x86/kvm: fix a missing-prototypes "vmread_error"
+
+From: Qian Cai <cai@lca.pw>
+
+commit 514ccc194971d0649e4e7ec8a9b3a6e33561d7bf upstream.
+
+The commit 842f4be95899 ("KVM: VMX: Add a trampoline to fix VMREAD error
+handling") removed the declaration of vmread_error() causes a W=1 build
+failure with KVM_WERROR=y. Fix it by adding it back.
+
+arch/x86/kvm/vmx/vmx.c:359:17: error: no previous prototype for 'vmread_error' [-Werror=missing-prototypes]
+ asmlinkage void vmread_error(unsigned long field, bool fault)
+                 ^~~~~~~~~~~~
+
+Signed-off-by: Qian Cai <cai@lca.pw>
+Message-Id: <20200402153955.1695-1-cai@lca.pw>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/vmx/ops.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/x86/kvm/vmx/ops.h
++++ b/arch/x86/kvm/vmx/ops.h
+@@ -12,6 +12,7 @@
+ 
+ #define __ex(x) __kvm_handle_fault_on_reboot(x)
+ 
++asmlinkage void vmread_error(unsigned long field, bool fault);
+ __attribute__((regparm(0))) void vmread_error_trampoline(unsigned long field,
+                                                        bool fault);
+ void vmwrite_error(unsigned long field, unsigned long value);