From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2022 18:27:17 +0000 (-0700)
Subject: Merge tag 'powerpc-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v6.6.17~7407
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6112bd00e84e5dbffebc3c1e908cbe914ca772ee;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'powerpc-5.19-1' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc updates from Michael Ellerman:

 - Convert to the generic mmap support (ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT)

 - Add support for outline-only KASAN with 64-bit Radix MMU (P9 or later)

 - Increase SIGSTKSZ and MINSIGSTKSZ and add support for AT_MINSIGSTKSZ

 - Enable the DAWR (Data Address Watchpoint) on POWER9 DD2.3 or later

 - Drop support for system call instruction emulation

 - Many other small features and fixes

Thanks to Alexey Kardashevskiy, Alistair Popple, Andy Shevchenko, Bagas
Sanjaya, Bjorn Helgaas, Bo Liu, Chen Huang, Christophe Leroy, Colin Ian
King, Daniel Axtens, Dwaipayan Ray, Fabiano Rosas, Finn Thain, Frank
Rowand, Fuqian Huang, Guilherme G. Piccoli, Hangyu Hua, Haowen Bai,
Haren Myneni, Hari Bathini, He Ying, Jason Wang, Jiapeng Chong, Jing
Yangyang, Joel Stanley, Julia Lawall, Kajol Jain, Kevin Hao, Krzysztof
Kozlowski, Laurent Dufour, Lv Ruyi, Madhavan Srinivasan, Magali Lemes,
Miaoqian Lin, Minghao Chi, Nathan Chancellor, Naveen N. Rao, Nicholas
Piggin, Oliver O'Halloran, Oscar Salvador, Pali Rohár, Paul Mackerras,
Peng Wu, Qing Wang, Randy Dunlap, Reza Arbab, Russell Currey, Sohaib
Mohamed, Vaibhav Jain, Vasant Hegde, Wang Qing, Wang Wensheng, Xiang
wangx, Xiaomeng Tong, Xu Wang, Yang Guang, Yang Li, Ye Bin, YueHaibing,
Yu Kuai, Zheng Bin, Zou Wei, and Zucheng Zheng.

* tag 'powerpc-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (200 commits)
  powerpc/64: Include cache.h directly in paca.h
  powerpc/64s: Only set HAVE_ARCH_UNMAPPED_AREA when CONFIG_PPC_64S_HASH_MMU is set
  powerpc/xics: Include missing header
  powerpc/powernv/pci: Drop VF MPS fixup
  powerpc/fsl_book3e: Don't set rodata RO too early
  powerpc/microwatt: Add mmu bits to device tree
  powerpc/powernv/flash: Check OPAL flash calls exist before using
  powerpc/powermac: constify device_node in of_irq_parse_oldworld()
  powerpc/powermac: add missing g5_phy_disable_cpu1() declaration
  selftests/powerpc/pmu: fix spelling mistake "mis-match" -> "mismatch"
  powerpc: Enable the DAWR on POWER9 DD2.3 and above
  powerpc/64s: Add CPU_FTRS_POWER10 to ALWAYS mask
  powerpc/64s: Add CPU_FTRS_POWER9_DD2_2 to CPU_FTRS_ALWAYS mask
  powerpc: Fix all occurences of "the the"
  selftests/powerpc/pmu/ebb: remove fixed_instruction.S
  powerpc/platforms/83xx: Use of_device_get_match_data()
  powerpc/eeh: Drop redundant spinlock initialization
  powerpc/iommu: Add missing of_node_put in iommu_init_early_dart
  powerpc/pseries/vas: Call misc_deregister if sysfs init fails
  powerpc/papr_scm: Fix leaking nvdimm_events_map elements
  ...
---

6112bd00e84e5dbffebc3c1e908cbe914ca772ee
diff --cc arch/powerpc/Kconfig
index 22e2f11,f5ed355e..3eaddb8
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -158,7 -158,7 +159,8 @@@ config PP
  	select ARCH_WANT_IPC_PARSE_VERSION
  	select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
  	select ARCH_WANT_LD_ORPHAN_WARN
 +	select ARCH_WANTS_MODULES_DATA_IN_VMALLOC	if PPC_BOOK3S_32 || PPC_8xx
+ 	select ARCH_WANTS_NO_INSTR
  	select ARCH_WEAK_RELEASE_ACQUIRE
  	select BINFMT_ELF
  	select BUILDTIME_TABLE_SORT
diff --cc arch/powerpc/kernel/crash_dump.c
index 32b4a97,c438c60..9a3b85b
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@@ -12,11 -12,11 +12,11 @@@
  #include <linux/crash_dump.h>
  #include <linux/io.h>
  #include <linux/memblock.h>
+ #include <linux/of.h>
  #include <asm/code-patching.h>
  #include <asm/kdump.h>
- #include <asm/prom.h>
  #include <asm/firmware.h>
 -#include <linux/uaccess.h>
 +#include <linux/uio.h>
  #include <asm/rtas.h>
  #include <asm/inst.h>
  
diff --cc mm/util.c
index 29f4f77,44fbf21..0837570
--- a/mm/util.c
+++ b/mm/util.c
@@@ -344,40 -343,8 +344,40 @@@ unsigned long randomize_stack_top(unsig
  #endif
  }
  
 +/**
 + * randomize_page - Generate a random, page aligned address
 + * @start:	The smallest acceptable address the caller will take.
 + * @range:	The size of the area, starting at @start, within which the
 + *		random address must fall.
 + *
 + * If @start + @range would overflow, @range is capped.
 + *
 + * NOTE: Historical use of randomize_range, which this replaces, presumed that
 + * @start was already page aligned.  We now align it regardless.
 + *
 + * Return: A page aligned address within [start, start + range).  On error,
 + * @start is returned.
 + */
 +unsigned long randomize_page(unsigned long start, unsigned long range)
 +{
 +	if (!PAGE_ALIGNED(start)) {
 +		range -= PAGE_ALIGN(start) - start;
 +		start = PAGE_ALIGN(start);
 +	}
 +
 +	if (start > ULONG_MAX - range)
 +		range = ULONG_MAX - start;
 +
 +	range >>= PAGE_SHIFT;
 +
 +	if (range == 0)
 +		return start;
 +
 +	return start + (get_random_long() % range << PAGE_SHIFT);
 +}
 +
  #ifdef CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT
- unsigned long arch_randomize_brk(struct mm_struct *mm)
+ unsigned long __weak arch_randomize_brk(struct mm_struct *mm)
  {
  	/* Is the current task 32bit ? */
  	if (!IS_ENABLED(CONFIG_64BIT) || is_compat_task())