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

Pull powerpc updates from Michael Ellerman:
 "Notable changes:

   - Removal of the NPU DMA code, used by the out-of-tree Nvidia driver,
     as well as some other functions only used by drivers that haven't
     (yet?) made it upstream.

   - A fix for a bug in our handling of hardware watchpoints (eg. perf
     record -e mem: ...) which could lead to register corruption and
     kernel crashes.

   - Enable HAVE_ARCH_HUGE_VMAP, which allows us to use large pages for
     vmalloc when using the Radix MMU.

   - A large but incremental rewrite of our exception handling code to
     use gas macros rather than multiple levels of nested CPP macros.

  And the usual small fixes, cleanups and improvements.

  Thanks to: Alastair D'Silva, Alexey Kardashevskiy, Andreas Schwab,
  Aneesh Kumar K.V, Anju T Sudhakar, Anton Blanchard, Arnd Bergmann,
  Athira Rajeev, Cédric Le Goater, Christian Lamparter, Christophe
  Leroy, Christophe Lombard, Christoph Hellwig, Daniel Axtens, Denis
  Efremov, Enrico Weigelt, Frederic Barrat, Gautham R. Shenoy, Geert
  Uytterhoeven, Geliang Tang, Gen Zhang, Greg Kroah-Hartman, Greg Kurz,
  Gustavo Romero, Krzysztof Kozlowski, Madhavan Srinivasan, Masahiro
  Yamada, Mathieu Malaterre, Michael Neuling, Nathan Lynch, Naveen N.
  Rao, Nicholas Piggin, Nishad Kamdar, Oliver O'Halloran, Qian Cai, Ravi
  Bangoria, Sachin Sant, Sam Bobroff, Satheesh Rajendran, Segher
  Boessenkool, Shaokun Zhang, Shawn Anastasio, Stewart Smith, Suraj
  Jitindar Singh, Thiago Jung Bauermann, YueHaibing"

* tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (163 commits)
  powerpc/powernv/idle: Fix restore of SPRN_LDBAR for POWER9 stop state.
  powerpc/eeh: Handle hugepages in ioremap space
  ocxl: Update for AFU descriptor template version 1.1
  powerpc/boot: pass CONFIG options in a simpler and more robust way
  powerpc/boot: add {get, put}_unaligned_be32 to xz_config.h
  powerpc/irq: Don't WARN continuously in arch_local_irq_restore()
  powerpc/module64: Use symbolic instructions names.
  powerpc/module32: Use symbolic instructions names.
  powerpc: Move PPC_HA() PPC_HI() and PPC_LO() to ppc-opcode.h
  powerpc/module64: Fix comment in R_PPC64_ENTRY handling
  powerpc/boot: Add lzo support for uImage
  powerpc/boot: Add lzma support for uImage
  powerpc/boot: don't force gzipped uImage
  powerpc/8xx: Add microcode patch to move SMC parameter RAM.
  powerpc/8xx: Use IO accessors in microcode programming.
  powerpc/8xx: replace #ifdefs by IS_ENABLED() in microcode.c
  powerpc/8xx: refactor programming of microcode CPM params.
  powerpc/8xx: refactor printing of microcode patch name.
  powerpc/8xx: Refactor microcode write
  powerpc/8xx: refactor writing of CPM microcode arrays
  ...

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

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/boot/wrapper
Simple merge

diff --cc arch/powerpc/configs/ppc6xx_defconfig
Simple merge

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

diff --cc arch/powerpc/include/asm/exception-64s.h
Simple merge

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

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

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

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

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

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

diff --cc arch/powerpc/include/asm/pgtable.h
index 64145751b2fd5a545f33b3fa5eab7a3ec694e3d0,bf7d771f342eea2a3e47cd68e950a198f78f8827..c58ba79636886455ec62484b38e691e0715f4845
--- 1/arch/powerpc/include/asm/pgtable.h
--- 2/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@@ -140,20 -140,30 +140,44 @@@ static inline void pte_frag_set(mm_cont
  }
  #endif
  
