projects/linux·commit 91981f96

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

91981f96 · Linus Torvalds <[email protected]> · 2026-06-19 07:37:52 -07:00

Pull powerpc updates from Madhavan Srinivasan:

 - Enable GENERIC_ENTRY feature

 - Add missing property in DTS for mpc83xx platform

 - Enable building of DTB based on platfrom Kconfig

 - Add powerpc64 JIT support for timed may_goto

 - Add timeout to RTAS busy-wait loops

 - Simplify cpumask api usage for cpuinfo display

 - implement get_direction() in cpm1 (8xx platform)

 - MAINTAINERS file update for power VMX AES entries

 - Fixes to handle preempt count

 - Restore KUAP registers on syscall restart exit

 - define MIN_RMA in bytes rather than MB

 - misc fixes and cleanups

Thanks to Aboorva Devarajan, Adriano Vero, Amit Machhiwal, Anushree
Mathur, Bartosz Golaszewski, Christophe Leroy (CS GROUP), David Gow,
Jinjie Ruan, J. Neuschäfer, Linus Walleij, Mahesh Salgaonkar, Mukesh
Kumar Chaurasiya (IBM), Ritesh Harjani (IBM), Saket Kumar Bhaskar,
Samir M, Sayali Patil, Shirisha G, Shivang Upadhyay, Shrikanth Hegde,
Sourabh Jain, Thorsten Blum, Venkat Rao Bagalkote, and Yury Norov.

* tag 'powerpc-7.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (32 commits)
  powerpc/fadump: define MIN_RMA in bytes rather than MB
  powerpc: Restore KUAP registers on syscall restart exit
  powerpc/kexec: fix double get_cpu() imbalance in kexec_prepare_cpus
  powerpc/powernv: fix preempt count leak in pnv_kexec_wait_secondaries_down
  powerpc/perf: fix preempt count underflow in fsl_emb_pmu_del
  powerpc/boot: Allow text relocations for pseries wrapper with binutils 2.46+
  powerpc: Simplify access_ok()
  powerpc/entry: Disable interrupts before irqentry_exit
  powerpc/8xx: implement get_direction() in cpm1
  powerpc/pseries/lparcfg: Replace deprecated strcpy in parse_system_parameter_string
  powerpc: Fix indentation and replace typedef with struct name
  powerpc/rtas: Replace one-element array with flexible array member
  powerpc: use sysfs_emit{_at} in sysfs show functions
  MAINTAINERS: powerpc: update VMX AES entries
  ppc/fadump: invoke kmsg_dump in fadump panic path
  powerpc/xive: Add warning if target CPU not found
  powerpc/perf: Use cpumask_intersects api for checking disable path
  powerpc: Simplify cpumask api usage for cpuinfo display
  powerpc: Use cpumask_next_wrap instead
  powerpc/fadump: Add timeout to RTAS busy-wait loops
  ...
Commit
91981f96d2831a73cd4dbe4383b4d7e1dcdfcc06
Parents
f32a375e · 42f252f5

Merge commit. Changes below are compared with the first parent: f32a375e.

Changes

82 files changed · +1242 −1068

