Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2019-06-15 09:59:01 +0200
committerBorislav Petkov <bp@suse.de>2019-06-15 09:59:06 +0200
commit6851188d57dee2bcc462520ecdd5424cb685a768 (patch)
tree7d5ab046215863a591af861ff663955fdc4c422f
parente0edbf292f64e0fb14411ca257d897f0fc7d6bfa (diff)
x86/alternative: Init ideal_nops for Hygon Dhyana (fate#327735).
-rw-r--r--patches.arch/x86-alternative-init-ideal_nops-for-hygon-dhyana.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.arch/x86-alternative-init-ideal_nops-for-hygon-dhyana.patch b/patches.arch/x86-alternative-init-ideal_nops-for-hygon-dhyana.patch
new file mode 100644
index 0000000000..8fb352f8b7
--- /dev/null
+++ b/patches.arch/x86-alternative-init-ideal_nops-for-hygon-dhyana.patch
@@ -0,0 +1,38 @@
+From: Pu Wen <puwen@hygon.cn>
+Date: Sun, 23 Sep 2018 17:35:01 +0800
+Subject: x86/alternative: Init ideal_nops for Hygon Dhyana
+Git-commit: c3fecca457c1aa1c1a2f81bfe68393af244a263e
+Patch-mainline: v4.20-rc1
+References: fate#327735
+
+The ideal_nops for Hygon Dhyana CPU should be p6_nops.
+
+Signed-off-by: Pu Wen <puwen@hygon.cn>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Reviewed-by: Borislav Petkov <bp@suse.de>
+Cc: tglx@linutronix.de
+Cc: mingo@redhat.com
+Cc: hpa@zytor.com
+Cc: x86@kernel.org
+Cc: thomas.lendacky@amd.com
+Link: https://lkml.kernel.org/r/79e76c3173716984fe5fdd4a8e2c798bf4193205.1537533369.git.puwen@hygon.cn
+---
+ arch/x86/kernel/alternative.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
+index b9d5e7c9ef43..184e9a06b0ff 100644
+--- a/arch/x86/kernel/alternative.c
++++ b/arch/x86/kernel/alternative.c
+@@ -222,6 +222,10 @@ void __init arch_init_ideal_nops(void)
+ }
+ break;
+
++ case X86_VENDOR_HYGON:
++ ideal_nops = p6_nops;
++ return;
++
+ case X86_VENDOR_AMD:
+ if (boot_cpu_data.x86 > 0xf) {
+ ideal_nops = p6_nops;
+
diff --git a/series.conf b/series.conf
index 6ca0d478aa..1c08c66ff6 100644
--- a/series.conf
+++ b/series.conf
@@ -19535,6 +19535,7 @@
patches.arch/x86-cpu-mtrr-support-top_mem2-and-get-mtrr-number.patch
patches.arch/x86-smpboot-do-not-use-bsp-init-delay-and-mwait-to-idle-on-dhyana.patch
patches.arch/x86-events-add-hygon-dhyana-support-to-pmu-infrastructure.patch
+ patches.arch/x86-alternative-init-ideal_nops-for-hygon-dhyana.patch
patches.fixes/0001-x86-xen-Fix-boot-loader-version-reported-for-PVH-gue.patch
patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch
patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch