Commit 5c0b0c67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:

 - Enable STRICT_KERNEL_RWX for Freescale 85xx platforms.

 - Activate CONFIG_STRICT_KERNEL_RWX by default, while still allowing it
   to be disabled.

 - Add support for out-of-line static calls on 32-bit.

 - Fix oopses doing bpf-to-bpf calls when STRICT_KERNEL_RWX is enabled.

 - Fix boot hangs on e5500 due to stale value in ESR passed to
   do_page_fault().

 - Fix several bugs on pseries in handling of device tree cache
   information for hotplugged CPUs, and/or during partition migration.

 - Various other small features and fixes.

Thanks to Alexey Kardashevskiy, Alistair Popple, Anatolij Gustschin,
Andrew Donnellan, Athira Rajeev, Bixuan Cui, Bjorn Helgaas, Cédric Le
Goater, Christophe Leroy, Daniel Axtens, Daniel Henrique Barboza, Denis
Kirjanov, Fabiano Rosas, Frederic Barrat, Gustavo A.  R.  Silva, Hari
Bathini, Jacques de Laval, Joel Stanley, Kai Song, Kajol Jain, Laurent
Vivier, Leonardo Bras, Madhavan Srinivasan, Nathan Chancellor, Nathan
Lynch, Naveen N.  Rao, Nicholas Piggin, Nick Desaulniers, Niklas
Schnelle, Oliver O'Halloran, Rob Herring, Russell Currey, Srikar
Dronamraju, Stan Johnson, Tyrel Datwyler, Uwe Kleine-König, Vasant
Hegde, Wan Jiabing, and Xiaoming Ni,

* tag 'powerpc-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (73 commits)
  powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST
  powerpc/32e: Ignore ESR in instruction storage interrupt handler
  powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unload
  powerpc: Don't provide __kernel_map_pages() without ARCH_SUPPORTS_DEBUG_PAGEALLOC
  MAINTAINERS: Update powerpc KVM entry
  powerpc/xmon: fix task state output
  powerpc/44x/fsp2: add missing of_node_put
  powerpc/dcr: Use cmplwi instead of 3-argument cmpli
  KVM: PPC: Tick accounting should defer vtime accounting 'til after IRQ handling
  powerpc/security: Use a mutex for interrupt exit code patching
  powerpc/83xx/mpc8349emitx: Make mcu_gpiochip_remove() return void
  powerpc/fsl_booke: Fix setting of exec flag when setting TLBCAMs
  powerpc/book3e: Fix set_memory_x() and set_memory_nx()
  powerpc/nohash: Fix __ptep_set_access_flags() and ptep_set_wrprotect()
  powerpc/bpf: Fix write protecting JIT code
  selftests/powerpc: Use date instead of EPOCHSECONDS in mitigation-patching.sh
  powerpc/64s/interrupt: Fix check_return_regs_valid() false positive
  powerpc/boot: Set LC_ALL=C in wrapper script
  powerpc/64s: Default to 64K pages for 64 bit book3s
  Revert "powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC"
  ...
parents a3f36773 c12ab8db

MAINTAINERS

+2 −5
Original line number Diff line number Diff line
@@ -10388,11 +10388,8 @@ F: arch/mips/include/uapi/asm/kvm* 
F:	arch/mips/kvm/









KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)









M:	Paul Mackerras <paulus@ozlabs.org>









L:	kvm-ppc@vger.kernel.org









S:	Supported









W:	http://www.linux-kvm.org/









T:	git git://github.com/agraf/linux-2.6.git









L:	linuxppc-dev@lists.ozlabs.org









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm









F:	arch/powerpc/include/asm/kvm*









F:	arch/powerpc/include/uapi/asm/kvm*









F:	arch/powerpc/kernel/kvm*
































arch/powerpc/Kconfig



+15
−5






























Original line number
Diff line number
Diff line







@@ -138,7 +138,8 @@ config PPC







	select ARCH_HAS_PTE_SPECIAL









	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64









	select ARCH_HAS_SET_MEMORY









	select ARCH_HAS_STRICT_KERNEL_RWX	if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION)









	select ARCH_HAS_STRICT_KERNEL_RWX	if (PPC_BOOK3S || PPC_8xx || 40x) && !HIBERNATION









	select ARCH_HAS_STRICT_KERNEL_RWX	if FSL_BOOKE && !HIBERNATION && !RANDOMIZE_BASE









	select ARCH_HAS_STRICT_MODULE_RWX	if ARCH_HAS_STRICT_KERNEL_RWX && !PPC_BOOK3S_32









	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST









	select ARCH_HAS_UACCESS_FLUSHCACHE








