Skip to content

Commit 7b667ac

Browse files
committed
Merge tag 'powerpc-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc updates from Madhavan Srinivasan: - Remove support for IBM Cell Blades - SMP support for microwatt platform - Support for inline static calls on PPC32 - Enable pmu selftests for power11 platform - Enable hardware trace macro (HTM) hcall support - Support for limited address mode capability - Changes to RMA size from 512 MB to 768 MB to handle fadump - Misc fixes and cleanups Thanks to Abhishek Dubey, Amit Machhiwal, Andreas Schwab, Arnd Bergmann, Athira Rajeev, Avnish Chouhan, Christophe Leroy, Disha Goel, Donet Tom, Gaurav Batra, Gautam Menghani, Hari Bathini, Kajol Jain, Kees Cook, Mahesh Salgaonkar, Michael Ellerman, Paul Mackerras, Ritesh Harjani (IBM), Sathvika Vasireddy, Segher Boessenkool, Sourabh Jain, Vaibhav Jain, and Venkat Rao Bagalkote. * tag 'powerpc-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (61 commits) powerpc/kexec: fix physical address calculation in clear_utlb_entry() crypto: powerpc: Mark ghashp8-ppc.o as an OBJECT_FILES_NON_STANDARD powerpc: Fix 'intra_function_call not a direct call' warning powerpc/perf: Fix ref-counting on the PMU 'vpa_pmu' KVM: PPC: Enable CAP_SPAPR_TCE_VFIO on pSeries KVM guests powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 powerpc/microwatt: Add SMP support powerpc: Define config option for processors with broadcast TLBIE powerpc/microwatt: Define an idle power-save function powerpc/microwatt: Device-tree updates powerpc/microwatt: Select COMMON_CLK in order to get the clock framework net: toshiba: Remove reference to PPC_IBM_CELL_BLADE net: spider_net: Remove powerpc Cell driver cpufreq: ppc_cbe: Remove powerpc Cell driver genirq: Remove IRQ_EDGE_EOI_HANDLER docs: Remove reference to removed CBE_CPUFREQ_SPU_GOVERNOR powerpc: Remove UDBG_RTAS_CONSOLE powerpc/io: Use standard barrier macros in io.c powerpc/io: Rename _insw_ns() etc. powerpc/io: Use generic raw accessors ...
2 parents a7e135f + 861efb8 commit 7b667ac

File tree

142 files changed

+1044
-12715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+1044
-12715
lines changed

CREDITS

+11
Original file line numberDiff line numberDiff line change
@@ -2187,6 +2187,10 @@ D: Various ACPI fixes, keeping correct battery state through suspend
21872187
D: various lockdep annotations, autofs and other random bugfixes
21882188
S: Prague, Czech Republic
21892189

2190+
N: Ishizaki Kou
2191+
2192+
D: Spidernet driver for PowerPC Cell platforms
2193+
21902194
N: Gene Kozin
21912195
21922196
W: https://www.sangoma.com
@@ -2197,6 +2201,9 @@ S: Markham, Ontario
21972201
S: L3R 8B2
21982202
S: Canada
21992203

2204+
N: Christian Krafft
2205+
D: PowerPC Cell support
2206+
22002207
N: Maxim Krasnyansky
22012208
22022209
W: http://vtun.sf.net
@@ -2389,6 +2396,10 @@ S: ICP vortex GmbH
23892396
S: Neckarsulm
23902397
S: Germany
23912398

2399+
N: Geoff Levand
2400+
2401+
D: Spidernet driver for PowerPC Cell platforms
2402+
23922403
N: Phil Lewis
23932404
23942405
D: Promised to send money if I would put his name in the source tree.

Documentation/ABI/testing/sysfs-kernel-fadump

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,5 @@ Date: May 2024
5555
5656
Description: read/write
5757
This is a special sysfs file available to setup additional
58-
parameters to be passed to capture kernel.
58+
parameters to be passed to capture kernel. For HASH MMU it
59+
is exported only if RMA size higher than 768MB.

Documentation/admin-guide/kernel-per-CPU-kthreads.rst

+1-6
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,7 @@ To reduce its OS jitter, do any of the following:
278278
due to the rtas_event_scan() function.
279279
WARNING: Please check your CPU specifications to
280280
make sure that this is safe on your particular system.
281-
e. If running on Cell Processor, build your kernel with
282-
CBE_CPUFREQ_SPU_GOVERNOR=n to avoid OS jitter from
283-
spu_gov_work().
284-
WARNING: Please check your CPU specifications to
285-
make sure that this is safe on your particular system.
286-
f. If running on PowerMAC, build your kernel with
281+
e. If running on PowerMAC, build your kernel with
287282
CONFIG_PMAC_RACKMETER=n to disable the CPU-meter,
288283
avoiding OS jitter from rackmeter_do_timer().
289284

Documentation/arch/powerpc/firmware-assisted-dump.rst

+22
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,28 @@ to ensure that crash data is preserved to process later.
120120
e.g.
121121
# echo 1 > /sys/firmware/opal/mpipl/release_core
122122