FileStatusAddDelContent
MAINTAINERSmodified+2−2View file
arch/powerpc/Kconfigmodified+1−0View file
arch/powerpc/boot/dts/Makefilemodified+73−0View file
arch/powerpc/boot/dts/fsl/Makefilemodified+43−0View file
arch/powerpc/boot/dts/mpc8308_p1m.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc8308rdb.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc8315erdb.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc836x_rdk.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc8377_rdb.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc8377_wlan.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc8378_rdb.dtsmodified+1−0View file
arch/powerpc/boot/dts/mpc8379_rdb.dtsmodified+1−0View file
arch/powerpc/boot/hack-coff.cmodified+1−1View file
arch/powerpc/boot/rs6000.hmodified+40−44View file
arch/powerpc/boot/wrappermodified+1−0View file
arch/powerpc/include/asm/entry-common.hadded+534−0View file
arch/powerpc/include/asm/hw_irq.hmodified+2−2View file
arch/powerpc/include/asm/interrupt.hmodified+61−325View file
arch/powerpc/include/asm/kasan.hmodified+10−5View file
arch/powerpc/include/asm/prom.hmodified+3−1View file
arch/powerpc/include/asm/ptrace.hmodified+3−3View file
arch/powerpc/include/asm/rtas-types.hmodified+3−2View file
arch/powerpc/include/asm/signal.hmodified+0−1View file
arch/powerpc/include/asm/stacktrace.hmodified+6−0View file
arch/powerpc/include/asm/syscall.hmodified+5−0View file
arch/powerpc/include/asm/thread_info.hmodified+1−0View file
arch/powerpc/include/asm/uaccess.hmodified+26−0View file
arch/powerpc/include/uapi/asm/ptrace.hmodified+9−5View file
arch/powerpc/kernel/cacheinfo.cmodified+7−6View file
arch/powerpc/kernel/eeh_sysfs.cmodified+4−4View file
arch/powerpc/kernel/fadump.cmodified+7−7View file
arch/powerpc/kernel/interrupt.cmodified+45−210View file
arch/powerpc/kernel/iommu.cmodified+2−1View file
arch/powerpc/kernel/irq.cmodified+1−4View file
arch/powerpc/kernel/prom_init.cmodified+1−1View file
arch/powerpc/kernel/ptrace/ptrace.cmodified+1−141View file
arch/powerpc/kernel/security.cmodified+7−6View file
arch/powerpc/kernel/setup-common.cmodified+10−5View file
arch/powerpc/kernel/signal.cmodified+8−17View file
arch/powerpc/kernel/syscall.cmodified+3−116View file
arch/powerpc/kernel/sysfs.cmodified+12−11View file
arch/powerpc/kernel/traps.cmodified+1−1View file
arch/powerpc/kernel/watchdog.cmodified+1−1View file
arch/powerpc/kexec/core_64.cmodified+1−3View file
arch/powerpc/mm/book3s64/hash_utils.cmodified+1−3View file
arch/powerpc/net/Makefilemodified+4−0View file
arch/powerpc/net/bpf_jit_comp.cmodified+5−0View file
arch/powerpc/net/bpf_jit_comp64.cmodified+51−11View file
arch/powerpc/net/bpf_timed_may_goto.Sadded+57−0View file
arch/powerpc/perf/core-book3s.cmodified+3−2View file
arch/powerpc/perf/core-fsl-emb.cmodified+2−1View file
arch/powerpc/perf/hv-24x7.cmodified+7−11View file
arch/powerpc/perf/hv-gpci.cmodified+3−2View file
arch/powerpc/perf/imc-pmu.cmodified+2−4View file
arch/powerpc/perf/kvm-hv-pmu.cmodified+2−1View file
arch/powerpc/perf/vpa-pmu.cmodified+2−1View file
arch/powerpc/platforms/83xx/mcu_mpc8349emitx.cmodified+2−1View file
arch/powerpc/platforms/8xx/cpm1.cmodified+26−0View file
arch/powerpc/platforms/cell/spu_base.cmodified+3−2View file
arch/powerpc/platforms/powernv/idle.cmodified+2−1View file
arch/powerpc/platforms/powernv/opal-dump.cmodified+6−5View file
arch/powerpc/platforms/powernv/opal-elog.cmodified+4−5View file
arch/powerpc/platforms/powernv/opal-flash.cmodified+2−2View file
arch/powerpc/platforms/powernv/opal-powercap.cmodified+4−8View file
arch/powerpc/platforms/powernv/opal-psr.cmodified+4−8View file
arch/powerpc/platforms/powernv/setup.cmodified+2−1View file
arch/powerpc/platforms/powernv/subcore.cmodified+2−1View file
arch/powerpc/platforms/ps3/setup.cmodified+2−1View file
arch/powerpc/platforms/pseries/cmm.cmodified+3−2View file
arch/powerpc/platforms/pseries/dlpar.cmodified+2−1View file
arch/powerpc/platforms/pseries/ibmebus.cmodified+3−2View file
arch/powerpc/platforms/pseries/lparcfg.cmodified+13−11View file
arch/powerpc/platforms/pseries/papr_scm.cmodified+3−2View file
arch/powerpc/platforms/pseries/power.cmodified+2−1View file
arch/powerpc/platforms/pseries/pseries_energy.cmodified+2−1View file
arch/powerpc/platforms/pseries/rtas-fadump.cmodified+47−33View file
arch/powerpc/platforms/pseries/rtas-fadump.hmodified+6−0View file
arch/powerpc/platforms/pseries/suspend.cmodified+2−1View file
arch/powerpc/platforms/pseries/vas-sysfs.cmodified+2−1View file
arch/powerpc/platforms/pseries/vio.cmodified+13−16View file
arch/powerpc/sysdev/fsl_mpic_timer_wakeup.cmodified+2−1View file
arch/powerpc/sysdev/xive/common.cmodified+1−0View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 16ce0c0..9f4ddd4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12428,13 +12428,13 @@ L: [email protected]
S: Supported
F: arch/powerpc/crypto/Kconfig
F: arch/powerpc/crypto/Makefile
-F: arch/powerpc/crypto/aes.c
F: arch/powerpc/crypto/aes_cbc.c
F: arch/powerpc/crypto/aes_ctr.c
F: arch/powerpc/crypto/aes_xts.c
-F: arch/powerpc/crypto/aesp8-ppc.*
+F: arch/powerpc/crypto/aesp8-ppc.h
F: arch/powerpc/crypto/ppc-xlate.pl
F: arch/powerpc/crypto/vmx.c
+F: lib/crypto/powerpc/aesp8-ppc.pl
F: lib/crypto/powerpc/gf128hash.h
F: lib/crypto/powerpc/ghashp8-ppc.pl

