Commit 3a7101e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:

 - Reduce alignment constraints on STRICT_KERNEL_RWX and speed-up TLB
   misses on 8xx and 603

 - Replace kretprobe code with rethook and enable fprobe

 - Remove the "fast endian switch" syscall

 - Handle DLPAR device tree updates in kernel, allowing the deprecation
   of the binary /proc/powerpc/ofdt interface

Thanks to Abhishek Dubey, Alex Shi, Benjamin Gray, Christophe Leroy,
Gaosheng Cui, Gautam Menghani, Geert Uytterhoeven, Haren Myneni, Hari
Bathini, Huang Xiaojia, Jinjie Ruan, Madhavan Srinivasan, Miguel Ojeda,
Mina Almasry, Narayana Murty N, Naveen Rao, Rob Herring (Arm), Scott
Cheloha, Segher Boessenkool, Stephen Rothwell, Thomas Zimmermann, Uwe
Kleine-König, Vaibhav Jain, and Zhang Zekun.

* tag 'powerpc-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (59 commits)
  powerpc/atomic: Use YZ constraints for DS-form instructions
  MAINTAINERS: powerpc: Add Maddy
  powerpc: Switch back to struct platform_driver::remove()
  powerpc/pseries/eeh: Fix pseries_eeh_err_inject
  selftests/powerpc: Allow building without static libc
  macintosh/via-pmu: register_pmu_pm_ops() can be __init
  powerpc: Stop using no_llseek
  powerpc/64s: Remove the "fast endian switch" syscall
  powerpc/mm/64s: Restrict THP to Radix or HPT w/64K pages
  powerpc/mm/64s: Move THP reqs into a separate symbol
  powerpc/64s: Make mmu_hash_ops __ro_after_init
  powerpc: Replace kretprobe code with rethook on powerpc
  powerpc: pseries: Constify struct kobj_type
  powerpc: powernv: Constify struct kobj_type
  powerpc: Constify struct kobj_type
  powerpc/pseries/dlpar: Add device tree nodes for DLPAR IO add
  powerpc/pseries/dlpar: Remove device tree node for DLPAR IO remove
  powerpc/pseries: Use correct data types from pseries_hp_errorlog struct
  powerpc/vdso: Inconditionally use CFUNC macro
  powerpc/32: Implement validation of emergency stack
  ...
parents 54450af6 39190ac7

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -378,6 +378,9 @@ S: 1549 Hiironen Rd. 
S: Brimson, MN  55602

S: USA



N: Arnd Bergmann

D: Maintainer of Cell Broadband Engine Architecture



N: Hennus Bergman

P: 1024/77D50909 76 99 FD 31 91 E1 96 1C  90 BB 22 80 62 F6 BD 63

D: Author and maintainer of the QIC-02 tape driver
@@ -1869,6 +1872,9 @@ S: K osmidomkum 723 
S: 160 00 Praha 6

S: Czech Republic



N: Jeremy Kerr

D: Maintainer of SPU File System



N: Michael Kerrisk

E: mtk.manpages@gmail.com

W: https://man7.org/

MAINTAINERS

+3 −6
Original line number Diff line number Diff line
@@ -5145,10 +5145,8 @@ F: Documentation/devicetree/bindings/media/cec/cec-gpio.yaml 
F:	drivers/media/cec/platform/cec-gpio/









CELL BROADBAND ENGINE ARCHITECTURE









M:	Arnd Bergmann <arnd@arndb.de>









L:	linuxppc-dev@lists.ozlabs.org









S:	Supported









W:	http://www.ibm.com/developerworks/power/cell/









S:	Orphan









F:	arch/powerpc/include/asm/cell*.h









F:	arch/powerpc/include/asm/spu*.h









F:	arch/powerpc/include/uapi/asm/spu*.h








@@ -12995,6 +12993,7 @@ M:	Michael Ellerman <mpe@ellerman.id.au>







R:	Nicholas Piggin <npiggin@gmail.com>









R:	Christophe Leroy <christophe.leroy@csgroup.eu>









R:	Naveen N Rao <naveen@kernel.org>









R:	Madhavan Srinivasan <maddy@linux.ibm.com>









L:	linuxppc-dev@lists.ozlabs.org









S:	Supported









W:	https://github.com/linuxppc/wiki/wiki








@@ -21672,10 +21671,8 @@ F:	include/linux/spmi.h







F:	include/trace/events/spmi.h

















SPU FILE SYSTEM









