Commit ab159ac5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc updates and fixes from Michael Ellerman:
 "A bit of a mixture of things, tying up some loose ends.

  There's the removal of the nvlink code, which dependend on a commit in
  the vfio tree. Then the enablement of huge vmalloc which was in next
  for a few weeks but got dropped due to conflicts. And there's also a
  few fixes.

  Summary:

   - Remove the nvlink support now that it's only user has been removed.

   - Enable huge vmalloc mappings for Radix MMU (P9).

   - Fix KVM conversion to gfn-based MMU notifier callbacks.

   - Fix a kexec/kdump crash with hot plugged CPUs.

   - Fix boot failure on 32-bit with CONFIG_STACKPROTECTOR.

   - Restore alphabetic order of the selects under CONFIG_PPC.

  Thanks to: Christophe Leroy, Christoph Hellwig, Nicholas Piggin,
  Sandipan Das, and Sourabh Jain"

* tag 'powerpc-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  KVM: PPC: Book3S HV: Fix conversion to gfn-based MMU notifier callbacks
  powerpc/kconfig: Restore alphabetic order of the selects under CONFIG_PPC
  powerpc/32: Fix boot failure with CONFIG_STACKPROTECTOR
  powerpc/powernv/memtrace: Fix dcache flushing
  powerpc/kexec_file: Use current CPU info while setting up FDT
  powerpc/64s/radix: Enable huge vmalloc mappings
  powerpc/powernv: remove the nvlink support
parents fc858a52 f96271ce

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3282,6 +3282,8 @@ 


	nohugeiomap	[KNL,X86,PPC,ARM64] Disable kernel huge I/O mappings.



	nohugevmalloc	[PPC] Disable kernel huge vmalloc mappings.



	nosmt		[KNL,S390] Disable symmetric multithreading (SMT).

			Equivalent to smt=1.

arch/powerpc/Kconfig

+19 −18
Original line number Diff line number Diff line
@@ -120,28 +120,29 @@ config PPC 
	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_COPY_MC			if PPC64

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_MAP_DIRECT 		if PPC_PSERIES

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_KCOV

	select ARCH_HAS_HUGEPD			if HUGETLB_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_MEMREMAP_COMPAT_ALIGN

	select ARCH_HAS_MMIOWB			if PPC64

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API

	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PTE_DEVMAP		if PPC_BOOK3S_64

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64

	select ARCH_HAS_STRICT_KERNEL_RWX	if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION)

	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UACCESS_FLUSHCACHE

	select ARCH_HAS_COPY_MC			if PPC64

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_KEEP_MEMBLOCK
@@ -164,9 +165,8 @@ config PPC 
	select BUILDTIME_TABLE_SORT

	select CLONE_BACKWARDS

	select DCACHE_WORD_ACCESS		if PPC64 && CPU_LITTLE_ENDIAN

	select DMA_OPS				if PPC64

	select DMA_OPS_BYPASS			if PPC64

	select ARCH_HAS_DMA_MAP_DIRECT 		if PPC64 && PPC_PSERIES

	select DMA_OPS				if PPC64

	select DYNAMIC_FTRACE			if FUNCTION_TRACER

	select EDAC_ATOMIC_SCRUB

	select EDAC_SUPPORT
@@ -186,23 +186,22 @@ config PPC 
	select GENERIC_TIME_VSYSCALL

	select GENERIC_VDSO_TIME_NS

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_HUGE_VMALLOC		if HAVE_ARCH_HUGE_VMAP

	select HAVE_ARCH_HUGE_VMAP		if PPC_BOOK3S_64 && PPC_RADIX_MMU

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN			if PPC32 && PPC_PAGE_SHIFT <= 14

	select HAVE_ARCH_KASAN_VMALLOC		if PPC32 && PPC_PAGE_SHIFT <= 14

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KFENCE			if PPC32

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_MMAP_RND_BITS

	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if COMPAT

	select HAVE_ARCH_NVRAM_OPS

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ASM_MODVERSIONS

	select HAVE_C_RECORDMCOUNT

	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)

	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)

	select HAVE_CONTEXT_TRACKING		if PPC64

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_DYNAMIC_FTRACE
@@ -216,10 +215,13 @@ config PPC 
	select HAVE_FUNCTION_TRACER

	select HAVE_GCC_PLUGINS			if GCC_VERSION >= 50200   # plugin support on gcc <= 5.1 is buggy on PPC

	select HAVE_GENERIC_VDSO

	select HAVE_HARDLOCKUP_DETECTOR_ARCH	if PPC_BOOK3S_64 && SMP

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_HW_BREAKPOINT		if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)

	select HAVE_IDE

	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA			if DEFAULT_UIMAGE

	select HAVE_KERNEL_LZO			if DEFAULT_UIMAGE
@@ -231,26 +233,25 @@ config PPC 
	select HAVE_LIVEPATCH			if HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI				if PERF_EVENTS || (PPC64 && PPC_BOOK3S)

	select HAVE_HARDLOCKUP_DETECTOR_ARCH	if PPC64 && PPC_BOOK3S && SMP

	select HAVE_OPTPROBES

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI		if PPC64

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HUGETLB_PAGE_SIZE_VARIABLE	if PPC_BOOK3S_64 && HUGETLB_PAGE

	select MMU_GATHER_RCU_TABLE_FREE

	select MMU_GATHER_PAGE_SIZE

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE

	select HAVE_RSEQ

	select HAVE_SOFTIRQ_ON_OWN_STACK

	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)

	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_RSEQ

	select HUGETLB_PAGE_SIZE_VARIABLE	if PPC_BOOK3S_64 && HUGETLB_PAGE

	select IOMMU_HELPER			if PPC64

	select IRQ_DOMAIN

	select IRQ_FORCED_THREADING

	select MMU_GATHER_PAGE_SIZE

	select MMU_GATHER_RCU_TABLE_FREE

	select MODULES_USE_ELF_RELA

	select NEED_DMA_MAP_STATE		if PPC64 || NOT_COHERENT_CACHE

	select NEED_SG_DMA_LENGTH

arch/powerpc/include/asm/kvm_book3s.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ extern void kvmppc_free_pgtable_radix(struct kvm *kvm, pgd_t *pgd, 
				      unsigned int lpid);

extern int kvmppc_radix_init(void);

extern void kvmppc_radix_exit(void);

extern bool kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

extern void kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

			    unsigned long gfn);

extern bool kvm_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

			  unsigned long gfn);

arch/powerpc/include/asm/opal.h

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ extern struct device_node *opal_node; 


/* API functions */

int64_t opal_invalid_call(void);

int64_t opal_npu_destroy_context(uint64_t phb_id, uint64_t pid, uint64_t bdf);

int64_t opal_npu_init_context(uint64_t phb_id, int pasid, uint64_t msr,

			uint64_t bdf);

int64_t opal_npu_map_lpar(uint64_t phb_id, uint64_t bdf, uint64_t lparid,

			uint64_t lpcr);

int64_t opal_npu_spa_setup(uint64_t phb_id, uint32_t bdfn,

arch/powerpc/include/asm/pci-bridge.h

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ struct pci_controller { 
#endif	/* CONFIG_PPC64 */



	void *private_data;

	struct npu *npu;

};



/* These are used for config access before all the PCI probing