Commit 42d9e8b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Michael Ellerman:

 - Rework kfence support for the HPT MMU to work on systems with >= 16TB
   of RAM.

 - Remove the powerpc "maple" platform, used by the "Yellow Dog
   Powerstation".

 - Add support for DYNAMIC_FTRACE_WITH_CALL_OPS,
   DYNAMIC_FTRACE_WITH_DIRECT_CALLS & BPF Trampolines.

 - Add support for running KVM nested guests on Power11.

 - Other small features, cleanups and fixes.

Thanks to Amit Machhiwal, Arnd Bergmann, Christophe Leroy, Costa
Shulyupin, David Hunter, David Wang, Disha Goel, Gautam Menghani, Geert
Uytterhoeven, Hari Bathini, Julia Lawall, Kajol Jain, Keith Packard,
Lukas Bulwahn, Madhavan Srinivasan, Markus Elfring, Michal Suchanek,
Ming Lei, Mukesh Kumar Chaurasiya, Nathan Chancellor, Naveen N Rao,
Nicholas Piggin, Nysal Jan K.A, Paulo Miguel Almeida, Pavithra Prakash,
Ritesh Harjani (IBM), Rob Herring (Arm), Sachin P Bappalige, Shen
Lichuan, Simon Horman, Sourabh Jain, Thomas Weißschuh, Thorsten Blum,
Thorsten Leemhuis, Venkat Rao Bagalkote, Zhang Zekun, and zhang jiao.

* tag 'powerpc-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (89 commits)
  EDAC/powerpc: Remove PPC_MAPLE drivers
  powerpc/perf: Add per-task/process monitoring to vpa_pmu driver
  powerpc/kvm: Add vpa latency counters to kvm_vcpu_arch
  docs: ABI: sysfs-bus-event_source-devices-vpa-pmu: Document sysfs event format entries for vpa_pmu
  powerpc/perf: Add perf interface to expose vpa counters
  MAINTAINERS: powerpc: Mark Maddy as "M"
  powerpc/Makefile: Allow overriding CPP
  powerpc-km82xx.c: replace of_node_put() with __free
  ps3: Correct some typos in comments
  powerpc/kexec: Fix return of uninitialized variable
  macintosh: Use common error handling code in via_pmu_led_init()
  powerpc/powermac: Use of_property_match_string() in pmac_has_backlight_type()
  powerpc: remove dead config options for MPC85xx platform support
  powerpc/xive: Use cpumask_intersects()
  selftests/powerpc: Remove the path after initialization.
  powerpc/xmon: symbol lookup length fixed
  powerpc/ep8248e: Use %pa to format resource_size_t
  powerpc/ps3: Reorganize kerneldoc parameter names
  KVM: PPC: Book3S HV: Fix kmv -> kvm typo
  powerpc/sstep: make emulate_vsx_load and emulate_vsx_store static
  ...
parents 5c00ff74 3c592ce7

Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu

0 → 100644
+24 −0
Original line number Diff line number Diff line 
What:           /sys/bus/event_source/devices/vpa_pmu/format

Date:           November 2024

Contact:        Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:    Read-only. Attribute group to describe the magic bits

                that go into perf_event_attr.config for a particular pmu.

                (See ABI/testing/sysfs-bus-event_source-devices-format).



                Each attribute under this group defines a bit range of the

                perf_event_attr.config. Supported attribute are listed

                below::

			event = "config:0-31" - event ID



		For example::



		  l1_to_l2_lat = "event=0x1"



What:           /sys/bus/event_source/devices/vpa_pmu/events

Date:           November 2024

Contact:        Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:	Read-only. Attribute group to describe performance monitoring

                events for the Virtual Processor Area events. Each attribute

		in this group describes a single performance monitoring event

		supported by vpa_pmu. The name of the file is the name of

		the event (See ABI/testing/sysfs-bus-event_source-devices-events).

Documentation/arch/powerpc/booting.rst

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ given platform based on the content of the device-tree. Thus, you 
should:



        a) add your platform support as a _boolean_ option in

        arch/powerpc/Kconfig, following the example of PPC_PSERIES,

        PPC_PMAC and PPC_MAPLE. The latter is probably a good

        arch/powerpc/Kconfig, following the example of PPC_PSERIES

        and PPC_PMAC. The latter is probably a good

        example of a board support to start from.



        b) create your main platform file as

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13140,7 +13140,7 @@ M: Michael Ellerman <mpe@ellerman.id.au> 
R:	Nicholas Piggin <npiggin@gmail.com>

R:	Christophe Leroy <christophe.leroy@csgroup.eu>

R:	Naveen N Rao <naveen@kernel.org>

R:	Madhavan Srinivasan <maddy@linux.ibm.com>

M:	Madhavan Srinivasan <maddy@linux.ibm.com>

L:	linuxppc-dev@lists.ozlabs.org

S:	Supported

W:	https://github.com/linuxppc/wiki/wiki

arch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -1691,4 +1691,10 @@ config CC_HAS_SANE_FUNCTION_ALIGNMENT 
config ARCH_NEED_CMPXCHG_1_EMU

	bool



config ARCH_WANTS_PRE_LINK_VMLINUX

	bool

	help

	  An architecture can select this if it provides arch/<arch>/tools/Makefile

	  with .arch.vmlinux.o target to be linked into vmlinux.



endmenu

arch/powerpc/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ obj-$(CONFIG_KEXEC_CORE) += kexec/ 
obj-$(CONFIG_KEXEC_FILE)  += purgatory/



# for cleaning

subdir- += boot
 
subdir- += boot tools