M:	Jeremy Kerr <jk@ozlabs.org>









L:	linuxppc-dev@lists.ozlabs.org









S:	Supported









W:	http://www.ibm.com/developerworks/power/cell/









S:	Orphan









F:	Documentation/filesystems/spufs/spufs.rst









F:	arch/powerpc/platforms/cell/spufs/

































arch/powerpc/Kconfig



+26
−6






























Original line number
Diff line number
Diff line







@@ -269,6 +269,7 @@ config PPC







	select HAVE_PERF_EVENTS_NMI		if PPC64









	select HAVE_PERF_REGS









	select HAVE_PERF_USER_STACK_DUMP









	select HAVE_RETHOOK			if KPROBES









	select HAVE_REGS_AND_STACK_ACCESS_API









	select HAVE_RELIABLE_STACKTRACE









	select HAVE_RSEQ








@@ -854,8 +855,8 @@ config DATA_SHIFT_BOOL







	bool "Set custom data alignment"









	depends on ADVANCED_OPTIONS









	depends on STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE









	depends on PPC_BOOK3S_32 || (PPC_8xx && !PIN_TLB_DATA && !STRICT_KERNEL_RWX) || \









		   PPC_85xx









	depends on (PPC_8xx && !PIN_TLB_DATA && (!STRICT_KERNEL_RWX || !PIN_TLB_TEXT)) || \









		   PPC_BOOK3S_32 || PPC_85xx









	help









	  This option allows you to set the kernel data alignment. When









	  RAM is mapped by blocks, the alignment needs to fit the size and








@@ -871,9 +872,9 @@ config DATA_SHIFT







	range 20 24 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_85xx









	default 22 if STRICT_KERNEL_RWX && PPC_BOOK3S_32









	default 18 if (DEBUG_PAGEALLOC || KFENCE) && PPC_BOOK3S_32









	default 23 if STRICT_KERNEL_RWX && PPC_8xx









	default 23 if (DEBUG_PAGEALLOC || KFENCE) && PPC_8xx && PIN_TLB_DATA









	default 19 if (DEBUG_PAGEALLOC || KFENCE) && PPC_8xx









	default 23 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_8xx && \









		      (PIN_TLB_DATA || PIN_TLB_TEXT)









	default 19 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_8xx









	default 24 if STRICT_KERNEL_RWX && PPC_85xx









	default PAGE_SHIFT









	help








@@ -1274,8 +1275,27 @@ config TASK_SIZE_BOOL







config TASK_SIZE









	hex "Size of user task space" if TASK_SIZE_BOOL









	default "0x80000000" if PPC_8xx









	default "0xb0000000" if PPC_BOOK3S_32









	default "0xb0000000" if PPC_BOOK3S_32 && EXECMEM









	default "0xc0000000"



















config MODULES_SIZE_BOOL









	bool "Set custom size for modules/execmem area"









	depends on EXECMEM && ADVANCED_OPTIONS









	help









	  This option allows you to set the size of kernel virtual address









	  space dedicated for modules/execmem.









	  For the time being it is only for 8xx and book3s/32. Other









	  platform share it with vmalloc space.



















	  Say N here unless you know what you are doing.



















config MODULES_SIZE









	int "Size of modules/execmem area (In Mbytes)" if MODULES_SIZE_BOOL









	range 1 256 if EXECMEM









	default 64 if EXECMEM && PPC_BOOK3S_32









	default 32 if EXECMEM && PPC_8xx









	default 0



















endmenu



















if PPC64
































arch/powerpc/Kconfig.debug



+0
−6






























Original line number
Diff line number
Diff line







@@ -379,12 +379,6 @@ config FAIL_IOMMU

















	  If you are unsure, say N.



















config PPC_FAST_ENDIAN_SWITCH









	bool "Deprecated fast endian-switch syscall"









	depends on DEBUG_KERNEL && PPC_BOOK3S_64









	help









	  If you're unsure what this is, say N.



















config KASAN_SHADOW_OFFSET









	hex









	depends on KASAN
































arch/powerpc/configs/ppc64_defconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -93,6 +93,7 @@ CONFIG_MEMORY_HOTREMOVE=y







CONFIG_KSM=y









CONFIG_TRANSPARENT_HUGEPAGE=y









CONFIG_MEM_SOFT_DIRTY=y









CONFIG_DEFERRED_STRUCT_PAGE_INIT=y









CONFIG_ZONE_DEVICE=y









CONFIG_NET=y









CONFIG_PACKET=y