@@ -148,9 +149,10 @@ config PPC







	select ARCH_MIGHT_HAVE_PC_PARPORT









	select ARCH_MIGHT_HAVE_PC_SERIO









	select ARCH_OPTIONAL_KERNEL_RWX		if ARCH_HAS_STRICT_KERNEL_RWX









	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT









	select ARCH_STACKWALK









	select ARCH_SUPPORTS_ATOMIC_RMW









	select ARCH_SUPPORTS_DEBUG_PAGEALLOC	if PPC32 || PPC_BOOK3S_64









	select ARCH_SUPPORTS_DEBUG_PAGEALLOC	if PPC_BOOK3S || PPC_8xx || 40x









	select ARCH_USE_BUILTIN_BSWAP









	select ARCH_USE_CMPXCHG_LOCKREF		if PPC64









	select ARCH_USE_MEMTEST








@@ -190,7 +192,7 @@ config PPC







	select HAVE_ARCH_JUMP_LABEL_RELATIVE









	select HAVE_ARCH_KASAN			if PPC32 && PPC_PAGE_SHIFT <= 14









	select HAVE_ARCH_KASAN_VMALLOC		if PPC32 && PPC_PAGE_SHIFT <= 14









	select HAVE_ARCH_KFENCE			if PPC32









	select HAVE_ARCH_KFENCE			if PPC_BOOK3S_32 || PPC_8xx || 40x









	select HAVE_ARCH_KGDB









	select HAVE_ARCH_MMAP_RND_BITS









	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if COMPAT








@@ -241,6 +243,7 @@ config PPC







	select HAVE_SOFTIRQ_ON_OWN_STACK









	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)









	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)









	select HAVE_STATIC_CALL			if PPC32









	select HAVE_SYSCALL_TRACEPOINTS









	select HAVE_VIRT_CPU_ACCOUNTING









	select HUGETLB_PAGE_SIZE_VARIABLE	if PPC_BOOK3S_64 && HUGETLB_PAGE








@@ -707,6 +710,7 @@ config ARCH_MEMORY_PROBE

















choice









	prompt "Page size"









	default PPC_64K_PAGES if PPC_BOOK3S_64









	default PPC_4K_PAGES









	help









	  Select the kernel logical page size. Increasing the page size








@@ -778,7 +782,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)









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









		   FSL_BOOKE









	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








@@ -791,11 +796,13 @@ config DATA_SHIFT







	default 24 if STRICT_KERNEL_RWX && PPC64









	range 17 28 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_BOOK3S_32









	range 19 23 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_8xx









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









	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 24 if STRICT_KERNEL_RWX && FSL_BOOKE









	default PPC_PAGE_SHIFT









	help









	  On Book3S 32 (603+), DBATs are used to map kernel text and rodata RO.








@@ -1123,7 +1130,10 @@ config LOWMEM_CAM_NUM_BOOL







config LOWMEM_CAM_NUM









	depends on FSL_BOOKE









	int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL









	default 3









	default 3 if !STRICT_KERNEL_RWX









	default 9 if DATA_SHIFT >= 24









	default 12 if DATA_SHIFT >= 22









	default 15



















config DYNAMIC_MEMSTART









	bool "Enable page aligned dynamic load address for kernel"
































arch/powerpc/boot/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -123,7 +123,7 @@ src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \







		oflib.c ofconsole.c cuboot.c



















src-wlib-$(CONFIG_PPC_MPC52xx) += mpc52xx-psc.c









src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S opal.c









src-wlib-$(CONFIG_PPC_POWERNV) += opal-calls.S opal.c









ifndef CONFIG_PPC64_BOOT_WRAPPER









src-wlib-y += crtsavres.S









endif
































arch/powerpc/boot/dts/a4m072.dts



+3
−3






























Original line number
Diff line number
Diff line







@@ -140,8 +140,8 @@







		clock-frequency = <0>; /* From boot loader */









		interrupts = <2 8 0 2 9 0 2 10 0>;









		bus-range = <0 0>;









		ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000









			  0x02000000 0 0x90000000 0x90000000 0 0x10000000









			  0x01000000 0 0x00000000 0xa0000000 0 0x01000000>;









		ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000>,









			 <0x02000000 0 0x90000000 0x90000000 0 0x10000000>,









			 <0x01000000 0 0x00000000 0xa0000000 0 0x01000000>;









	};









};
























arch/powerpc/boot/dts/charon.dts



+4
−4






























Original line number
Diff line number
Diff line







@@ -35,7 +35,7 @@







		};









	};



















	memory {









	memory@0 {









		device_type = "memory";









		reg = <0x00000000 0x08000000>;	// 128MB









	};








@@ -225,8 +225,8 @@







		clock-frequency = <0>; // From boot loader









		interrupts = <2 8 0 2 9 0 2 10 0>;









		bus-range = <0 0>;









		ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000









			  0x02000000 0 0x90000000 0x90000000 0 0x10000000









			  0x01000000 0 0x00000000 0xa0000000 0 0x01000000>;









		ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000>,









			 <0x02000000 0 0x90000000 0x90000000 0 0x10000000>,









			 <0x01000000 0 0x00000000 0xa0000000 0 0x01000000>;









	};









};