arch/powerpc/Kconfig

View file
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c99fd83..f7ce5ff 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -206,6 +206,7 @@ config PPC
select GENERIC_CPU_AUTOPROBE
select GENERIC_CPU_VULNERABILITIES if PPC_BARRIER_NOSPEC
select GENERIC_EARLY_IOREMAP
+ select GENERIC_ENTRY
select GENERIC_GETTIMEOFDAY
select GENERIC_IDLE_POLL_SETUP
select GENERIC_IOREMAP

arch/powerpc/boot/dts/Makefile

View file
diff --git a/arch/powerpc/boot/dts/Makefile b/arch/powerpc/boot/dts/Makefile
index 0cd0d85..1e61a95 100644
--- a/arch/powerpc/boot/dts/Makefile
+++ b/arch/powerpc/boot/dts/Makefile
@@ -3,3 +3,76 @@
subdir-y += fsl
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))
+
+# PPC44x platforms
+dtb-$(CONFIG_PPC44x_SIMPLE) += arches.dtb bamboo.dtb bluestone.dtb glacier.dtb
+dtb-$(CONFIG_PPC44x_SIMPLE) += eiger.dtb katmai.dtb rainier.dtb redwood.dtb
+dtb-$(CONFIG_PPC44x_SIMPLE) += sequoia.dtb taishan.dtb yosemite.dtb icon.dtb
+dtb-$(CONFIG_EBONY) += ebony.dtb
+dtb-$(CONFIG_SAM440EP) += sam440ep.dtb
+dtb-$(CONFIG_WARP) += warp.dtb
+dtb-$(CONFIG_ISS4xx) += iss4xx.dtb iss4xx-mpic.dtb
+dtb-$(CONFIG_CANYONLANDS) += canyonlands.dtb
+dtb-$(CONFIG_CURRITUCK) += currituck.dtb
+dtb-$(CONFIG_AKEBONO) += akebono.dtb
+dtb-$(CONFIG_FSP2) += fsp2.dtb
+
+# Embedded 6xx platforms
+dtb-$(CONFIG_LINKSTATION) += kuroboxHG.dtb kuroboxHD.dtb
+dtb-$(CONFIG_STORCENTER) += storcenter.dtb
+dtb-$(CONFIG_PPC_HOLLY) += holly.dtb
+dtb-$(CONFIG_GAMECUBE) += gamecube.dtb
+dtb-$(CONFIG_WII) += wii.dtb
+dtb-$(CONFIG_MVME5100) += mvme5100.dtb
+
+# MPC8xx platforms
+dtb-$(CONFIG_MPC885ADS) += mpc885ads.dtb
+dtb-$(CONFIG_MPC86XADS) += mpc866ads.dtb
+dtb-$(CONFIG_PPC_EP88XC) += ep88xc.dtb
+dtb-$(CONFIG_PPC_ADDER875) += adder875-redboot.dtb adder875-uboot.dtb
+dtb-$(CONFIG_TQM8XX) += tqm8xx.dtb
+
+# MPC512x platforms
+dtb-$(CONFIG_MPC5121_ADS) += mpc5121ads.dtb
+dtb-$(CONFIG_MPC512x_GENERIC) += mpc5125twr.dtb ac14xx.dts
+dtb-$(CONFIG_PDM360NG) += pdm360ng.dtb
+
+# MPC5200 platforms
+dtb-$(CONFIG_PPC_MPC5200_SIMPLE) += a3m071.dtb a4m072.dtb charon.dtb cm5200.dtb
+dtb-$(CONFIG_PPC_MPC5200_SIMPLE) += digsy_mtc.dtb motionpro.dtb mucmc52.dtb
+dtb-$(CONFIG_PPC_MPC5200_SIMPLE) += o2d.dtb o2d300.dtb o2dnt2.dtb o2i.dtb
+dtb-$(CONFIG_PPC_MPC5200_SIMPLE) += o2mnt.dtb o3dnt.dtb pcm030.dtb pcm032.dtb
+dtb-$(CONFIG_PPC_MPC5200_SIMPLE) += tqm5200.dtb uc101.dtb
+dtb-$(CONFIG_PPC_LITE5200) += lite5200.dtb lite5200b.dtb
+dtb-$(CONFIG_PPC_MEDIA5200) += media5200.dtb
+
+# MPC82xx platforms
+dtb-$(CONFIG_EP8248E) += ep8248e.dtb
+dtb-$(CONFIG_MGCOGE) += mgcoge.dtb
+
+# MPC83xx platforms
+dtb-$(CONFIG_MPC830x_RDB) += mpc8308rdb.dtb mpc8308_p1m.dtb
+dtb-$(CONFIG_MPC831x_RDB) += mpc8313erdb.dtb mpc8315erdb.dtb
+dtb-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.dtb
+dtb-$(CONFIG_MPC834x_ITX) += mpc8349emitx.dtb mpc8349emitxgp.dtb
+dtb-$(CONFIG_ASP834x) += asp834x-redboot.dtb
+dtb-$(CONFIG_MPC836x_RDK) += mpc836x_rdk.dtb
+dtb-$(CONFIG_KMETER1) += kmeter1.dtb
+dtb-$(CONFIG_MPC837x_RDB) += mpc8377_rdb.dtb mpc8378_rdb.dtb mpc8379_rdb.dtb
+dtb-$(CONFIG_MPC837x_RDB) += mpc8377_wlan.dtb
+
+# MPC85xx platforms
+dtb-$(CONFIG_STX_GP3) += stx_gp3_8560.dtb stxssa8555.dtb
+dtb-$(CONFIG_TQM85xx) += tqm8540.dtb tqm8541.dtb tqm8548.dtb
+dtb-$(CONFIG_TQM85xx) += tqm8548-bigflash.dtb tqm8555.dtb tqm8560.dtb
+dtb-$(CONFIG_SOCRATES) += socrates.dtb
+dtb-$(CONFIG_KSI8560) += ksi8560.dtb
+dtb-$(CONFIG_XES_MPC85xx) += xcalibur1501.dtb xpedite5200.dtb
+dtb-$(CONFIG_XES_MPC85xx) += xpedite5200_xmon.dtb xpedite5301.dtb
+dtb-$(CONFIG_XES_MPC85xx) += xpedite5330.dtb xpedite5370.dtb
+dtb-$(CONFIG_PPC_P2020) += turris1x.dtb
+
+# Misc. platforms
+dtb-$(CONFIG_PPC_MICROWATT) += microwatt.dtb
+dtb-$(CONFIG_AMIGAONE) += amigaone.dtb
+dtb-$(CONFIG_PPC_PS3) += ps3.dtb

