Commit ad952db4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:

 - Restore clearing of MSR[RI] at interrupt/syscall exit on 32-bit

 - Fix unpaired stwcx on interrupt exit on 32-bit

 - Fix race condition leading to double list-add in
   mac_hid_toggle_emumouse()

 - Fix mprotect on book3s 32-bit

 - Fix SLB multihit issue during SLB preload with 64-bit hash MMU

 - Add support for crashkernel CMA reservation

 - Add die_id and die_cpumask for Power10 & later to expose chip
   hemispheres

 - A series of minor fixes and improvements to the hash SLB code

Thanks to Antonio Alvarez Feijoo, Ben Collins, Bhaskar Chowdhury,
Christophe Leroy, Daniel Thompson, Dave Vasilevsky, Donet Tom,
J. Neuschäfer, Kunwu Chan, Long Li, Naresh Kamboju, Nathan Chancellor,
Ritesh Harjani (IBM), Shirisha G, Shrikanth Hegde, Sourabh Jain, Srikar
Dronamraju, Stephen Rothwell, Thomas Zimmermann, Venkat Rao Bagalkote,
and Vishal Chourasia.

* tag 'powerpc-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (32 commits)
  macintosh/via-pmu-backlight: Include <linux/fb.h> and <linux/of.h>
  powerpc/powermac: backlight: Include <linux/of.h>
  powerpc/64s/slb: Add no_slb_preload early cmdline param
  powerpc/64s/slb: Make preload_add return type as void
  powerpc/ptdump: Dump PXX level info for kernel_page_tables
  powerpc/64s/pgtable: Enable directMap counters in meminfo for Hash
  powerpc/64s/hash: Update directMap page counters for Hash
  powerpc/64s/hash: Hash hpt_order should be only available with Hash MMU
  powerpc/64s/hash: Improve hash mmu printk messages
  powerpc/64s/hash: Fix phys_addr_t printf format in htab_initialize()
  powerpc/64s/ptdump: Fix kernel_hash_pagetable dump for ISA v3.00 HPTE format
  powerpc/64s/hash: Restrict stress_hpt_struct memblock region to within RMA limit
  powerpc/64s/slb: Fix SLB multihit issue during SLB preload
  powerpc, mm: Fix mprotect on book3s 32-bit
  powerpc/smp: Expose die_id and die_cpumask
  powerpc/83xx: Add a null pointer check to mcu_gpiochip_add
  arch:powerpc:tools This file was missing shebang line, so added it
  kexec: Include kernel-end even without crashkernel
  powerpc: p2020: Rename wdt@ nodes to watchdog@
  powerpc: 86xx: Rename wdt@ nodes to watchdog@
  ...
parents 87c9e88a 9b36c7fc

Documentation/admin-guide/kernel-parameters.txt

+4 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ Kernel parameters 
			It will be ignored when crashkernel=X,high is not used

			or memory reserved is below 4G.

	crashkernel=size[KMG],cma

			[KNL, X86] Reserve additional crash kernel memory from

			[KNL, X86, ppc] Reserve additional crash kernel memory from

			CMA. This reservation is usable by the first system's

			userspace memory and kernel movable allocations (memory

			balloon, zswap). Pages allocated from this memory range
@@ -7304,6 +7304,9 @@ Kernel parameters 
			them frequently to increase the rate of SLB faults

			on kernel addresses.



	no_slb_preload	[PPC,EARLY]

			Disables slb preloading for userspace.



	sunrpc.min_resvport=

	sunrpc.max_resvport=

			[NFS,SUNRPC]

arch/powerpc/boot/addnote.c

+4 −3
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ static int e_class = ELFCLASS32; 
#define PUT_16BE(off, v)(buf[off] = ((v) >> 8) & 0xff, \

			 buf[(off) + 1] = (v) & 0xff)

#define PUT_32BE(off, v)(PUT_16BE((off), (v) >> 16L), PUT_16BE((off) + 2, (v)))

#define PUT_64BE(off, v)((PUT_32BE((off), (v) >> 32L), \

			  PUT_32BE((off) + 4, (v))))

#define PUT_64BE(off, v)((PUT_32BE((off), (unsigned long long)(v) >> 32L), \

			  PUT_32BE((off) + 4, (unsigned long long)(v))))



#define GET_16LE(off)	((buf[off]) + (buf[(off)+1] << 8))

#define GET_32LE(off)	(GET_16LE(off) + (GET_16LE((off)+2U) << 16U))
@@ -78,7 +78,8 @@ static int e_class = ELFCLASS32; 
#define PUT_16LE(off, v) (buf[off] = (v) & 0xff, \

			  buf[(off) + 1] = ((v) >> 8) & 0xff)

#define PUT_32LE(off, v) (PUT_16LE((off), (v)), PUT_16LE((off) + 2, (v) >> 16L))

#define PUT_64LE(off, v) (PUT_32LE((off), (v)), PUT_32LE((off) + 4, (v) >> 32L))

#define PUT_64LE(off, v) (PUT_32LE((off), (unsigned long long)(v)), \

			  PUT_32LE((off) + 4, (unsigned long long)(v) >> 32L))



#define GET_16(off)	(e_data == ELFDATA2MSB ? GET_16BE(off) : GET_16LE(off))

#define GET_32(off)	(e_data == ELFDATA2MSB ? GET_32BE(off) : GET_32LE(off))

arch/powerpc/boot/dts/asp834x-redboot.dts

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ soc8349@ff000000 { 
		reg = <0xff000000 0x00000200>;

		bus-frequency = <0>;



		wdt@200 {

		watchdog@200 {

			device_type = "watchdog";

			compatible = "mpc83xx_wdt";

			reg = <0x200 0x100>;

arch/powerpc/boot/dts/fsl/ge_imp3a.dts

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ gef_gpio: gpio@4,400 { 
			gpio-controller;

		};



		wdt@4,800 {

		watchdog@4,800 {

			compatible = "ge,imp3a-fpga-wdt", "gef,fpga-wdt-1.00",

				"gef,fpga-wdt";

			reg = <0x4 0x800 0x8>;
@@ -103,7 +103,7 @@ wdt@4,800 { 
		};



		/* Second watchdog available, driver currently supports one.

		wdt@4,808 {

		watchdog@4,808 {

			compatible = "gef,imp3a-fpga-wdt", "gef,fpga-wdt-1.00",

				"gef,fpga-wdt";

			reg = <0x4 0x808 0x8>;

arch/powerpc/boot/dts/fsl/gef_ppc9a.dts

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ fpga@4,0 { 
			reg = <0x4 0x0 0x40>;

		};



		wdt@4,2000 {

		watchdog@4,2000 {

			compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",

				"gef,fpga-wdt";

			reg = <0x4 0x2000 0x8>;
@@ -90,7 +90,7 @@ wdt@4,2000 { 
			interrupt-parent = <&gef_pic>;

		};

		/* Second watchdog available, driver currently supports one.

		wdt@4,2010 {

		watchdog@4,2010 {

			compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",

				"gef,fpga-wdt";

			reg = <0x4 0x2010 0x8>;