| 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 4ba32bdbd8c66d9c7822aea8dcf4e51410df84a8 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 |
| @@ -53,12 +53,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 |
| @@ -75,9 +75,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); |
| @@ -764,10 +761,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 |