arch/powerpc/boot/dts/fsl/Makefile

View file
diff --git a/arch/powerpc/boot/dts/fsl/Makefile b/arch/powerpc/boot/dts/fsl/Makefile
index d3ecdf1..d2cc8e1 100644
--- a/arch/powerpc/boot/dts/fsl/Makefile
+++ b/arch/powerpc/boot/dts/fsl/Makefile
@@ -1,3 +1,46 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))
+
+# MPC85xx platforms
+dtb-$(CONFIG_BSC9131_RDB) += bsc9131rdb.dtb
+dtb-$(CONFIG_BSC9132_QDS) += bsc9132qds.dtb
+dtb-$(CONFIG_C293_PCIE) += c293pcie.dtb
+dtb-$(CONFIG_MPC8536_DS) += mpc8536ds.dtb mpc8536ds_36b.dtb
+dtb-$(CONFIG_MPC85xx_DS) += mpc8544ds.dtb mpc8572ds_camp_core0.dtb
+dtb-$(CONFIG_MPC85xx_DS) += mpc8572ds_camp_core1.dtb mpc8572ds_36b.dtb
+dtb-$(CONFIG_MPC85xx_DS) += mpc8572ds.dtb
+dtb-$(CONFIG_MPC85xx_MDS) += mpc8568mds.dtb mpc8569mds.dtb p1021mds.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1020mbg-pc_32b.dtb p1020mbg-pc_36b.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1020rdb_36b.dtb p1020rdb.dtb p1020rdb-pc_32b.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1020rdb-pc_36b.dtb p1020rdb-pc_camp_core0.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1020rdb-pc_camp_core1.dtb p1020rdb-pd.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1020utm-pc_32b.dtb p1020utm-pc_36b.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1021rdb-pc_32b.dtb p1021rdb-pc_36b.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1024rdb_32b.dtb p1024rdb_36b.dtb p1025rdb_32b.dtb
+dtb-$(CONFIG_MPC85xx_RDB) += p1025rdb_36b.dtb
+dtb-$(CONFIG_P1010_RDB) += p1010rdb-pa_36b.dtb p1010rdb-pa.dtb
+dtb-$(CONFIG_P1010_RDB) += p1010rdb-pb_36b.dtb p1010rdb-pb.dtb
+dtb-$(CONFIG_P1022_DS) += p1022ds_32b.dtb p1022ds_36b.dtb
+dtb-$(CONFIG_P1022_RDK) += p1022rdk.dtb
+dtb-$(CONFIG_P1023_RDB) += p1023rdb.dtb
+dtb-$(CONFIG_PPC_P2020) += p2020ds.dtb
+dtb-$(CONFIG_TWR_P102x) += p1025twr.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += b4420qds.dtb b4860qds.dtb cyrus_p5020.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += kmcent2.dtb kmcoge4.dtb oca4080.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += p2041rdb.dtb p3041ds.dtb p4080ds.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += p5020ds.dtb p5040ds.dtb t1023rdb.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += t1024qds.dtb t1024rdb.dtb t1040d4rdb.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += t1040qds.dtb t1040rdb.dtb t1040rdb-rev-a.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += t1042d4rdb.dtb t1042qds.dtb t1042rdb.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += t1042rdb_pi.dtb t2080qds.dtb t2080rdb.dtb
+dtb-$(CONFIG_CORENET_GENERIC) += t2081qds.dtb t4240qds.dtb t4240rdb.dtb
+dtb-$(CONFIG_PPA8548) += ppa8548.dtb
+dtb-$(CONFIG_GE_IMP3A) += ge_imp3a.dtb
+dtb-$(CONFIG_MVME2500) += mvme2500.dtb
+
+# MPC86xx platforms
+dtb-$(CONFIG_GEF_SBC310) += gef_sbc310.dtb
+dtb-$(CONFIG_GEF_SBC610) += gef_sbc610.dtb
+dtb-$(CONFIG_GEF_PPC9A) += gef_ppc9a.dtb
+dtb-$(CONFIG_MVME7100) += mvme7100.dtb

