Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

Pull powerpc updates from Michael Ellerman:

 - Add support for (optionally) using queued spinlocks & rwlocks.

 - Support for a new faster system call ABI using the scv instruction on
   Power9 or later.

 - Drop support for the PROT_SAO mmap/mprotect flag as it will be
   unsupported on Power10 and future processors, leaving us with no way
   to implement the functionality it requests. This risks breaking
   userspace, though we believe it is unused in practice.

 - A bug fix for, and then the removal of, our custom stack expansion
   checking. We now allow stack expansion up to the rlimit, like other
   architectures.

 - Remove the remnants of our (previously disabled) topology update
   code, which tried to react to NUMA layout changes on virtualised
   systems, but was prone to crashes and other problems.

 - Add PMU support for Power10 CPUs.

 - A change to our signal trampoline so that we don't unbalance the link
   stack (branch return predictor) in the signal delivery path.

 - Lots of other cleanups, refactorings, smaller features and so on as
   usual.

Thanks to: Abhishek Goel, Alastair D'Silva, Alexander A. Klimov, Alexey
Kardashevskiy, Alistair Popple, Andrew Donnellan, Aneesh Kumar K.V, Anju
T Sudhakar, Anton Blanchard, Arnd Bergmann, Athira Rajeev, Balamuruhan
S, Bharata B Rao, Bill Wendling, Bin Meng, Cédric Le Goater, Chris
Packham, Christophe Leroy, Christoph Hellwig, Daniel Axtens, Dan
Williams, David Lamparter, Desnes A. Nunes do Rosario, Erhard F., Finn
Thain, Frederic Barrat, Ganesh Goudar, Gautham R. Shenoy, Geoff Levand,
Greg Kurz, Gustavo A. R. Silva, Hari Bathini, Harish, Imre Kaloz, Joel
Stanley, Joe Perches, John Crispin, Jordan Niethe, Kajol Jain, Kamalesh
Babulal, Kees Cook, Laurent Dufour, Leonardo Bras, Li RongQing, Madhavan
Srinivasan, Mahesh Salgaonkar, Mark Cave-Ayland, Michal Suchanek, Milton
Miller, Mimi Zohar, Murilo Opsfelder Araujo, Nathan Chancellor, Nathan
Lynch, Naveen N. Rao, Nayna Jain, Nicholas Piggin, Oliver O'Halloran,
Palmer Dabbelt, Pedro Miraglia Franco de Carvalho, Philippe Bergheaud,
Pingfan Liu, Pratik Rajesh Sampat, Qian Cai, Qinglang Miao, Randy
Dunlap, Ravi Bangoria, Sachin Sant, Sam Bobroff, Sandipan Das, Santosh
Sivaraj, Satheesh Rajendran, Shirisha Ganta, Sourabh Jain, Srikar
Dronamraju, Stan Johnson, Stephen Rothwell, Thadeu Lima de Souza
Cascardo, Thiago Jung Bauermann, Tom Lane, Vaibhav Jain, Vladis Dronov,
Wei Yongjun, Wen Xiong, YueHaibing.

* tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (337 commits)
  selftests/powerpc: Fix pkey syscall redefinitions
  powerpc: Fix circular dependency between percpu.h and mmu.h
  powerpc/powernv/sriov: Fix use of uninitialised variable
  selftests/powerpc: Skip vmx/vsx/tar/etc tests on older CPUs
  powerpc/40x: Fix assembler warning about r0
  powerpc/papr_scm: Add support for fetching nvdimm 'fuel-gauge' metric
  powerpc/papr_scm: Fetch nvdimm performance stats from PHYP
  cpuidle: pseries: Fixup exit latency for CEDE(0)
  cpuidle: pseries: Add function to parse extended CEDE records
  cpuidle: pseries: Set the latency-hint before entering CEDE
  selftests/powerpc: Fix online CPU selection
  powerpc/perf: Consolidate perf_callchain_user_[64|32]()
  powerpc/pseries/hotplug-cpu: Remove double free in error path
  powerpc/pseries/mobility: Add pr_debug() for device tree changes
  powerpc/pseries/mobility: Set pr_fmt()
  powerpc/cacheinfo: Warn if cache object chain becomes unordered
  powerpc/cacheinfo: Improve diagnostics about malformed cache lists
  powerpc/cacheinfo: Use name@unit instead of full DT path in debug messages
  powerpc/cacheinfo: Set pr_fmt()
  powerpc: fix function annotations to avoid section mismatch warnings with gcc-10
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/core-api/cpu_hotplug.rst
Simple merge

