drop x86-hyperv-make-vapic-support-x2apic-mode.patch from 4.19.y

diff --git a/queue-4.19/series b/queue-4.19/series
index baefc48006df1d3c15c7ff2be50f7da50a0714e3..d470990434470509a29e41cef89b92d0fd4ee70d 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -78,7 +78,6 @@ tracing-fix-race-in-perf_trace_buf-initialization.patch
 dm-cache-fix-bugs-when-a-gfp_nowait-allocation-fails.patch
 x86-boot-64-make-level2_kernel_pgt-pages-invalid-outside-kernel-area.patch
 x86-apic-x2apic-fix-a-null-pointer-deref-when-handling-a-dying-cpu.patch
-x86-hyperv-make-vapic-support-x2apic-mode.patch
 pinctrl-cherryview-restore-strago-dmi-workaround-for-all-versions.patch
 pinctrl-armada-37xx-fix-control-of-pins-32-and-up.patch
 pinctrl-armada-37xx-swap-polarity-on-led-group.patch

diff --git a/queue-4.19/x86-hyperv-make-vapic-support-x2apic-mode.patch b/queue-4.19/x86-hyperv-make-vapic-support-x2apic-mode.patch
deleted file mode 100644 (file)
index 82e7ab8..0000000
--- a/queue-4.19/x86-hyperv-make-vapic-support-x2apic-mode.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e211288b72f15259da86eed6eca680758dbe9e74 Mon Sep 17 00:00:00 2001
-From: Roman Kagan <rkagan@virtuozzo.com>
-Date: Thu, 10 Oct 2019 12:33:05 +0000
-Subject: x86/hyperv: Make vapic support x2apic mode
-
-From: Roman Kagan <rkagan@virtuozzo.com>
-
-commit e211288b72f15259da86eed6eca680758dbe9e74 upstream.
-
-Now that there's Hyper-V IOMMU driver, Linux can switch to x2apic mode
-when supported by the vcpus.
-
-However, the apic access functions for Hyper-V enlightened apic assume
-xapic mode only.
-
-As a result, Linux fails to bring up secondary cpus when run as a guest
-in QEMU/KVM with both hv_apic and x2apic enabled.
-
-According to Michael Kelley, when in x2apic mode, the Hyper-V synthetic
-apic MSRs behave exactly the same as the corresponding architectural
-x2apic MSRs, so there's no need to override the apic accessors.  The
-only exception is hv_apic_eoi_write, which benefits from lazy EOI when
-available; however, its implementation works for both xapic and x2apic
-modes.
-
-Fixes: 29217a474683 ("iommu/hyper-v: Add Hyper-V stub IOMMU driver")
-Fixes: 6b48cb5f8347 ("X86/Hyper-V: Enlighten APIC access")
-Suggested-by: Michael Kelley <mikelley@microsoft.com>
-Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-Reviewed-by: Michael Kelley <mikelley@microsoft.com>
-Cc: stable@vger.kernel.org
-Link: https://lkml.kernel.org/r/20191010123258.16919-1-rkagan@virtuozzo.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/x86/hyperv/hv_apic.c |   20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
---- a/arch/x86/hyperv/hv_apic.c
-+++ b/arch/x86/hyperv/hv_apic.c
-@@ -256,11 +256,21 @@ void __init hv_apic_init(void)
-       }
- 
-       if (ms_hyperv.hints & HV_X64_APIC_ACCESS_RECOMMENDED) {
--              pr_info("Hyper-V: Using MSR based APIC access\n");
-+              pr_info("Hyper-V: Using enlightened APIC (%s mode)",
-+                      x2apic_enabled() ? "x2apic" : "xapic");
-+              /*
-+               * With x2apic, architectural x2apic MSRs are equivalent to the
-+               * respective synthetic MSRs, so there's no need to override
-+               * the apic accessors.  The only exception is
-+               * hv_apic_eoi_write, because it benefits from lazy EOI when
-+               * available, but it works for both xapic and x2apic modes.
-+               */
-               apic_set_eoi_write(hv_apic_eoi_write);
--              apic->read      = hv_apic_read;
--              apic->write     = hv_apic_write;
--              apic->icr_write = hv_apic_icr_write;
--              apic->icr_read  = hv_apic_icr_read;
-+              if (!x2apic_enabled()) {
-+                      apic->read      = hv_apic_read;
-+                      apic->write     = hv_apic_write;
-+                      apic->icr_write = hv_apic_icr_write;
-+                      apic->icr_read  = hv_apic_icr_read;
-+              }
-       }
- }