+ #ifndef pmd_is_leaf
+ #define pmd_is_leaf pmd_is_leaf
+ static inline bool pmd_is_leaf(pmd_t pmd)
+ {
+       return false;
+ }
+ #endif
+ 
+ #ifndef pud_is_leaf
+ #define pud_is_leaf pud_is_leaf
+ static inline bool pud_is_leaf(pud_t pud)
+ {
+       return false;
+ }
+ #endif
+ 
+ #ifndef pgd_is_leaf
+ #define pgd_is_leaf pgd_is_leaf
+ static inline bool pgd_is_leaf(pgd_t pgd)
+ {
+       return false;
+ }
+ #endif
+ 
 +#ifdef CONFIG_PPC64
 +#define is_ioremap_addr is_ioremap_addr
 +static inline bool is_ioremap_addr(const void *x)
 +{
 +#ifdef CONFIG_MMU
 +      unsigned long addr = (unsigned long)x;
 +
 +      return addr >= IOREMAP_BASE && addr < IOREMAP_END;
 +#else
 +      return false;
 +#endif
 +}
 +#endif /* CONFIG_PPC64 */
 +
  #endif /* __ASSEMBLY__ */
  
  #endif /* _ASM_POWERPC_PGTABLE_H */

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

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

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

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

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

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

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

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

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

diff --cc arch/powerpc/kernel/head_64.S
Simple merge

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

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

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

diff --cc arch/powerpc/kernel/misc_64.S
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc arch/powerpc/lib/ldstfp.S
Simple merge

diff --cc arch/powerpc/lib/pmem.c
Simple merge

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

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

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

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

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

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

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

diff --cc arch/powerpc/mm/init_64.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/pgtable.c
Simple merge

diff --cc arch/powerpc/mm/pgtable_32.c
Simple merge

diff --cc arch/powerpc/mm/pgtable_64.c
Simple merge

diff --cc arch/powerpc/mm/ptdump/ptdump.c
Simple merge

diff --cc arch/powerpc/perf/hv-24x7.c
Simple merge

diff --cc arch/powerpc/platforms/4xx/uic.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/file.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/sleep.S
Simple merge

diff --cc arch/powerpc/platforms/powernv/eeh-powernv.c
index 9ade4489f4152c9c21bc124038e1950c76d6f17d,bea6708be0656ec66d5273a31a4f66d425d1f7b0..620a986209f55599f8b3872c0d80ccdee1b1482c
--- 1/arch/powerpc/platforms/powernv/eeh-powernv.c
--- 2/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@@ -1,10 -1,12 +1,8 @@@
 +// SPDX-License-Identifier: GPL-2.0-or-later
  /*
-  * The file intends to implement the platform dependent EEH operations on
-  * powernv platform. Actually, the powernv was created in order to fully
-  * hypervisor support.
+  * PowerNV Platform dependent EEH operations
   *
   * Copyright Benjamin Herrenschmidt & Gavin Shan, IBM Corporation 2013.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
   */
  
  #include <linux/atomic.h>

diff --cc arch/powerpc/platforms/powernv/idle.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/npu-dma.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/vas-window.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/vas.h
Simple merge

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

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

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

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

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

diff --cc arch/powerpc/platforms/pseries/mobility.c
index 0c48c8964783756aec523af865d88c633956eccc,b8c8096907d4d7d505f6b0749995b8859bad323f..fe812bebdf5e618261b6c4cec5dd809402697589
--- 1/arch/powerpc/platforms/pseries/mobility.c
--- 2/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@@ -4,8 -3,13 +4,9 @@@
   *
   * Copyright (C) 2010 Nathan Fontenot
   * Copyright (C) 2010 IBM Corporation
 - *
 - * This program is free software; you can redistribute it and/or
 - * modify it under the terms of the GNU General Public License version
 - * 2 as published by the Free Software Foundation.
   */
  
+ #include <linux/cpu.h>
  #include <linux/kernel.h>
  #include <linux/kobject.h>
  #include <linux/smp.h>

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

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

diff --cc arch/powerpc/sysdev/dart_iommu.c
Simple merge

diff --cc arch/powerpc/sysdev/xive/spapr.c
Simple merge

diff --cc arch/powerpc/xmon/xmon.c
Simple merge

diff --cc drivers/macintosh/smu.c
Simple merge

diff --cc scripts/recordmcount.h
Simple merge

diff --cc tools/testing/selftests/powerpc/tm/tm-vmxcopy.c
Simple merge