From: Greg Kroah-Hartman Date: Tue, 13 Mar 2018 10:47:28 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.14.27~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beae9b1a0054d9f1fe53576569e8cb6ce0f04a93;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: arm-omap2-hide-omap3_save_secure_ram-on-non-omap3-builds.patch asoc-intel-kbl-fix-jack-name.patch asoc-intel-skylake-fix-jack-name-format-substitution.patch --- diff --git a/queue-4.14/arm-omap2-hide-omap3_save_secure_ram-on-non-omap3-builds.patch b/queue-4.14/arm-omap2-hide-omap3_save_secure_ram-on-non-omap3-builds.patch new file mode 100644 index 00000000000..54a95aaf2a2 --- /dev/null +++ b/queue-4.14/arm-omap2-hide-omap3_save_secure_ram-on-non-omap3-builds.patch @@ -0,0 +1,47 @@ +From 863204cfdae98626a92535ac928ad79f4d6b74ff Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 6 Dec 2017 14:17:17 +0100 +Subject: ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds + +From: Arnd Bergmann + +commit 863204cfdae98626a92535ac928ad79f4d6b74ff upstream. + +In configurations without CONFIG_OMAP3 but with secure RAM support, +we now run into a link failure: + +arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram': +omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context' + +The omap3_save_secure_ram() function is only called from the OMAP34xx +power management code, so we can simply hide that function in the +appropriate #ifdef. + +Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context") +Acked-by: Tony Lindgren +Tested-by: Dan Murphy +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mach-omap2/omap-secure.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/mach-omap2/omap-secure.c ++++ b/arch/arm/mach-omap2/omap-secure.c +@@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base + return omap_secure_memblock_base; + } + ++#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) + u32 omap3_save_secure_ram(void __iomem *addr, int size) + { + u32 ret; +@@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem * + + return ret; + } ++#endif + + /** + * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls diff --git a/queue-4.14/asoc-intel-kbl-fix-jack-name.patch b/queue-4.14/asoc-intel-kbl-fix-jack-name.patch new file mode 100644 index 00000000000..915bfcb63e0 --- /dev/null +++ b/queue-4.14/asoc-intel-kbl-fix-jack-name.patch @@ -0,0 +1,34 @@ +From cedb6415f9ece6d3368aa0ac8a433caff799792a Mon Sep 17 00:00:00 2001 +From: Vinod Koul +Date: Tue, 31 Oct 2017 16:47:27 +0530 +Subject: ASoC: Intel: kbl: fix jack name + +From: Vinod Koul + +commit cedb6415f9ece6d3368aa0ac8a433caff799792a upstream. + +Commit d1c4cb447a7e ("ASoC: Intel: Skylake: Fix jack name format +substitution") added Jack name but erroneously added a space as well, +so remove the space in Jack name. + +Fixes: d1c4cb447a7e ("ASoC: Intel: Skylake: Fix jack name format substitution") +Signed-off-by: Vinod Koul +Signed-off-by: Mark Brown +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c ++++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +@@ -605,7 +605,7 @@ static int kabylake_card_late_probe(stru + list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; + snprintf(jack_name, sizeof(jack_name), +- "HDMI/DP, pcm=%d Jack", pcm->device); ++ "HDMI/DP,pcm=%d Jack", pcm->device); + err = snd_soc_card_jack_new(card, jack_name, + SND_JACK_AVOUT, &ctx->kabylake_hdmi[i], + NULL, 0); diff --git a/queue-4.14/asoc-intel-skylake-fix-jack-name-format-substitution.patch b/queue-4.14/asoc-intel-skylake-fix-jack-name-format-substitution.patch new file mode 100644 index 00000000000..cfd5c51892f --- /dev/null +++ b/queue-4.14/asoc-intel-skylake-fix-jack-name-format-substitution.patch @@ -0,0 +1,37 @@ +From d1c4cb447a7efcb5608a33cdfed8ab4234378b0a Mon Sep 17 00:00:00 2001 +From: Chintan Patel +Date: Mon, 18 Sep 2017 08:43:18 -0700 +Subject: ASoC: Intel: Skylake: Fix jack name format substitution + +From: Chintan Patel + +commit d1c4cb447a7efcb5608a33cdfed8ab4234378b0a upstream. + +Jack name is not getting formatted correctly hence resulting +in invalid name for HDMI/DP input devices. + +This was recently exposed due changes brought by MST: +commit 3a13347f05fd ("ASoC: Intel: kbl: Add jack port initialize +in kbl machine drivers") + +Signed-off-by: Chintan Patel +Acked-By: Vinod Koul +Signed-off-by: Mark Brown +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c ++++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +@@ -604,6 +604,8 @@ static int kabylake_card_late_probe(stru + + list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { + codec = pcm->codec_dai->codec; ++ snprintf(jack_name, sizeof(jack_name), ++ "HDMI/DP, pcm=%d Jack", pcm->device); + err = snd_soc_card_jack_new(card, jack_name, + SND_JACK_AVOUT, &ctx->kabylake_hdmi[i], + NULL, 0); diff --git a/queue-4.14/series b/queue-4.14/series index 6d6ddac040a..dd43253574f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -3,6 +3,9 @@ watchdog-hpwdt-smbios-check.patch watchdog-hpwdt-check-source-of-nmi.patch watchdog-hpwdt-fix-unused-variable-warning.patch watchdog-hpwdt-remove-legacy-nmi-sourcing.patch +arm-omap2-hide-omap3_save_secure_ram-on-non-omap3-builds.patch +asoc-intel-skylake-fix-jack-name-format-substitution.patch +asoc-intel-kbl-fix-jack-name.patch rdma-ucma-limit-possible-option-size.patch rdma-ucma-check-that-user-doesn-t-overflow-qp-state.patch rdma-mlx5-fix-integer-overflow-while-resizing-cq.patch