From da4aaf636011c8167cce9b0980b33d421121b222 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 6 Mar 2018 13:02:00 -0800 Subject: [PATCH] drop 4.4.y xen patch --- queue-4.4/series | 1 - ...ro-msr_ia32_spec_ctrl-before-suspend.patch | 78 ------------------- 2 files changed, 79 deletions(-) delete mode 100644 queue-4.4/x86-xen-zero-msr_ia32_spec_ctrl-before-suspend.patch diff --git a/queue-4.4/series b/queue-4.4/series index fbaf30ed84b..b9bdbd470f5 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -4,4 +4,3 @@ tpm_i2c_nuvoton-fix-potential-buffer-overruns-caused-by-bit-glitches-on-the-bus. alsa-usb-audio-add-a-quirck-for-b-w-px-headphones.patch alsa-hda-add-a-power_save-blacklist.patch cpufreq-s3c24xx-fix-broken-s3c_cpufreq_init.patch -x86-xen-zero-msr_ia32_spec_ctrl-before-suspend.patch diff --git a/queue-4.4/x86-xen-zero-msr_ia32_spec_ctrl-before-suspend.patch b/queue-4.4/x86-xen-zero-msr_ia32_spec_ctrl-before-suspend.patch deleted file mode 100644 index 9941ad5fab1..00000000000 --- a/queue-4.4/x86-xen-zero-msr_ia32_spec_ctrl-before-suspend.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 71c208dd54ab971036d83ff6d9837bae4976e623 Mon Sep 17 00:00:00 2001 -From: Juergen Gross -Date: Mon, 26 Feb 2018 15:08:18 +0100 -Subject: x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend - -From: Juergen Gross - -commit 71c208dd54ab971036d83ff6d9837bae4976e623 upstream. - -Older Xen versions (4.5 and before) might have problems migrating pv -guests with MSR_IA32_SPEC_CTRL having a non-zero value. So before -suspending zero that MSR and restore it after being resumed. - -Signed-off-by: Juergen Gross -Signed-off-by: Thomas Gleixner -Reviewed-by: Jan Beulich -Cc: stable@vger.kernel.org -Cc: xen-devel@lists.xenproject.org -Cc: boris.ostrovsky@oracle.com -Link: https://lkml.kernel.org/r/20180226140818.4849-1-jgross@suse.com -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/xen/suspend.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - ---- a/arch/x86/xen/suspend.c -+++ b/arch/x86/xen/suspend.c -@@ -1,11 +1,14 @@ - #include - #include -+#include - - #include - #include - #include - #include - -+#include -+#include - #include - #include - #include -@@ -68,6 +71,8 @@ static void xen_pv_post_suspend(int susp - xen_mm_unpin_all(); - } - -+static DEFINE_PER_CPU(u64, spec_ctrl); -+ - void xen_arch_pre_suspend(void) - { - if (xen_pv_domain()) -@@ -84,6 +89,9 @@ void xen_arch_post_suspend(int cancelled - - static void xen_vcpu_notify_restore(void *data) - { -+ if (xen_pv_domain() && boot_cpu_has(X86_FEATURE_SPEC_CTRL)) -+ wrmsrl(MSR_IA32_SPEC_CTRL, this_cpu_read(spec_ctrl)); -+ - /* Boot processor notified via generic timekeeping_resume() */ - if (smp_processor_id() == 0) - return; -@@ -93,7 +101,15 @@ static void xen_vcpu_notify_restore(void - - static void xen_vcpu_notify_suspend(void *data) - { -+ u64 tmp; -+ - tick_suspend_local(); -+ -+ if (xen_pv_domain() && boot_cpu_has(X86_FEATURE_SPEC_CTRL)) { -+ rdmsrl(MSR_IA32_SPEC_CTRL, tmp); -+ this_cpu_write(spec_ctrl, tmp); -+ wrmsrl(MSR_IA32_SPEC_CTRL, 0); -+ } - } - - void xen_arch_resume(void) -- 2.47.3