diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> | 2018-04-02 13:03:37 +0530 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-03 21:50:07 +1000 |
| commit | a6201da34ff9366680e97392efd06abb9ff15014 (patch) | |
| tree | dd37b085b94c193e288bdc4a1e223dbcc71b6ee7 /arch/powerpc/kernel/time.c | |
| parent | 19e68b2aec3c0a2bd770d3c358a296a1849f308a (diff) | |
| download | linux-a6201da34ff9366680e97392efd06abb9ff15014.tar.gz | |
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>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index f7d96a68ecaab..360e71d455ccd 100644 --- 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); |