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

Pull powerpc updates from Michael Ellerman:

 - Support for configuring secure boot with user-defined keys on PowerVM
   LPARs

 - Simplify the replay of soft-masked IRQs by making it non-recursive

 - Add support for KCSAN on 64-bit Book3S

 - Improvements to the API & code which interacts with RTAS (pseries
   firmware)

 - Change 32-bit powermac to assign PCI bus numbers per domain by
   default

 - Some improvements to the 32-bit BPF JIT

 - Various other small features and fixes

Thanks to Anders Roxell, Andrew Donnellan, Andrew Jeffery, Benjamin
Gray, Christophe Leroy, Frederic Barrat, Ganesh Goudar, Geoff Levand,
Greg Kroah-Hartman, Jan-Benedict Glaw, Josh Poimboeuf, Kajol Jain,
Laurent Dufour, Mahesh Salgaonkar, Mathieu Desnoyers, Mimi Zohar, Murphy
Zhou, Nathan Chancellor, Nathan Lynch, Nayna Jain, Nicholas Piggin, Pali
Rohár, Petr Mladek, Rohan McLure, Russell Currey, Sachin Sant, Sathvika
Vasireddy, Sourabh Jain, Stefan Berger, Stephen Rothwell, and Sudhakar
Kuppusamy.

* tag 'powerpc-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (114 commits)
  powerpc/pseries: Avoid hcall in plpks_is_available() on non-pseries
  powerpc: dts: turris1x.dts: Set lower priority for CPLD syscon-reboot
  powerpc/e500: Add missing prototype for 'relocate_init'
  powerpc/64: Fix unannotated intra-function call warning
  powerpc/epapr: Don't use wrteei on non booke
  powerpc: Pass correct CPU reference to assembler
  powerpc/mm: Rearrange if-else block to avoid clang warning
  powerpc/nohash: Fix build with llvm-as
  powerpc/nohash: Fix build error with binutils >= 2.38
  powerpc/pseries: Fix endianness issue when parsing PLPKS secvar flags
  macintosh: windfarm: Use unsigned type for 1-bit bitfields
  powerpc/kexec_file: print error string on usable memory property update failure
  powerpc/machdep: warn when machine_is() used too early
  powerpc/64: Replace -mcpu=e500mc64 by -mcpu=e5500
  powerpc/eeh: Set channel state after notifying the drivers
  selftests/powerpc: Fix incorrect kernel headers search path
  powerpc/rtas: arch-wide function token lookup conversions
  powerpc/rtas: introduce rtas_function_token() API
  powerpc/pseries/lpar: convert to papr_sysparm API
  powerpc/pseries/hv-24x7: convert to papr_sysparm API
  ...

diff --combined arch/powerpc/Makefile
index 533457466ce250eeb988475ab680824b546fb5ab,5622e44f534cb7f5d5bf350852b1d6614eb2b2d0..87d6ac27eebd219870bcb745d8a07cb0c6b5a35e
--- 1/arch/powerpc/Makefile
--- 2/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -146,19 -146,6 +146,6 @@@ CFLAGS-$(CONFIG_PPC32)    += $(call cc-opt
  
  CFLAGS-$(CONFIG_PPC32)        += $(call cc-option,-mno-readonly-in-sdata)
  
- ifdef CONFIG_PPC_BOOK3S_64
- ifdef CONFIG_CPU_LITTLE_ENDIAN
- CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
- else
- CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power4
- endif
- CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power10,      \
-                                 $(call cc-option,-mtune=power9,       \
-                                 $(call cc-option,-mtune=power8)))
- else ifdef CONFIG_PPC_BOOK3E_64
- CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
- endif
- 
  ifdef CONFIG_FUNCTION_TRACER
  CC_FLAGS_FTRACE := -pg
  ifdef CONFIG_MPROFILE_KERNEL
@@@ -166,11 -153,12 +153,12 @@@ CC_FLAGS_FTRACE += -mprofile-kerne
  endif
  endif
  
- CFLAGS-$(CONFIG_TARGET_CPU_BOOL) += $(call cc-option,-mcpu=$(CONFIG_TARGET_CPU))
- AFLAGS-$(CONFIG_TARGET_CPU_BOOL) += $(call cc-option,-mcpu=$(CONFIG_TARGET_CPU))
+ CFLAGS-$(CONFIG_TARGET_CPU_BOOL) += -mcpu=$(CONFIG_TARGET_CPU)
+ AFLAGS-$(CONFIG_TARGET_CPU_BOOL) += -mcpu=$(CONFIG_TARGET_CPU)
  
- CFLAGS-$(CONFIG_E5500_CPU) += $(call cc-option,-mcpu=e500mc64,-mcpu=powerpc64)
- CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU))
+ CFLAGS-$(CONFIG_POWERPC64_CPU) += $(call cc-option,-mtune=power10,    \
+                                 $(call cc-option,-mtune=power9,       \
+                                 $(call cc-option,-mtune=power8)))
  
  asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
  
@@@ -213,10 -201,7 +201,7 @@@ KBUILD_CFLAGS += -fno-asynchronous-unwi
  # often slow when they are implemented at all
  KBUILD_CFLAGS         += $(call cc-option,-mno-string)
  
- cpu-as-$(CONFIG_40x)          += -Wa,-m405
- cpu-as-$(CONFIG_44x)          += -Wa,-m440
  cpu-as-$(CONFIG_ALTIVEC)      += $(call as-option,-Wa$(comma)-maltivec)
- cpu-as-$(CONFIG_PPC_E500)             += -Wa,-me500
  
  # When using '-many -mpower4' gas will first try and find a matching power4
  # mnemonic and failing that it will allow any valid mnemonic that GAS knows
@@@ -224,7 -209,6 +209,6 @@@
  # LLVM IAS doesn't understand either flag: https://github.com/ClangBuiltLinux/linux/issues/675
  # but LLVM IAS only supports ISA >= 2.06 for Book3S 64 anyway...
  cpu-as-$(CONFIG_PPC_BOOK3S_64)        += $(call as-option,-Wa$(comma)-mpower4) $(call as-option,-Wa$(comma)-many)
- cpu-as-$(CONFIG_PPC_E500MC)   += $(call as-option,-Wa$(comma)-me500mc)
  
  KBUILD_AFLAGS += $(cpu-as-y)
  KBUILD_CFLAGS += $(cpu-as-y)
@@@ -253,7 -237,17 +237,7 @@@ PHONY += bootwrapper_instal
  bootwrapper_install:
        $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
  
 -# Used to create 'merged defconfigs'
 -# To use it $(call) it with the first argument as the base defconfig
 -# and the second argument as a space separated list of .config files to merge,
 -# without the .config suffix.
 -define merge_into_defconfig
 -      $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
 -              -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
 -              $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
 -      +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 -endef
 -
 +include $(srctree)/scripts/Makefile.defconf
  PHONY += pseries_le_defconfig
  pseries_le_defconfig:
        $(call merge_into_defconfig,pseries_defconfig,le)