powerpc: Fix oops due to bad access of lppaca on bare metal

Commit 8e0b634b1327 ("powerpc/64s: Do not allocate lppaca if we are
not virtualized") removed allocation of lppaca on bare metal
platforms. But with CONFIG_PPC_SPLPAR enabled, we still access the
lppaca on bare metal in some code paths.

Fix this but adding runtime checks for SPLPAR (shared processor LPAR).

Fixes: 8e0b634b1327 ("powerpc/64s: Do not allocate lppaca if we are not virtualized")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index 65d589689f013e67416a4150e99bf64367d380e4..7c23ce8a5a4c4fd405577e54a3b537fb14852ed7 100644 (file)
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -34,6 +34,7 @@
 #include <linux/threads.h>
 #include <asm/types.h>
 #include <asm/mmu.h>
+#include <asm/firmware.h>
 
 /*
  * The lppaca is the "virtual processor area" registered with the hypervisor,
@@ -114,6 +115,8 @@ struct lppaca {
 
 static inline bool lppaca_shared_proc(struct lppaca *l)
 {
+       if (!firmware_has_feature(FW_FEATURE_SPLPAR))
+               return false;
        return !!(l->__old_status & LPPACA_OLD_SHARED_PROC);
 }
 

diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index b9ebc3085fb7932e632527df1f309e76260912d4..72dc4ddc2972a06539e41bf9bd51fb7c407b8049 100644 (file)
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -56,6 +56,8 @@
 #define vcpu_is_preempted vcpu_is_preempted
 static inline bool vcpu_is_preempted(int cpu)
 {
+       if (!firmware_has_feature(FW_FEATURE_SPLPAR))
+               return false;
        return !!(be32_to_cpu(lppaca_of(cpu).yield_count) & 1);
 }
 #endif

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index f7d96a68ecaab82dea379c79de3945d57a9ac0e6..360e71d455ccddb6a5b93cf64450d921d2f6122c 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -266,6 +266,9 @@ void accumulate_stolen_time(void)
 
 static inline u64 calculate_stolen_time(u64 stop_tb)
 {
+       if (!firmware_has_feature(FW_FEATURE_SPLPAR))
+               return 0;
+
        if (get_paca()->dtl_ridx != be64_to_cpu(get_lppaca()->dtl_idx))
                return scan_dispatch_log(stop_tb);