123+
-- Support for Additional Kernel Arguments in Fadump
124+
Fadump has a feature that allows passing additional kernel arguments
125+
to the fadump kernel. This feature was primarily designed to disable
126+
kernel functionalities that are not required for the fadump kernel
127+
and to reduce its memory footprint while collecting the dump.
128+
129+
Command to Add Additional Kernel Parameters to Fadump:
130+
e.g.
131+
# echo "nr_cpus=16" > /sys/kernel/fadump/bootargs_append
132+
133+
The above command is sufficient to add additional arguments to fadump.
134+
An explicit service restart is not required.
135+
136+
Command to Retrieve the Additional Fadump Arguments:
137+
e.g.
138+
# cat /sys/kernel/fadump/bootargs_append
139+
140+
Note: Additional kernel arguments for fadump with HASH MMU is only
141+
supported if the RMA size is greater than 768 MB. If the RMA
142+
size is less than 768 MB, the kernel does not export the
143+
/sys/kernel/fadump/bootargs_append sysfs node.
144+
123145
Implementation details:
124146
-----------------------
125147

Documentation/arch/powerpc/papr_hcalls.rst

+11
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,17 @@ to be issued multiple times in order to be completely serviced. The
289289
subsequent hcalls to the hypervisor until the hcall is completely serviced
290290
at which point H_SUCCESS or other error is returned by the hypervisor.
291291

292+
**H_HTM**
293+
294+
| Input: flags, target, operation (op), op-param1, op-param2, op-param3
295+
| Out: *dumphtmbufferdata*
296+
| Return Value: *H_Success,H_Busy,H_LongBusyOrder,H_Partial,H_Parameter,
297+
H_P2,H_P3,H_P4,H_P5,H_P6,H_State,H_Not_Available,H_Authority*
298+
299+
H_HTM supports setup, configuration, control and dumping of Hardware Trace
300+
Macro (HTM) function and its data. HTM buffer stores tracing data for functions
301+
like core instruction, core LLAT and nest.
302+
292303
References
293304
==========
294305
.. [1] "Power Architecture Platform Reference"

Documentation/networking/device_drivers/ethernet/index.rst

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Contents:
5555
ti/cpsw_switchdev
5656
ti/am65_nuss_cpsw_switchdev
5757
ti/tlan
58-
toshiba/spider_net
5958
wangxun/txgbe
6059
wangxun/ngbe
6160

Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst

-202
This file was deleted.

MAINTAINERS

-9
Original file line numberDiff line numberDiff line change
@@ -22526,15 +22526,6 @@ F: include/linux/spi/
2252622526
F: include/uapi/linux/spi/
2252722527
F: tools/spi/
2252822528

22529-
SPIDERNET NETWORK DRIVER for CELL
22530-
M: Ishizaki Kou <[email protected]>
22531-
M: Geoff Levand <[email protected]>
22532-
22533-
22534-
S: Maintained
22535-
F: Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
22536-
F: drivers/net/ethernet/toshiba/spider_net*
22537-
2253822529
SPMI SUBSYSTEM
2253922530
M: Stephen Boyd <[email protected]>
2254022531

arch/powerpc/Kconfig

+2-9
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ config PPC
288288
select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,$(m32-flag) -mstack-protector-guard=tls -mstack-protector-guard-reg=r2 -mstack-protector-guard-offset=0)
289289
select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,$(m64-flag) -mstack-protector-guard=tls -mstack-protector-guard-reg=r13 -mstack-protector-guard-offset=0)
290290
select HAVE_STATIC_CALL if PPC32
291+
select HAVE_STATIC_CALL_INLINE if PPC32
291292
select HAVE_SYSCALL_TRACEPOINTS
292293
select HAVE_VIRT_CPU_ACCOUNTING
293294
select HAVE_VIRT_CPU_ACCOUNTING_GEN
@@ -413,12 +414,9 @@ config ARCH_HAS_ADD_PAGES
413414
config PPC_DCR_NATIVE
414415
bool
415416

416-
config PPC_DCR_MMIO
417-
bool
418-
419417
config PPC_DCR
420418
bool
421-
depends on PPC_DCR_NATIVE || PPC_DCR_MMIO
419+
depends on PPC_DCR_NATIVE
422420
default y
423421

424422
config PPC_PCI_OF_BUS_MAP
@@ -444,11 +442,6 @@ config PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT
444442
PCI domain dependent and each PCI controller on own domain can have
445443
256 PCI buses, like it is on other Linux architectures.
446444

447-
config PPC_OF_PLATFORM_PCI
448-
bool
449-
depends on PCI
450-
depends on PPC64 # not supported on 32 bits yet
451-
452445
config ARCH_SUPPORTS_UPROBES
453446
def_bool y
454447

arch/powerpc/Kconfig.debug

-7
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,6 @@ config PPC_EARLY_DEBUG_RTAS_PANEL
216216
help
217217
Select this to enable early debugging via the RTAS panel.
218218

219-
config PPC_EARLY_DEBUG_RTAS_CONSOLE
220-
bool "RTAS Console"
221-
depends on PPC_RTAS
222-
select UDBG_RTAS_CONSOLE
223-
help
224-
Select this to enable early debugging via the RTAS console.
225-
226219
config PPC_EARLY_DEBUG_PAS_REALMODE
227220
bool "PA Semi real mode"
228221
depends on PPC_PASEMI

arch/powerpc/boot/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c
173173
src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
174174
src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
175175
src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
176-
src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
177176
src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
178177

179178
src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
@@ -276,7 +275,6 @@ quiet_cmd_wrap = WRAP $@
276275

277276
image-$(CONFIG_PPC_PSERIES) += zImage.pseries
278277
image-$(CONFIG_PPC_POWERNV) += zImage.pseries
279-
image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries
280278
image-$(CONFIG_PPC_PS3) += dtbImage.ps3
281279
image-$(CONFIG_PPC_CHRP) += zImage.chrp
282280
image-$(CONFIG_PPC_EFIKA) += zImage.chrp

0 commit comments

Comments
 (0)