4.14-stable patches

added patches:
	x86-build-fix-compiler-support-check-for-config_retpoline.patch

diff --git a/queue-4.14/drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch b/queue-4.14/drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch
deleted file mode 100644 (file)
index ab6dfad..0000000
--- a/queue-4.14/drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cf4197ed5796234a53beb71228198c7d1e678947 Mon Sep 17 00:00:00 2001
-From: Kenneth Feng <kenneth.feng@amd.com>
-Date: Thu, 6 Dec 2018 11:56:14 +0800
-Subject: drm/amdgpu/powerplay: Apply avfs cks-off voltages on VI
-
-From: Kenneth Feng <kenneth.feng@amd.com>
-
-commit cf4197ed5796234a53beb71228198c7d1e678947 upstream.
-
-Instead of EVV cks-off voltages, avfs cks-off voltages can avoid
-the overshoot voltages when switching sclk.
-
-Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h          |    2 ++
- drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c |    6 ++++++
- 2 files changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h
-+++ b/drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h
-@@ -386,6 +386,8 @@ typedef uint16_t PPSMC_Result;
- #define PPSMC_MSG_AgmResetPsm                 ((uint16_t) 0x403)
- #define PPSMC_MSG_ReadVftCell                 ((uint16_t) 0x404)
- 
-+#define PPSMC_MSG_ApplyAvfsCksOffVoltage      ((uint16_t) 0x415)
-+
- #define PPSMC_MSG_GFX_CU_PG_ENABLE            ((uint16_t) 0x280)
- #define PPSMC_MSG_GFX_CU_PG_DISABLE           ((uint16_t) 0x281)
- #define PPSMC_MSG_GetCurrPkgPwr               ((uint16_t) 0x282)
---- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
-+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
-@@ -379,6 +379,12 @@ static int polaris10_smu_init(struct pp_
-       for (i = 0; i < SMU74_MAX_LEVELS_GRAPHICS; i++)
-               smu_data->activity_target[i] = PPPOLARIS10_TARGETACTIVITY_DFLT;
- 
-+      /* Apply avfs cks-off voltages to avoid the overshoot
-+       * when switching to the highest sclk frequency
-+       */
-+      if (data->apply_avfs_cks_off_voltage)
-+              smum_send_msg_to_smc(hwmgr, PPSMC_MSG_ApplyAvfsCksOffVoltage);
-+
-       return 0;
- }
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 62aeb7d9e3901d201efab6cf64e882dfa12cae6e..d3dbe9ffb9e6962273770590f7025716e37c09d2 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -15,5 +15,5 @@ powerpc-msi-fix-null-pointer-access-in-teardown-code.patch
 drm-nouveau-kms-fix-memory-leak-in-nv50_mstm_del.patch
 revert-drm-rockchip-allow-driver-to-be-shutdown-on-reboot-kexec.patch
 drm-i915-execlists-apply-a-full-mb-before-execution-for-braswell.patch
-drm-amdgpu-powerplay-apply-avfs-cks-off-voltages-on-vi.patch
 drm-amdgpu-update-smc-firmware-image-for-polaris10-variants.patch
+x86-build-fix-compiler-support-check-for-config_retpoline.patch

diff --git a/queue-4.14/x86-build-fix-compiler-support-check-for-config_retpoline.patch b/queue-4.14/x86-build-fix-compiler-support-check-for-config_retpoline.patch
new file mode 100644 (file)
index 0000000..bfaec6d
--- /dev/null
+++ b/queue-4.14/x86-build-fix-compiler-support-check-for-config_retpoline.patch
@@ -0,0 +1,68 @@
+From 25896d073d8a0403b07e6dec56f58e6c33678207 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Wed, 5 Dec 2018 15:27:19 +0900
+Subject: x86/build: Fix compiler support check for CONFIG_RETPOLINE
+
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+commit 25896d073d8a0403b07e6dec56f58e6c33678207 upstream.
+
+It is troublesome to add a diagnostic like this to the Makefile
+parse stage because the top-level Makefile could be parsed with
+a stale include/config/auto.conf.
+
+Once you are hit by the error about non-retpoline compiler, the
+compilation still breaks even after disabling CONFIG_RETPOLINE.
+
+The easiest fix is to move this check to the "archprepare" like
+this commit did:
+
+  829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")
+
+Reported-by: Meelis Roos <mroos@linux.ee>
+Tested-by: Meelis Roos <mroos@linux.ee>
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Acked-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com>
+Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
+Link: http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masahiro@socionext.com
+Link: https://lkml.org/lkml/2018/12/4/206
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Cc: Gi-Oh Kim <gi-oh.kim@cloud.ionos.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/Makefile |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -241,9 +241,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwin
+ 
+ # Avoid indirect branches in kernel to deal with Spectre
+ ifdef CONFIG_RETPOLINE
+-ifeq ($(RETPOLINE_CFLAGS),)
+-  $(error You are building kernel with non-retpoline compiler, please update your compiler.)
+-endif
+   KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
+ endif
+ 
+@@ -260,6 +257,13 @@ archprepare:
+ ifeq ($(CONFIG_KEXEC_FILE),y)
+       $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
+ endif
++ifdef CONFIG_RETPOLINE
++ifeq ($(RETPOLINE_CFLAGS),)
++      @echo "You are building kernel with non-retpoline compiler." >&2
++      @echo "Please update your compiler." >&2
++      @false
++endif
++endif
+ 
+ ###
+ # Kernel objects