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

Pull powerpc updates from Michael Ellerman:

 - Add HOTPLUG_SMT support (/sys/devices/system/cpu/smt) and honour the
   configured SMT state when hotplugging CPUs into the system

 - Combine final TLB flush and lazy TLB mm shootdown IPIs when using the
   Radix MMU to avoid a broadcast TLBIE flush on exit

 - Drop the exclusion between ptrace/perf watchpoints, and drop the now
   unused associated arch hooks

 - Add support for the "nohlt" command line option to disable CPU idle

 - Add support for -fpatchable-function-entry for ftrace, with GCC >=
   13.1

 - Rework memory block size determination, and support 256MB size on
   systems with GPUs that have hotpluggable memory

 - Various other small features and fixes

Thanks to Andrew Donnellan, Aneesh Kumar K.V, Arnd Bergmann, Athira
Rajeev, Benjamin Gray, Christophe Leroy, Frederic Barrat, Gautam
Menghani, Geoff Levand, Hari Bathini, Immad Mir, Jialin Zhang, Joel
Stanley, Jordan Niethe, Justin Stitt, Kajol Jain, Kees Cook, Krzysztof
Kozlowski, Laurent Dufour, Liang He, Linus Walleij, Mahesh Salgaonkar,
Masahiro Yamada, Michal Suchanek, Nageswara R Sastry, Nathan Chancellor,
Nathan Lynch, Naveen N Rao, Nicholas Piggin, Nick Desaulniers, Omar
Sandoval, Randy Dunlap, Reza Arbab, Rob Herring, Russell Currey, Sourabh
Jain, Thomas Gleixner, Trevor Woerner, Uwe Kleine-König, Vaibhav Jain,
Xiongfeng Wang, Yuan Tan, Zhang Rui, and Zheng Zengkai.

* tag 'powerpc-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (135 commits)
  macintosh/ams: linux/platform_device.h is needed
  powerpc/xmon: Reapply "Relax frame size for clang"
  powerpc/mm/book3s64: Use 256M as the upper limit with coherent device memory attached
  powerpc/mm/book3s64: Fix build error with SPARSEMEM disabled
  powerpc/iommu: Fix notifiers being shared by PCI and VIO buses
  powerpc/mpc5xxx: Add missing fwnode_handle_put()
  powerpc/config: Disable SLAB_DEBUG_ON in skiroot
  powerpc/pseries: Remove unused hcall tracing instruction
  powerpc/pseries: Fix hcall tracepoints with JUMP_LABEL=n
  powerpc: dts: add missing space before {
  powerpc/eeh: Use pci_dev_id() to simplify the code
  powerpc/64s: Move CPU -mtune options into Kconfig
  powerpc/powermac: Fix unused function warning
  powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT
  powerpc: Don't include lppaca.h in paca.h
  powerpc/pseries: Move hcall_vphn() prototype into vphn.h
  powerpc/pseries: Move VPHN constants into vphn.h
  cxl: Drop unused detach_spa()
  powerpc: Drop zalloc_maybe_bootmem()
  powerpc/powernv: Use struct opal_prd_msg in more places
  ...

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

diff --cc arch/powerpc/Kconfig
index 21edd66,c831e20..54b9387
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -195,7 -194,7 +196,8 @@@ config PP
        select GENERIC_CPU_VULNERABILITIES      if PPC_BARRIER_NOSPEC
        select GENERIC_EARLY_IOREMAP
        select GENERIC_GETTIMEOFDAY
+       select GENERIC_IDLE_POLL_SETUP
 +      select GENERIC_IOREMAP
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP                if PCI

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

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

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

diff --cc arch/powerpc/crypto/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/book3s/32/pgtable.h
Simple merge

diff --cc arch/powerpc/include/asm/nohash/32/pgtable.h
Simple merge

diff --cc arch/powerpc/include/asm/nohash/64/pgtable.h
Simple merge

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

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

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

diff --cc arch/powerpc/kernel/trace/ftrace_entry.S
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/init_64.c
Simple merge

diff --cc arch/powerpc/platforms/8xx/adder875.c
Simple merge

diff --cc arch/powerpc/platforms/8xx/mpc885ads_setup.c
Simple merge

diff --cc arch/powerpc/platforms/8xx/tqm8xx_setup.c
Simple merge

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

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

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

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

diff --cc drivers/macintosh/ams/ams.h
index e053c15,4b93c76..5b295f5
--- 1/drivers/macintosh/ams/ams.h
--- 2/drivers/macintosh/ams/ams.h
+++ b/drivers/macintosh/ams/ams.h
@@@ -6,8 -6,10 +6,9 @@@
  #include <linux/input.h>
  #include <linux/kthread.h>
  #include <linux/mutex.h>
+ #include <linux/platform_device.h>
  #include <linux/spinlock.h>
  #include <linux/types.h>
 -#include <linux/of_device.h>
  
  enum ams_irq {
        AMS_IRQ_FREEFALL = 0x01,

diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index 759bb70,aad96cb..21c07ac
--- 1/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
--- 2/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@@ -10,8 -9,8 +10,6 @@@
  #include <linux/phy.h>
  #include <linux/dma-mapping.h>
  
- #include <asm/fs_pd.h>
 -#include <linux/fs_enet_pd.h>
--
  #ifdef CONFIG_CPM1
  #include <asm/cpm1.h>
  #endif

diff --cc drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
Simple merge