Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-06-13 10:36:45 +0200
committerJiri Kosina <jkosina@suse.cz>2013-06-14 10:21:43 +0200
commitccab9909db1e966cc92984736d4366ba4d1249a5 (patch)
treeecfcb961b697eeffd19a9ffad10faa2bc52f76a6
parentb1c5dfb575265059190f2d09392540b45aa6bb00 (diff)
x86, avx: don't use avx instructions with "noxsave" boot paramrpm-3.0.76-0.11
-rw-r--r--patches.xen/xen3-xor-0009-x86-avx-don-t-use-avx-instructions-with-noxsave-boot.patch34
-rw-r--r--series.conf1
2 files changed, 35 insertions, 0 deletions
diff --git a/patches.xen/xen3-xor-0009-x86-avx-don-t-use-avx-instructions-with-noxsave-boot.patch b/patches.xen/xen3-xor-0009-x86-avx-don-t-use-avx-instructions-with-noxsave-boot.patch
new file mode 100644
index 0000000000..20f3cc74c9
--- /dev/null
+++ b/patches.xen/xen3-xor-0009-x86-avx-don-t-use-avx-instructions-with-noxsave-boot.patch
@@ -0,0 +1,34 @@
+From: Suresh Siddha <suresh.b.siddha@intel.com>
+Date: Tue, 31 Jul 2012 10:29:14 -0700
+Subject: [PATCH] x86, avx: don't use avx instructions with "noxsave" boot param
+Patch-mainline: v3.6
+References: bnc#821802
+
+Clear AVX, AVX2 features along with clearing XSAVE feature bits,
+as part of the parsing "noxsave" parameter.
+
+Fixes the kernel boot panic with "noxsave" boot parameter.
+
+We could have checked cpu_has_osxsave along with cpu_has_avx etc, but Peter
+mentioned clearing the feature bits will be better for uses like
+static_cpu_has() etc.
+
+Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
+Link: http://lkml.kernel.org/r/1343755754.2041.2.camel@sbsiddha-desk.sc.intel.com
+Cc: <stable@vger.kernel.org> # v3.5
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+Acked-by: NeilBrown <neilb@suse.de>
+
+Automatically created from "patches.suse/xor-0009-x86-avx-don-t-use-avx-instructions-with-noxsave-boot.patch" by xen-port-patches.py
+
+--- sle11sp3.orig/arch/x86/kernel/cpu/common-xen.c 2013-06-12 12:35:56.000000000 +0200
++++ sle11sp3/arch/x86/kernel/cpu/common-xen.c 2013-06-12 12:38:39.000000000 +0200
+@@ -159,6 +159,8 @@ static int __init x86_xsave_setup(char *
+ {
+ setup_clear_cpu_cap(X86_FEATURE_XSAVE);
+ setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);
++ setup_clear_cpu_cap(X86_FEATURE_AVX);
++ setup_clear_cpu_cap(X86_FEATURE_AVX2);
+ return 1;
+ }
+ __setup("noxsave", x86_xsave_setup);
diff --git a/series.conf b/series.conf
index bd03ce7a83..42003590be 100644
--- a/series.conf
+++ b/series.conf
@@ -14331,6 +14331,7 @@
patches.xen/xen3-hwmon-coretemp-05-dont-use-threshold-registers-for-tempX_max.patch
patches.xen/xen3-hwmon-coretemp-09-fixup-platform-device-id-change.patch
patches.xen/xen3-xor-0003-raid5-add-AVX-optimized-RAID5-checksumming.patch
+ patches.xen/xen3-xor-0009-x86-avx-don-t-use-avx-instructions-with-noxsave-boot.patch
patches.xen/xen3-stack-unwind
patches.xen/xen3-x86_64-unwind-annotations
patches.xen/xen3-intel-perf-event-0008-perf-remove-the-nmi-parameter-from-the-swevent-and-overflow-interface.patch