From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 1 Jan 2020 16:30:04 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.208~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=304a9042167aac83f109f595d6f12e9054285ccb;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	revert-powerpc-vcpu-assume-dedicated-processors-as-non-preempt.patch
---

diff --git a/queue-5.4/revert-powerpc-vcpu-assume-dedicated-processors-as-non-preempt.patch b/queue-5.4/revert-powerpc-vcpu-assume-dedicated-processors-as-non-preempt.patch
new file mode 100644
index 00000000000..08db0308c8f
--- /dev/null
+++ b/queue-5.4/revert-powerpc-vcpu-assume-dedicated-processors-as-non-preempt.patch
@@ -0,0 +1,68 @@
+From 40cd4c96d96eb82d9481ccb4ad7e2304e7f82a93 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 1 Jan 2020 17:24:32 +0100
+Subject: Revert "powerpc/vcpu: Assume dedicated processors as non-preempt"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 8332dbe5157a0056d8ab409957dfa89930066d87 which is
+commit 14c73bd344da60abaf7da3ea2e7733ddda35bbac upstream.
+
+It breaks the build.
+
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Parth Shah <parth@linux.ibm.com>
+Cc: Ihor Pasichnyk <Ihor.Pasichnyk@ibm.com>
+Cc: Juri Lelli <juri.lelli@redhat.com>
+Cc: Waiman Long <longman@redhat.com>
+Cc: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
+Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
+Cc: Phil Auld <pauld@redhat.com>
+Cc: Vaidyanathan Srinivasan <svaidy@linux.ibm.com>
+Cc: Parth Shah <parth@linux.ibm.com>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/include/asm/spinlock.h    |    4 +---
+ arch/powerpc/platforms/pseries/setup.c |    7 -------
+ 2 files changed, 1 insertion(+), 10 deletions(-)
+
+--- a/arch/powerpc/include/asm/spinlock.h
++++ b/arch/powerpc/include/asm/spinlock.h
+@@ -36,12 +36,10 @@
+ #endif
+ 
+ #ifdef CONFIG_PPC_PSERIES
+-DECLARE_STATIC_KEY_FALSE(shared_processor);
+-
+ #define vcpu_is_preempted vcpu_is_preempted
+ static inline bool vcpu_is_preempted(int cpu)
+ {
+-	if (!static_branch_unlikely(&shared_processor))
++	if (!firmware_has_feature(FW_FEATURE_SPLPAR))
+ 		return false;
+ 	return !!(be32_to_cpu(lppaca_of(cpu).yield_count) & 1);
+ }
+--- a/arch/powerpc/platforms/pseries/setup.c
++++ b/arch/powerpc/platforms/pseries/setup.c
+@@ -74,9 +74,6 @@
+ #include "pseries.h"
+ #include "../../../../drivers/pci/pci.h"
+ 
+-DEFINE_STATIC_KEY_FALSE(shared_processor);
+-EXPORT_SYMBOL_GPL(shared_processor);
+-
+ int CMO_PrPSP = -1;
+ int CMO_SecPSP = -1;
+ unsigned long CMO_PageSize = (ASM_CONST(1) << IOMMU_PAGE_SHIFT_4K);
+@@ -761,10 +758,6 @@ static void __init pSeries_setup_arch(vo
+ 
+ 	if (firmware_has_feature(FW_FEATURE_LPAR)) {
+ 		vpa_init(boot_cpuid);
+-
+-		if (lppaca_shared_proc(get_lppaca()))
+-			static_branch_enable(&shared_processor);
+-
+ 		ppc_md.power_save = pseries_lpar_idle;
+ 		ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;
+ #ifdef CONFIG_PCI_IOV
diff --git a/queue-5.4/series b/queue-5.4/series
index 72744d49175..8a479e2512c 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -128,3 +128,4 @@ selftests-vm-add-fragment-config_test_vmalloc.patch
 mm-hugetlbfs-fix-error-handling-when-setting-up-moun.patch
 kernel-sysctl-make-drop_caches-write-only.patch
 userfaultfd-require-cap_sys_ptrace-for-uffd_feature_.patch
+revert-powerpc-vcpu-assume-dedicated-processors-as-non-preempt.patch