diff --cc Documentation/features/sched/membarrier-sync-core/arch-support.txt
Simple merge

diff --cc Documentation/memory-barriers.txt
Simple merge

diff --cc Documentation/virt/kvm/api.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/Kbuild
index 2d444d0,27c2268..90cd5c5
--- 1/arch/powerpc/include/asm/Kbuild
--- 2/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@@ -4,8 -4,8 +4,9 @@@ generated-y += syscall_table_64.
  generated-y += syscall_table_c32.h
  generated-y += syscall_table_spu.h
  generic-y += export.h
 +generic-y += kvm_types.h
  generic-y += local64.h
  generic-y += mcs_spinlock.h
+ generic-y += qrwlock.h
  generic-y += vtime.h
  generic-y += early_ioremap.h

diff --cc arch/powerpc/include/asm/atomic.h
Simple merge

diff --cc arch/powerpc/include/asm/device.h
Simple merge

diff --cc arch/powerpc/include/asm/paca.h
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/ptrace/ptrace-view.c
index 13208a9,ac7d480..19823a2
--- 1/arch/powerpc/kernel/ptrace/ptrace-view.c
--- 2/arch/powerpc/kernel/ptrace/ptrace-view.c
+++ b/arch/powerpc/kernel/ptrace/ptrace-view.c
@@@ -468,15 -486,23 +468,17 @@@ static int pkey_active(struct task_stru
  }
  
  static int pkey_get(struct task_struct *target, const struct user_regset *regset,
 -                  unsigned int pos, unsigned int count, void *kbuf, void __user *ubuf)
 +                  struct membuf to)
  {
+       int ret;
+ 
        BUILD_BUG_ON(TSO(amr) + sizeof(unsigned long) != TSO(iamr));
-       BUILD_BUG_ON(TSO(iamr) + sizeof(unsigned long) != TSO(uamor));
  
        if (!arch_pkeys_enabled())
                return -ENODEV;
  
-       return membuf_write(&to, &target->thread.amr, ELF_NPKEY * sizeof(unsigned long));
 -      ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &target->thread.amr,
 -                                0, 2 * sizeof(unsigned long));
 -      if (ret)
 -              return ret;
 -
 -      ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &default_uamor,
 -                                2 * sizeof(unsigned long), 3 * sizeof(unsigned long));
 -      return ret;
++      membuf_write(&to, &target->thread.amr, 2 * sizeof(unsigned long));
++      return membuf_store(&to, default_uamor);
  }
  
  static int pkey_set(struct task_struct *target, const struct user_regset *regset,

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge

diff --cc arch/powerpc/mm/book3s64/hash_utils.c
Simple merge

diff --cc arch/powerpc/perf/core-book3s.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/lpar.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc drivers/md/dm-writecache.c
Simple merge

diff --cc include/asm-generic/barrier.h
Simple merge

diff --cc include/asm-generic/qspinlock.h
index 2b26cd7,38ca14e..4fe7fd0
--- 1/include/asm-generic/qspinlock.h
--- 2/include/asm-generic/qspinlock.h
+++ b/include/asm-generic/qspinlock.h
@@@ -11,8 -11,8 +11,9 @@@
  #define __ASM_GENERIC_QSPINLOCK_H
  
  #include <asm-generic/qspinlock_types.h>
 +#include <linux/atomic.h>
  
+ #ifndef queued_spin_is_locked
  /**
   * queued_spin_is_locked - is the spinlock locked?
   * @lock: Pointer to queued spinlock structure

diff --cc kernel/kexec_file.c
Simple merge

diff --cc mm/ksm.c
Simple merge