arch/powerpc/boot/dts/mpc8308_p1m.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts
index 41f917f..5af945e 100644
--- a/arch/powerpc/boot/dts/mpc8308_p1m.dts
+++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts
@@ -9,6 +9,7 @@
/ {
compatible = "denx,mpc8308_p1m";
+ model = "denx,mpc8308_p1m";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/dts/mpc8308rdb.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts
index 39ed26f..7b6fd58 100644
--- a/arch/powerpc/boot/dts/mpc8308rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8308rdb.dts
@@ -10,6 +10,7 @@
/ {
compatible = "fsl,mpc8308rdb";
+ model = "fsl,mpc8308rdb";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/dts/mpc8315erdb.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 7ba1159..4757f0d 100644
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -10,6 +10,7 @@
/ {
compatible = "fsl,mpc8315erdb";
+ model = "MPC8315E-RDB";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/dts/mpc836x_rdk.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index 4ff38e1..d3d36fb 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -14,6 +14,7 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,mpc8360rdk";
+ model = "fsl,mpc8360rdk";
aliases {
serial0 = &serial0;

arch/powerpc/boot/dts/mpc8377_rdb.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index fb311a7..f4244a7 100644
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -9,6 +9,7 @@
/ {
compatible = "fsl,mpc8377rdb";
+ model = "fsl,mpc8377rdb";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/dts/mpc8377_wlan.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts
index f736a15..77ee5f8 100644
--- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
@@ -10,6 +10,7 @@
/ {
compatible = "fsl,mpc8377wlan";
+ model = "fsl,mpc8377wlan";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/dts/mpc8378_rdb.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 32c4962..9ae4ed5 100644
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -9,6 +9,7 @@
/ {
compatible = "fsl,mpc8378rdb";
+ model = "fsl,mpc8378rdb";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/dts/mpc8379_rdb.dts

View file
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 07deb89..214611d 100644
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -9,6 +9,7 @@
/ {
compatible = "fsl,mpc8379rdb";
+ model = "fsl,mpc8379rdb";
#address-cells = <1>;
#size-cells = <1>;

arch/powerpc/boot/hack-coff.c

View file
diff --git a/arch/powerpc/boot/hack-coff.c b/arch/powerpc/boot/hack-coff.c
index a010e12..6bf0c94 100644
--- a/arch/powerpc/boot/hack-coff.c
+++ b/arch/powerpc/boot/hack-coff.c
@@ -31,7 +31,7 @@ main(int ac, char **av)
int i, nsect;
int aoutsz;
struct external_filehdr fhdr;
- AOUTHDR aout;
+ struct aouthdr aout;
struct external_scnhdr shdr;
if (ac != 2) {

arch/powerpc/boot/rs6000.h

View file
diff --git a/arch/powerpc/boot/rs6000.h b/arch/powerpc/boot/rs6000.h
index 16df8f3..970754a 100644
--- a/arch/powerpc/boot/rs6000.h
+++ b/arch/powerpc/boot/rs6000.h
@@ -32,32 +32,30 @@ struct external_filehdr {
/********************** AOUT "OPTIONAL HEADER" **********************/
-typedef struct
-{
- unsigned char magic[2]; /* type of file */
- unsigned char vstamp[2]; /* version stamp */
- unsigned char tsize[4]; /* text size in bytes, padded to FW bdry */
- unsigned char dsize[4]; /* initialized data " " */
- unsigned char bsize[4]; /* uninitialized data " " */
- unsigned char entry[4]; /* entry pt. */
- unsigned char text_start[4]; /* base of text used for this file */
- unsigned char data_start[4]; /* base of data used for this file */
- unsigned char o_toc[4]; /* address of TOC */
- unsigned char o_snentry[2]; /* section number of entry point */
- unsigned char o_sntext[2]; /* section number of .text section */
- unsigned char o_sndata[2]; /* section number of .data section */
- unsigned char o_sntoc[2]; /* section number of TOC */
- unsigned char o_snloader[2]; /* section number of .loader section */
- unsigned char o_snbss[2]; /* section number of .bss section */
- unsigned char o_algntext[2]; /* .text alignment */
- unsigned char o_algndata[2]; /* .data alignment */
- unsigned char o_modtype[2]; /* module type (??) */
- unsigned char o_cputype[2]; /* cpu type */
- unsigned char o_maxstack[4]; /* max stack size (??) */
- unsigned char o_maxdata[4]; /* max data size (??) */
- unsigned char o_resv2[12]; /* reserved */
-}
-AOUTHDR;
+struct aouthdr {
+ unsigned char magic[2]; /* type of file */
+ unsigned char vstamp[2]; /* version stamp */
+ unsigned char tsize[4]; /* text size in bytes, padded to FW bdry */
+ unsigned char dsize[4]; /* initialized data " " */
+ unsigned char bsize[4]; /* uninitialized data " " */
+ unsigned char entry[4]; /* entry pt. */
+ unsigned char text_start[4]; /* base of text used for this file */
+ unsigned char data_start[4]; /* base of data used for this file */
+ unsigned char o_toc[4]; /* address of TOC */
+ unsigned char o_snentry[2]; /* section number of entry point */
+ unsigned char o_sntext[2]; /* section number of .text section */
+ unsigned char o_sndata[2]; /* section number of .data section */
+ unsigned char o_sntoc[2]; /* section number of TOC */
+ unsigned char o_snloader[2]; /* section number of .loader section */
+ unsigned char o_snbss[2]; /* section number of .bss section */
+ unsigned char o_algntext[2]; /* .text alignment */
+ unsigned char o_algndata[2]; /* .data alignment */
+ unsigned char o_modtype[2]; /* module type (??) */
+ unsigned char o_cputype[2]; /* cpu type */
+ unsigned char o_maxstack[4]; /* max stack size (??) */
+ unsigned char o_maxdata[4]; /* max data size (??) */
+ unsigned char o_resv2[12]; /* reserved */
+};
#define AOUTSZ 72
#define SMALL_AOUTSZ (28)
@@ -115,10 +113,10 @@ struct external_scnhdr {
*/
struct external_lineno {
union {
- char l_symndx[4]; /* function name symbol index, iff l_lnno == 0*/
+ char l_symndx[4]; /* function name symbol index, iff l_lnno == 0 */
char l_paddr[4]; /* (physical) address of line number */
} l_addr;
- char l_lnno[2]; /* line number */
+ char l_lnno[2]; /* line number */
};
@@ -132,20 +130,19 @@ struct external_lineno {
#define E_FILNMLEN 14 /* # characters in a file name */
#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */
-struct external_syment
-{
- union {
- char e_name[E_SYMNMLEN];
- struct {
- char e_zeroes[4];
- char e_offset[4];
- } e;
- } e;
- char e_value[4];
- char e_scnum[2];
- char e_type[2];
- char e_sclass[1];
- char e_numaux[1];
+struct external_syment {
+ union {
+ char e_name[E_SYMNMLEN];
+ struct {
+ char e_zeroes[4];
+ char e_offset[4];
+ } e;
+ } e;
+ char e_value[4];
+ char e_scnum[2];
+ char e_type[2];
+ char e_sclass[1];
+ char e_numaux[1];
};
@@ -187,7 +184,7 @@ union external_auxent {
} x_file;
struct {
- char x_scnlen[4]; /* section length */
+ char x_scnlen[4]; /* section length */
char x_nreloc[2]; /* # relocation entries */
char x_nlinno[2]; /* # line numbers */
} x_scn;
@@ -207,7 +204,6 @@ union external_auxent {
unsigned char x_stab[4];
unsigned char x_snstab[2];
} x_csect;
-
};
#define SYMENT struct external_syment

arch/powerpc/boot/wrapper

View file
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 1efd120..25321ce 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -262,6 +262,7 @@ pseries)
if [ "$format" != "elf32ppc" ]; then
link_address=
pie=-pie
+ notext='-z notext'
fi
make_space=n
;;

arch/powerpc/include/asm/entry-common.h

View file
diff --git a/arch/powerpc/include/asm/entry-common.h b/arch/powerpc/include/asm/entry-common.h
new file mode 100644
index 0000000..fc636c4
--- /dev/null
+++ b/arch/powerpc/include/asm/entry-common.h
@@ -0,0 +1,534 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef _ASM_PPC_ENTRY_COMMON_H
+#define _ASM_PPC_ENTRY_COMMON_H
+
+#include <asm/cputime.h>
+#include <asm/interrupt.h>
+#include <asm/runlatch.h>
+#include <asm/stacktrace.h>
+#include <asm/switch_to.h>
+#include <asm/tm.h>
+
+#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG
+/*
+ * WARN/BUG is handled with a program interrupt so minimise checks here to
+ * avoid recursion and maximise the chance of getting the first oops handled.
+ */
+#define INT_SOFT_MASK_BUG_ON(regs, cond) \
+do { \
+ if ((user_mode(regs) || (TRAP(regs) != INTERRUPT_PROGRAM))) \
+ BUG_ON(cond); \
+} while (0)
+#else
+#define INT_SOFT_MASK_BUG_ON(regs, cond)
+#endif
+
+#ifdef CONFIG_PPC_BOOK3S_64
+extern char __end_soft_masked[];
+bool search_kernel_soft_mask_table(unsigned long addr);
+unsigned long search_kernel_restart_table(unsigned long addr);
+
+DECLARE_STATIC_KEY_FALSE(interrupt_exit_not_reentrant);
+
+static inline bool is_implicit_soft_masked(struct pt_regs *regs)
+{
+ if (user_mode(regs))
+ return false;
+
+ if (regs->nip >= (unsigned long)__end_soft_masked)
+ return false;
+
+ return search_kernel_soft_mask_table(regs->nip);
+}
+
+static inline void srr_regs_clobbered(void)
+{
+ local_paca->srr_valid = 0;
+ local_paca->hsrr_valid = 0;
+}
+#else
+static inline unsigned long search_kernel_restart_table(unsigned long addr)
+{
+ return 0;
+}
+
+static inline bool is_implicit_soft_masked(struct pt_regs *regs)
+{
+ return false;
+}
+
+static inline void srr_regs_clobbered(void)
+{
+}
+#endif
+
+static inline void nap_adjust_return(struct pt_regs *regs)
+{
+#ifdef CONFIG_PPC_970_NAP
+ if (unlikely(test_thread_local_flags(_TLF_NAPPING))) {
+ /* Can avoid a test-and-clear because NMIs do not call this */
+ clear_thread_local_flags(_TLF_NAPPING);
+ regs_set_return_ip(regs, (unsigned long)power4_idle_nap_return);
+ }
+#endif
+}
+
+static __always_inline void booke_load_dbcr0(void)
+{
+#ifdef CONFIG_PPC_ADV_DEBUG_REGS
+ unsigned long dbcr0 = current->thread.debug.dbcr0;
+
+ if (likely(!(dbcr0 & DBCR0_IDM)))
+ return;
+
+ /*
+ * Check to see if the dbcr0 register is set up to debug.
+ * Use the internal debug mode bit to do this.
+ */
+ mtmsr(mfmsr() & ~MSR_DE);
+ if (IS_ENABLED(CONFIG_PPC32)) {
+ isync();
+ global_dbcr0[smp_processor_id()] = mfspr(SPRN_DBCR0);
+ }
+ mtspr(SPRN_DBCR0, dbcr0);
+ mtspr(SPRN_DBSR, -1);
+#endif
+}
+
+static inline void booke_restore_dbcr0(void)
+{
+#ifdef CONFIG_PPC_ADV_DEBUG_REGS
+ unsigned long dbcr0 = current->thread.debug.dbcr0;
+
+ if (IS_ENABLED(CONFIG_PPC32) && unlikely(dbcr0 & DBCR0_IDM)) {
+ mtspr(SPRN_DBSR, -1);
+ mtspr(SPRN_DBCR0, global_dbcr0[smp_processor_id()]);
+ }
+#endif
+}
+
+static inline void check_return_regs_valid(struct pt_regs *regs)
+{
+#ifdef CONFIG_PPC_BOOK3S_64
+ unsigned long trap, srr0, srr1;
+ static bool warned;
+ u8 *validp;
+ char *h;
+
+ if (trap_is_scv(regs))
+ return;
+
+ trap = TRAP(regs);
+ // EE in HV mode sets HSRRs like 0xea0
+ if (cpu_has_feature(CPU_FTR_HVMODE) && trap == INTERRUPT_EXTERNAL)
+ trap = 0xea0;
+
+ switch (trap) {
+ case 0x980:
+ case INTERRUPT_H_DATA_STORAGE:
+ case 0xe20:
+ case 0xe40:
+ case INTERRUPT_HMI:
+ case 0xe80:
+ case 0xea0:
+ case INTERRUPT_H_FAC_UNAVAIL:
+ case 0x1200:
+ case 0x1500:
+ case 0x1600:
+ case 0x1800:
+ validp = &local_paca->hsrr_valid;
+ if (!READ_ONCE(*validp))
+ return;
+
+ srr0 = mfspr(SPRN_HSRR0);
+ srr1 = mfspr(SPRN_HSRR1);
+ h = "H";
+
+ break;
+ default:
+ validp = &local_paca->srr_valid;
+ if (!READ_ONCE(*validp))
+ return;
+
+ srr0 = mfspr(SPRN_SRR0);
+ srr1 = mfspr(SPRN_SRR1);
+ h = "";
+ break;
+ }
+
+ if (srr0 == regs->nip && srr1 == regs->msr)
+ return;
+
+ /*
+ * A NMI / soft-NMI interrupt may have come in after we found
+ * srr_valid and before the SRRs are loaded. The interrupt then
+ * comes in and clobbers SRRs and clears srr_valid. Then we load
+ * the SRRs here and test them above and find they don't match.
+ *
+ * Test validity again after that, to catch such false positives.
+ *
+ * This test in general will have some window for false negatives
+ * and may not catch and fix all such cases if an NMI comes in
+ * later and clobbers SRRs without clearing srr_valid, but hopefully
+ * such things will get caught most of the time, statistically
+ * enough to be able to get a warning out.
+ */
+ if (!READ_ONCE(*validp))
+ return;
+
+ if (!data_race(warned)) {
+ data_race(warned = true);
+ pr_warn("%sSRR0 was: %lx should be: %lx\n", h, srr0, regs->nip);
+ pr_warn("%sSRR1 was: %lx should be: %lx\n", h, srr1, regs->msr);
+ show_regs(regs);

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/hw_irq.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/interrupt.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/kasan.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/prom.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/ptrace.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/rtas-types.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/signal.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/stacktrace.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/syscall.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/thread_info.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/asm/uaccess.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/include/uapi/asm/ptrace.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/cacheinfo.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/eeh_sysfs.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/fadump.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/interrupt.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/iommu.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/irq.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/prom_init.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/ptrace/ptrace.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/security.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/setup-common.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/signal.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/syscall.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/sysfs.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/traps.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kernel/watchdog.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/kexec/core_64.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/mm/book3s64/hash_utils.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/net/Makefile

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/net/bpf_jit_comp.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/net/bpf_jit_comp64.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/net/bpf_timed_may_goto.S

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/core-book3s.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/core-fsl-emb.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/hv-24x7.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/hv-gpci.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/imc-pmu.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/kvm-hv-pmu.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/perf/vpa-pmu.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/8xx/cpm1.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/cell/spu_base.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/idle.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/opal-dump.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/opal-elog.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/opal-flash.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/opal-powercap.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/opal-psr.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/powernv/subcore.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/ps3/setup.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/cmm.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/dlpar.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/ibmebus.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/lparcfg.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/papr_scm.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/power.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/pseries_energy.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/rtas-fadump.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/rtas-fadump.h

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/suspend.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/vas-sysfs.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/platforms/pseries/vio.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c

View file

This diff is incomplete. Download the complete patch.

arch/powerpc/sysdev/xive/common.c

View file

This diff is incomplete. Download the complete patch.