From: Greg Kroah-Hartman Date: Wed, 25 Sep 2019 05:05:45 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.3.2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1f32d934a7bda90c88e4a36e3ca4003726fe2c0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch arm64-kpti-whitelist-cortex-a-cpus-that-don-t-implement-the-csv3-field.patch --- diff --git a/queue-4.14/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch b/queue-4.14/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch new file mode 100644 index 00000000000..0d300a6bb40 --- /dev/null +++ b/queue-4.14/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch @@ -0,0 +1,32 @@ +From 7b485d175631be676424aedb8cd2f66d0c93da78 Mon Sep 17 00:00:00 2001 +From: "Shih-Yuan Lee (FourDollars)" +Date: Fri, 20 Sep 2019 21:40:53 +0800 +Subject: ALSA: hda - Add laptop imic fixup for ASUS M9V laptop + +From: Shih-Yuan Lee (FourDollars) + +commit 7b485d175631be676424aedb8cd2f66d0c93da78 upstream. + +The same fixup to enable laptop imic is needed for ASUS M9V with AD1986A +codec like another HP machine. + +Signed-off-by: Shih-Yuan Lee (FourDollars) +Cc: +Link: https://lore.kernel.org/r/20190920134052.GA8035@localhost +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_analog.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_analog.c ++++ b/sound/pci/hda/patch_analog.c +@@ -370,6 +370,7 @@ static const struct hda_fixup ad1986a_fi + + static const struct snd_pci_quirk ad1986a_fixup_tbl[] = { + SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC), ++ SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9V", AD1986A_FIXUP_LAPTOP_IMIC), + SND_PCI_QUIRK(0x1043, 0x1443, "ASUS Z99He", AD1986A_FIXUP_EAPD), + SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD), + SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK), diff --git a/queue-4.14/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch b/queue-4.14/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch new file mode 100644 index 00000000000..cd7ef1bb7a4 --- /dev/null +++ b/queue-4.14/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch @@ -0,0 +1,37 @@ +From d2c63b7dfd06788a466d5ec8a850491f084c5fc2 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 20 Sep 2019 09:30:40 +0200 +Subject: ALSA: hda - Apply AMD controller workaround for Raven platform + +From: Takashi Iwai + +commit d2c63b7dfd06788a466d5ec8a850491f084c5fc2 upstream. + +It's reported that the garbled sound on HP Envy x360 13z-ag000 (Ryzen +Laptop) is fixed by the same workaround applied to other AMD chips. +Update the driver_data entry for Raven (1022:15e3) to use the newly +introduced preset, AZX_DCAPS_PRESET_AMD_SB. Since it already contains +AZX_DCAPS_PM_RUNTIME, we can drop that bit, too. + +Reported-and-tested-by: Dennis Padiernos +Cc: +Link: https://lore.kernel.org/r/20190920073040.31764-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2586,8 +2586,7 @@ static const struct pci_device_id azx_id + AZX_DCAPS_PM_RUNTIME }, + /* AMD Raven */ + { PCI_DEVICE(0x1022, 0x15e3), +- .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB | +- AZX_DCAPS_PM_RUNTIME }, ++ .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB }, + /* ATI HDMI */ + { PCI_DEVICE(0x1002, 0x0002), + .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, diff --git a/queue-4.14/arm64-kpti-whitelist-cortex-a-cpus-that-don-t-implement-the-csv3-field.patch b/queue-4.14/arm64-kpti-whitelist-cortex-a-cpus-that-don-t-implement-the-csv3-field.patch new file mode 100644 index 00000000000..cfdba1a5dc4 --- /dev/null +++ b/queue-4.14/arm64-kpti-whitelist-cortex-a-cpus-that-don-t-implement-the-csv3-field.patch @@ -0,0 +1,38 @@ +From 2a355ec25729053bb9a1a89b6c1d1cdd6c3b3fb1 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 13 Dec 2018 13:47:38 +0000 +Subject: arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field + +From: Will Deacon + +commit 2a355ec25729053bb9a1a89b6c1d1cdd6c3b3fb1 upstream. + +While the CSV3 field of the ID_AA64_PFR0 CPU ID register can be checked +to see if a CPU is susceptible to Meltdown and therefore requires kpti +to be enabled, existing CPUs do not implement this field. + +We therefore whitelist all unaffected Cortex-A CPUs that do not implement +the CSV3 field. + +Signed-off-by: Will Deacon +Signed-off-by: Niklas Cassel +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/kernel/cpufeature.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/arch/arm64/kernel/cpufeature.c ++++ b/arch/arm64/kernel/cpufeature.c +@@ -838,6 +838,11 @@ static bool unmap_kernel_at_el0(const st + switch (read_cpuid_id() & MIDR_CPU_MODEL_MASK) { + case MIDR_CAVIUM_THUNDERX2: + case MIDR_BRCM_VULCAN: ++ case MIDR_CORTEX_A53: ++ case MIDR_CORTEX_A55: ++ case MIDR_CORTEX_A57: ++ case MIDR_CORTEX_A72: ++ case MIDR_CORTEX_A73: + return false; + } + diff --git a/queue-4.14/series b/queue-4.14/series index d00d579248b..67b1fa6869d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -11,3 +11,6 @@ crypto-talitos-fix-missing-break-in-switch-statement.patch iwlwifi-mvm-send-bcast-management-frames-to-the-right-station.patch media-tvp5150-fix-switch-exit-in-set-control-handler.patch asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch +arm64-kpti-whitelist-cortex-a-cpus-that-don-t-implement-the-csv3-field.patch +alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch +alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch