From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Oct 2020 19:21:15 +0000 (-0700)
Subject: Merge tag 'powerpc-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: microblaze-v5.11~108
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=96685f8666714233d34abb71b242448c80077536;p=linux-2.6-microblaze.git

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

Pull powerpc updates from Michael Ellerman:

 - A series from Nick adding ARCH_WANT_IRQS_OFF_ACTIVATE_MM & selecting
   it for powerpc, as well as a related fix for sparc.

 - Remove support for PowerPC 601.

 - Some fixes for watchpoints & addition of a new ptrace flag for
   detecting ISA v3.1 (Power10) watchpoint features.

 - A fix for kernels using 4K pages and the hash MMU on bare metal
   Power9 systems with > 16TB of RAM, or RAM on the 2nd node.

 - A basic idle driver for shallow stop states on Power10.

 - Tweaks to our sched domains code to better inform the scheduler about
   the hardware topology on Power9/10, where two SMT4 cores can be
   presented by firmware as an SMT8 core.

 - A series doing further reworks & cleanups of our EEH code.

 - Addition of a filter for RTAS (firmware) calls done via sys_rtas(),
   to prevent root from overwriting kernel memory.

 - Other smaller features, fixes & cleanups.

Thanks to: Alexey Kardashevskiy, Andrew Donnellan, Aneesh Kumar K.V,
Athira Rajeev, Biwen Li, Cameron Berkenpas, Cédric Le Goater, Christophe
Leroy, Christoph Hellwig, Colin Ian King, Daniel Axtens, David Dai, Finn
Thain, Frederic Barrat, Gautham R. Shenoy, Greg Kurz, Gustavo Romero,
Ira Weiny, Jason Yan, Joel Stanley, Jordan Niethe, Kajol Jain, Konrad
Rzeszutek Wilk, Laurent Dufour, Leonardo Bras, Liu Shixin, Luca
Ceresoli, Madhavan Srinivasan, Mahesh Salgaonkar, Nathan Lynch, Nicholas
Mc Guire, Nicholas Piggin, Nick Desaulniers, Oliver O'Halloran, Pedro
Miraglia Franco de Carvalho, Pratik Rajesh Sampat, Qian Cai, Qinglang
Miao, Ravi Bangoria, Russell Currey, Satheesh Rajendran, Scott Cheloha,
Segher Boessenkool, Srikar Dronamraju, Stan Johnson, Stephen Kitt,
Stephen Rothwell, Thiago Jung Bauermann, Tyrel Datwyler, Vaibhav Jain,
Vaidyanathan Srinivasan, Vasant Hegde, Wang Wensheng, Wolfram Sang, Yang
Yingliang, zhengbin.

* tag 'powerpc-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (228 commits)
  Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed"
  selftests/powerpc: Fix eeh-basic.sh exit codes
  cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_reboot_notifier
  powerpc/time: Make get_tb() common to PPC32 and PPC64
  powerpc/time: Make get_tbl() common to PPC32 and PPC64
  powerpc/time: Remove get_tbu()
  powerpc/time: Avoid using get_tbl() and get_tbu() internally
  powerpc/time: Make mftb() common to PPC32 and PPC64
  powerpc/time: Rename mftbl() to mftb()
  powerpc/32s: Remove #ifdef CONFIG_PPC_BOOK3S_32 in head_book3s_32.S
  powerpc/32s: Rename head_32.S to head_book3s_32.S
  powerpc/32s: Setup the early hash table at all time.
  powerpc/time: Remove ifdef in get_dec() and set_dec()
  powerpc: Remove get_tb_or_rtc()
  powerpc: Remove __USE_RTC()
  powerpc: Tidy up a bit after removal of PowerPC 601.
  powerpc: Remove support for PowerPC 601
  powerpc: Remove PowerPC 601
  powerpc: Drop SYNC_601() ISYNC_601() and SYNC()
  powerpc: Remove CONFIG_PPC601_SYNC_FIX
  ...
---

96685f8666714233d34abb71b242448c80077536
diff --cc arch/powerpc/mm/kasan/kasan_init_32.c
index 26fda3203320,59f61efc43af..cf8770b1a692
--- a/arch/powerpc/mm/kasan/kasan_init_32.c
+++ b/arch/powerpc/mm/kasan/kasan_init_32.c
@@@ -138,12 -137,12 +137,12 @@@ void __init kasan_mmu_init(void
  
  void __init kasan_init(void)
  {
 -	struct memblock_region *reg;
 +	phys_addr_t base, end;
 +	u64 i;
+ 	int ret;
  
 -	for_each_memblock(memory, reg) {
 -		phys_addr_t base = reg->base;
 -		phys_addr_t top = min(base + reg->size, total_lowmem);
 +	for_each_mem_range(i, &base, &end) {
 +		phys_addr_t top = min(end, total_lowmem);
- 		int ret;
  
  		if (base >= top)
  			continue;
diff --cc arch/powerpc/platforms/pseries/hotplug-memory.c
index d8bbf0cc1601,4e18653a3804..7efe6ec5d14a
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@@ -602,11 -622,15 +622,15 @@@ static int dlpar_add_lmb(struct drmem_l
  		return rc;
  	}
  
- 	lmb_set_nid(lmb);
  	block_sz = memory_block_size_bytes();
  
+ 	/* Find the node id for this LMB.  Fake one if necessary. */
+ 	nid = of_drconf_to_nid_single(lmb);
+ 	if (nid < 0 || !node_possible(nid))
+ 		nid = first_online_node;
+ 
  	/* Add the memory */
- 	rc = __add_memory(lmb->nid, lmb->base_addr, block_sz, MHP_NONE);
 -	rc = __add_memory(nid, lmb->base_addr, block_sz);
++	rc = __add_memory(nid, lmb->base_addr, block_sz, MHP_NONE);
  	if (rc) {
  		invalidate_lmb_associativity_index(lmb);
  		return rc;
diff --cc drivers/misc/ocxl/Kconfig
index 947294f6d7f4,0d815b2a40b3..c9b0a27caf64
--- a/drivers/misc/ocxl/Kconfig
+++ b/drivers/misc/ocxl/Kconfig
@@@ -9,8 -9,9 +9,8 @@@ config OCXL_BAS
  
  config OCXL
  	tristate "OpenCAPI coherent accelerator support"
- 	depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV
 -	depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE
++	depends on HOTPLUG_PCI_POWERNV
  	select OCXL_BASE
 -	select HOTPLUG_PCI_POWERNV
  	default m
  	help
  	  Select this option to enable the ocxl driver for Open