Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6201da3 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

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



Commit 8e0b634b ("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: 8e0b634b ("powerpc/64s: Do not allocate lppaca if we are not virtualized")
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 19e68b2a

arch/powerpc/include/asm/lppaca.h

+3 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/powerpc/include/asm/spinlock.h

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/time.c

+3 −0
Original line number Diff line number Diff line
@@ -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);