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

Linus Torvalds 7 years ago a9c55d58 92497350

+22 -10

6 changed files

expand all

arch

powerpc

configs

skiroot_defconfig

include

asm

book3s

hugetlb.h

kernel

head_fsl_booke.S

traps.c

Makefile

platforms

powernv

opal-call.c

+9 -3

arch/powerpc/configs/skiroot_defconfig

··· 37 37 CONFIG_MODULE_SIG_FORCE=y 38 38 CONFIG_MODULE_SIG_SHA512=y 39 39 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 41 42 # CONFIG_PPC_VAS is not set 42 43 # CONFIG_PPC_PSERIES is not set 43 44 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set ··· 50 49 CONFIG_NUMA=y 51 50 # CONFIG_COMPACTION is not set 52 51 # CONFIG_MIGRATION is not set 53 - # CONFIG_BOUNCE is not set 54 52 CONFIG_PPC_64K_PAGES=y 55 53 CONFIG_SCHED_SMT=y 56 54 CONFIG_CMDLINE_BOOL=y ··· 136 136 # CONFIG_NET_VENDOR_AQUANTIA is not set 137 137 # CONFIG_NET_VENDOR_ARC is not set 138 138 # CONFIG_NET_VENDOR_ATHEROS is not set 139 + # CONFIG_NET_VENDOR_AURORA is not set 139 140 CONFIG_TIGON3=m 140 141 CONFIG_BNX2X=m 141 142 # CONFIG_NET_VENDOR_BROCADE is not set 143 + # CONFIG_NET_VENDOR_CADENCE is not set 142 144 # CONFIG_NET_CADENCE is not set 143 145 # CONFIG_NET_VENDOR_CAVIUM is not set 144 146 CONFIG_CHELSIO_T1=m ··· 153 151 # CONFIG_NET_VENDOR_HP is not set 154 152 # CONFIG_NET_VENDOR_HUAWEI is not set 155 153 CONFIG_E1000=m 154 + CONFIG_E1000E=m 156 155 CONFIG_IGB=m 157 156 CONFIG_IXGB=m 158 157 CONFIG_IXGBE=m ··· 164 161 # CONFIG_MLX4_CORE_GEN2 is not set 165 162 CONFIG_MLX5_CORE=m 166 163 # CONFIG_NET_VENDOR_MICREL is not set 164 + # CONFIG_NET_VENDOR_MICROSEMI is not set 167 165 CONFIG_MYRI10GE=m 168 166 # CONFIG_NET_VENDOR_NATSEMI is not set 169 167 # CONFIG_NET_VENDOR_NETRONOME is not set 170 168 # CONFIG_NET_VENDOR_NI is not set 171 169 # CONFIG_NET_VENDOR_NVIDIA is not set 172 170 # CONFIG_NET_VENDOR_OKI is not set 173 - # CONFIG_NET_PACKET_ENGINE is not set 171 + # CONFIG_NET_VENDOR_PACKET_ENGINES is not set 174 172 CONFIG_QLGE=m 175 173 CONFIG_NETXEN_NIC=m 174 + CONFIG_QED=m 175 + CONFIG_QEDE=m 176 176 # CONFIG_NET_VENDOR_QUALCOMM is not set 177 177 # CONFIG_NET_VENDOR_RDC is not set 178 178 # CONFIG_NET_VENDOR_REALTEK is not set

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

··· 39 39 #ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE 40 40 static inline bool gigantic_page_supported(void) 41 41 { 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 + 42 50 return true; 43 51 } 44 52 #endif

-7

arch/powerpc/kernel/head_fsl_booke.S

··· 194 194 #endif 195 195 mtspr SPRN_MAS4, r2 196 196 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 - 204 197 #if !defined(CONFIG_BDI_SWITCH) 205 198 /* 206 199 * The Abatron BDI JTAG debugger does not tolerate others

arch/powerpc/kernel/traps.c

··· 71 71 #include <sysdev/fsl_pci.h> 72 72 #include <asm/kprobes.h> 73 73 #include <asm/stacktrace.h> 74 + #include <asm/nmi.h> 74 75 75 76 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE) 76 77 int (*__debugger)(struct pt_regs *regs) __read_mostly;

arch/powerpc/mm/Makefile

··· 52 52 # This is necessary for booting with kcov enabled on book3e machines 53 53 KCOV_INSTRUMENT_tlb_nohash.o := n 54 54 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

··· 86 86 s64 a4, s64 a5, s64 a6, s64 a7, 87 87 unsigned long opcode, unsigned long msr) 88 88 { 89 + return 0; 89 90 } 90 91 91 92 #define DO_TRACE false

Configure Feed

Configure Feed