Skip to content

Commit a9c55d5

Browse files
torvaldstorvalds
committed
Merge tag 'powerpc-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: "One fix to prevent runtime allocation of 16GB pages when running in a VM (as opposed to bare metal), because it doesn't work. A small fix to our recently added KCOV support to exempt some more code from being instrumented. Plus a few minor build fixes, a small dead code removal and a defconfig update. Thanks to: Alexey Kardashevskiy, Aneesh Kumar K.V, Christophe Leroy, Jason Yan, Joel Stanley, Mahesh Salgaonkar, Mathieu Malaterre" * tag 'powerpc-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/64s: Include <asm/nmi.h> header file to fix a warning powerpc/powernv: Fix compile without CONFIG_TRACEPOINTS powerpc/mm: Disable kcov for SLB routines powerpc: remove dead code in head_fsl_booke.S powerpc/configs: Sync skiroot defconfig powerpc/hugetlb: Don't do runtime allocation of 16G pages in LPAR configuration
2 parents 9249735 + de3c83c commit a9c55d5

File tree

6 files changed

+22
-10
lines changed

6 files changed

+22
-10
lines changed

‎arch/powerpc/configs/skiroot_defconfig

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ CONFIG_MODULE_SIG=y
3737
CONFIG_MODULE_SIG_FORCE=y
3838
CONFIG_MODULE_SIG_SHA512=y
3939
CONFIG_PARTITION_ADVANCED=y
40-
# CONFIG_IOSCHED_DEADLINE is not set
40+
# CONFIG_MQ_IOSCHED_DEADLINE is not set
41+
# CONFIG_MQ_IOSCHED_KYBER is not set
4142
# CONFIG_PPC_VAS is not set
4243
# CONFIG_PPC_PSERIES is not set
4344
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
@@ -49,7 +50,6 @@ CONFIG_IRQ_ALL_CPUS=y
4950
CONFIG_NUMA=y
5051
# CONFIG_COMPACTION is not set
5152
# CONFIG_MIGRATION is not set
52-
# CONFIG_BOUNCE is not set
5353
CONFIG_PPC_64K_PAGES=y
5454
CONFIG_SCHED_SMT=y
5555
CONFIG_CMDLINE_BOOL=y
@@ -136,9 +136,11 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
136136
# CONFIG_NET_VENDOR_AQUANTIA is not set
137137
# CONFIG_NET_VENDOR_ARC is not set
138138
# CONFIG_NET_VENDOR_ATHEROS is not set
139+
# CONFIG_NET_VENDOR_AURORA is not set
139140
CONFIG_TIGON3=m
140141
CONFIG_BNX2X=m
141142
# CONFIG_NET_VENDOR_BROCADE is not set
143+
# CONFIG_NET_VENDOR_CADENCE is not set
142144
# CONFIG_NET_CADENCE is not set
143145
# CONFIG_NET_VENDOR_CAVIUM is not set
144146
CONFIG_CHELSIO_T1=m
@@ -151,6 +153,7 @@ CONFIG_BE2NET=m
151153
# CONFIG_NET_VENDOR_HP is not set
152154
# CONFIG_NET_VENDOR_HUAWEI is not set
153155
CONFIG_E1000=m
156+
CONFIG_E1000E=m
154157
CONFIG_IGB=m
155158
CONFIG_IXGB=m
156159
CONFIG_IXGBE=m
@@ -161,15 +164,18 @@ CONFIG_MLX4_EN=m
161164
# CONFIG_MLX4_CORE_GEN2 is not set
162165
CONFIG_MLX5_CORE=m
163166
# CONFIG_NET_VENDOR_MICREL is not set
167+
# CONFIG_NET_VENDOR_MICROSEMI is not set
164168
CONFIG_MYRI10GE=m
165169
# CONFIG_NET_VENDOR_NATSEMI is not set
166170
# CONFIG_NET_VENDOR_NETRONOME is not set
167171
# CONFIG_NET_VENDOR_NI is not set
168172
# CONFIG_NET_VENDOR_NVIDIA is not set
169173
# CONFIG_NET_VENDOR_OKI is not set
170-
# CONFIG_NET_PACKET_ENGINE is not set
174+
# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
171175
CONFIG_QLGE=m
172176
CONFIG_NETXEN_NIC=m
177+
CONFIG_QED=m
178+
CONFIG_QEDE=m
173179
# CONFIG_NET_VENDOR_QUALCOMM is not set
174180
# CONFIG_NET_VENDOR_RDC is not set
175181
# CONFIG_NET_VENDOR_REALTEK is not set

‎arch/powerpc/include/asm/book3s/64/hugetlb.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ static inline int hstate_get_psize(struct hstate *hstate)
3939
#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE
4040
static inline bool gigantic_page_supported(void)
4141
{
42+
/*
43+
* We used gigantic page reservation with hypervisor assist in some case.
44+
* We cannot use runtime allocation of gigantic pages in those platforms
45+
* This is hash translation mode LPARs.
46+
*/
47+
if (firmware_has_feature(FW_FEATURE_LPAR) && !radix_enabled())
48+
return false;
49+
4250
return true;
4351
}
4452
#endif

‎arch/powerpc/kernel/head_fsl_booke.S

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,6 @@ set_ivor:
194194
#endif
195195
mtspr SPRN_MAS4, r2
196196

197-
#if 0
198-
/* Enable DOZE */
199-
mfspr r2,SPRN_HID0
200-
oris r2,r2,HID0_DOZE@h
201-
mtspr SPRN_HID0, r2
202-
#endif
203-
204197
#if !defined(CONFIG_BDI_SWITCH)
205198
/*
206199
* The Abatron BDI JTAG debugger does not tolerate others

‎arch/powerpc/kernel/traps.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
#include <sysdev/fsl_pci.h>
7272
#include <asm/kprobes.h>
7373
#include <asm/stacktrace.h>
74+
#include <asm/nmi.h>
7475

7576
#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)
7677
int (*__debugger)(struct pt_regs *regs) __read_mostly;

‎arch/powerpc/mm/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ obj-$(CONFIG_PPC_MEM_KEYS) += pkeys.o
5252
# This is necessary for booting with kcov enabled on book3e machines
5353
KCOV_INSTRUMENT_tlb_nohash.o := n
5454
KCOV_INSTRUMENT_fsl_booke_mmu.o := n
55+
56+
# Instrumenting the SLB fault path can lead to duplicate SLB entries
57+
KCOV_INSTRUMENT_slb.o := n

‎arch/powerpc/platforms/powernv/opal-call.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ static s64 __opal_call_trace(s64 a0, s64 a1, s64 a2, s64 a3,
8686
s64 a4, s64 a5, s64 a6, s64 a7,
8787
unsigned long opcode, unsigned long msr)
8888
{
89+
return 0;
8990
}
9091

9192
#define DO_TRACE false

0 commit comments

Comments
 (0)