Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc fixes for 6.13 #2

Browse Source 
- Fix htmldocs errors in sysfs-bus-event_source-devices-vpa-pmu
 
  - Fix warning due to missing #size-cells on powermac
 
 Thanks to: Michael Ellerman, Yang Li, Rob Herring, Stephen Rothwell.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEqX2DNAOgU8sBX3pRpnEsdPSHZJQFAmdJSR4ACgkQpnEsdPSH
 ZJSAOA//UoktHtZvHybh6o3FOvQVlT/REJxemcbdhZ7olF9pQJsz4sUaGYVRDzsr
 g2SwANZUkURCZWZJqyV/ZJe5uTRYPIARt/LuDtcQxppPntU+tYfTLjU1tttN0Zwj
 Kg28g9yT+hKojkO5M9M9WlEDRY7zNSxc4hEBOnEhTIqoFNFeKg+sOAqRRxI0kO7u
 ejVuyzWogk1yDZHD2Nih3RJC05OcvhhpCA1BF8DA1BbCicFTk1AyA50MhFn5grhZ
 0z503E95TX87tjFAo8lacXD1gE5528gvjNxQFqXLhgwdHsZ3LWnKJ9DxKKWmso38
 EdLf8OutjJVbcxa6y53CrJYHXdko3Q0GTcQJuZLl+79hegNw1PNoPMcTrzVPPKEi
 xpU2lRpNqPqL1XVzaqBo+qRTolQb9lSLSHSoxElH5Tm8HU6OgIS+/rpIfO02ix1u
 KuWmdSzKhKduWZ4imKzsffjZ/7JmYZL4ZQVUS5hann53N2d6midof4OaCPh7Mb4D
 C5RIA+eEyX+SSOHyJU75ykegKh5h8cWV9uT228jPst2irvRRIU1Oz2NBs4AniXuq
 7+vWxEZtIJdM6fiSdFnEVjOGubHNk69CFZsHzEmjMhNcNWsRdKMnsymYJfR5ZgkC
 h9GqbxXo2DpVmI5jWAX68BYWw1K3VhBVbKGC4CFkKaVrG24j1ZQ=
 =/iVL
 -----END PGP SIGNATURE-----

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

Pull powerpc fixes from Madhavan Srinivasan:

 - Fix htmldocs errors in sysfs-bus-event_source-devices-vpa-pmu

 - Fix warning due to missing #size-cells on powermac

Thanks to Michael Ellerman, Yang Li, Rob Herring, and Stephen Rothwell.

* tag 'powerpc-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/prom_init: Fixup missing powermac #size-cells
  docs: ABI: sysfs-bus-event_source-devices-vpa-pmu: Fix htmldocs errors
  powerpc/machdep: Remove duplicated include in svm.c
This commit is contained in:
Linus Torvalds 2024-11-29 10:25:44 -08:00
commit f15167014a
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu
View File

@ -8,17 +8,18 @@ Description: Read-only. Attribute group to describe the magic bits
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::
event = "config:0-31" - event ID
l1_to_l2_lat = "event=0x1"
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
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).
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).

29
arch/powerpc/kernel/prom_init.c
View File

@ -2848,7 +2848,7 @@ static void __init fixup_device_tree_chrp(void)
#endif
#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)
static void __init fixup_device_tree_pmac(void)
static void __init fixup_device_tree_pmac64(void)
{
phandle u3, i2c, mpic;
u32 u3_rev;
@ -2888,7 +2888,31 @@ static void __init fixup_device_tree_pmac(void)
&parent, sizeof(parent));
}
#else
#define fixup_device_tree_pmac()
#define fixup_device_tree_pmac64()
#endif
#ifdef CONFIG_PPC_PMAC
static void __init fixup_device_tree_pmac(void)
{
__be32 val = 1;
char type[8];
phandle node;
// Some pmacs are missing #size-cells on escc nodes
for (node = 0; prom_next_node(&node); ) {
type[0] = '\0';
prom_getprop(node, "device_type", type, sizeof(type));
if (prom_strcmp(type, "escc"))
continue;
if (prom_getproplen(node, "#size-cells") != PROM_ERROR)
continue;
prom_setprop(node, NULL, "#size-cells", &val, sizeof(val));
}
}
#else
static inline void fixup_device_tree_pmac(void) { }
#endif
#ifdef CONFIG_PPC_EFIKA
@ -3111,6 +3135,7 @@ static void __init fixup_device_tree(void)
{
fixup_device_tree_chrp();
fixup_device_tree_pmac();
fixup_device_tree_pmac64();
fixup_device_tree_efika();
fixup_device_tree_pasemi();
}

1
arch/powerpc/platforms/pseries/svm.c
View File

@ -10,7 +10,6 @@
#include <linux/memblock.h>
#include <linux/mem_encrypt.h>
#include <linux/cc_platform.h>
#include <linux/mem_encrypt.h>
#include <asm/machdep.h>
#include <asm/svm.h>
#include <asm/swiotlb.h>