From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Mar 2024 00:53:48 +0000 (-0700)
Subject: Merge tag 'powerpc-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=66a27abac311a30edbbb65fe8c41ff1b13876faa;p=linux.git

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

Pull powerpc updates from Michael Ellerman:

 - Add AT_HWCAP3 and AT_HWCAP4 aux vector entries for future use
   by glibc

 - Add support for recognising the Power11 architected and raw PVRs

 - Add support for nr_cpus=n on the command line where the
   boot CPU is >= n

 - Add ppcxx_allmodconfig targets for all 32-bit sub-arches

 - Other small features, cleanups and fixes

Thanks to Akanksha J N, Brian King, Christophe Leroy, Dawei Li, Geoff
Levand, Greg Kroah-Hartman, Jan-Benedict Glaw, Kajol Jain, Kunwu Chan,
Li zeming, Madhavan Srinivasan, Masahiro Yamada, Nathan Chancellor,
Nicholas Piggin, Peter Bergner, Qiheng Lin, Randy Dunlap, Ricardo B.
Marliere, Rob Herring, Sathvika Vasireddy, Shrikanth Hegde, Uwe
Kleine-König, Vaibhav Jain, and Wen Xiong.

* tag 'powerpc-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (71 commits)
  powerpc/macio: Make remove callback of macio driver void returned
  powerpc/83xx: Fix build failure with FPU=n
  powerpc/64s: Fix get_hugepd_cache_index() build failure
  powerpc/4xx: Fix warp_gpio_leds build failure
  powerpc/amigaone: Make several functions static
  powerpc/embedded6xx: Fix no previous prototype for avr_uart_send() etc.
  macintosh/adb: make adb_dev_class constant
  powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
  powerpc/fsl: Fix mfpmr() asm constraint error
  powerpc: Remove cpu-as-y completely
  powerpc/fsl: Modernise mt/mfpmr
  powerpc/fsl: Fix mfpmr build errors with newer binutils
  powerpc/64s: Use .machine power4 around dcbt
  powerpc/64s: Move dcbt/dcbtst sequence into a macro
  powerpc/mm: Code cleanup for __hash_page_thp
  powerpc/hv-gpci: Fix the H_GET_PERF_COUNTER_INFO hcall return value checks
  powerpc/irq: Allow softirq to hardirq stack transition
  powerpc: Stop using of_root
  powerpc/machdep: Define 'compatibles' property in ppc_md and use it
  of: Reimplement of_machine_is_compatible() using of_machine_compatible_match()
  ...
---

66a27abac311a30edbbb65fe8c41ff1b13876faa
diff --cc arch/powerpc/kvm/book3s_hv.c
index 0b921704da45e,0ee7395caa219..8e86eb577eb8e
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@@ -442,9 -424,12 +442,10 @@@ static int kvmppc_set_arch_compat(struc
  			break;
  		case PVR_ARCH_300:
  			guest_pcr_bit = PCR_ARCH_300;
 -			cap = H_GUEST_CAP_POWER9;
  			break;
  		case PVR_ARCH_31:
+ 		case PVR_ARCH_31_P11:
  			guest_pcr_bit = PCR_ARCH_31;
 -			cap = H_GUEST_CAP_POWER10;
  			break;
  		default:
  			return -EINVAL;
diff --cc arch/powerpc/mm/pgtable_32.c
index 12498017da8e4,04aec716aa0e1..face94977cb2f
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@@ -165,20 -166,8 +165,5 @@@ void mark_rodata_ro(void
  		   PFN_DOWN((unsigned long)_stext);
  
  	set_memory_ro((unsigned long)_stext, numpages);
 -
 -	// mark_initmem_nx() should have already run by now
 -	ptdump_check_wx();
  }
  #endif
- 
- #if defined(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) && defined(CONFIG_DEBUG_PAGEALLOC)
- void __kernel_map_pages(struct page *page, int numpages, int enable)
- {
- 	unsigned long addr = (unsigned long)page_address(page);
- 
- 	if (PageHighMem(page))
- 		return;
- 
- 	if (enable)
- 		set_memory_p(addr, numpages);
- 	else
- 		set_memory_np(addr, numpages);
- }
- #endif /* CONFIG_DEBUG_PAGEALLOC */
diff --cc drivers/of/base.c
index 335d102586ac2,df8d9733b0545..8856c67c466ac
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@@ -408,44 -408,14 +408,45 @@@ bool of_machine_compatible_match(const 
  
  	root = of_find_node_by_path("/");
  	if (root) {
- 		rc = of_device_is_compatible(root, compat);
+ 		rc = of_device_compatible_match(root, compats);
  		of_node_put(root);
  	}
- 	return rc;
+ 
+ 	return rc != 0;
  }
- EXPORT_SYMBOL(of_machine_is_compatible);
+ EXPORT_SYMBOL(of_machine_compatible_match);
  
 +static bool __of_device_is_status(const struct device_node *device,
 +				  const char * const*strings)
 +{
 +	const char *status;
 +	int statlen;
 +
 +	if (!device)
 +		return false;
 +
 +	status = __of_get_property(device, "status", &statlen);
 +	if (status == NULL)
 +		return false;
 +
 +	if (statlen > 0) {
 +		while (*strings) {
 +			unsigned int len = strlen(*strings);
 +
 +			if ((*strings)[len - 1] == '-') {
 +				if (!strncmp(status, *strings, len))
 +					return true;
 +			} else {
 +				if (!strcmp(status, *strings))
 +					return true;
 +			}
 +			strings++;
 +		}
 +	}
 +
 +	return false;
 +}
 +
  /**
   *  __of_device_is_available - check if a device is available for use
   *