[PATCH 4/8] perf/arm_pmu: Prepare ACPI registration for per-CPU interrupts

From: Leo Yan

Date: Mon Nov 16 2026 - 13:22:38 EST


CPU PMUs may use a separate SPI for each CPU. Extend the existing IRQ
compatibility check to allow different SPIs in a group while retaining
the same-PPI requirement.

Extend arm_acpi_register_sw_node_irq_affinity() to publish a singleton
CPU mask for each SPI resource, using the CPU recorded in its mapping
entry. Keep the full group mask at index zero for a shared PPI or a
counting-only device with no IRQ resources.

Retain zero-GSI CPU PMU entries for counting-only devices. Trust
firmware to provide GICC interrupt descriptions as specified by ACPI.
SPE and TRBE remain the common registration interface's callers in this
commit.

Signed-off-by: Leo Yan <leo.yan@xxxxxxx>
---
drivers/perf/arm_pmu_acpi.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c
index 7ae291acb04526d820bdfb9640aaa8352449be54..6a7fa8d01f42b1b58e28541a374f005e1955598f 100644
--- a/drivers/perf/arm_pmu_acpi.c
+++ b/drivers/perf/arm_pmu_acpi.c
@@ -16,6 +16,7 @@
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/slab.h>
+#include <linux/string.h>

#include <asm/cpu.h>
#include <asm/cputype.h>
@@ -158,7 +159,8 @@ arm_acpi_alloc_pmu_groups(const struct arm_pmu_acpi_device_info *info,
goto out_free;
}
gsi = info->parse_gsi(gicc);
- if (!gsi)
+ /* CPU PMUs can count without an overflow interrupt */
+ if (!gsi && strcmp(info->name, ARMV8_PMU_PDEV_NAME))
continue;

group = arm_acpi_alloc_pmu_group(groups, &nr_groups, cpu);
@@ -201,7 +203,8 @@ static void arm_acpi_unregister_irq_resource(struct arm_pmu_acpi_group *group)

static bool arm_acpi_pmu_irq_matches(unsigned int irq, unsigned int other_irq)
{
- return irq == other_irq;
+ return irq == other_irq ||
+ (!irq_is_percpu_devid(irq) && !irq_is_percpu_devid(other_irq));
}

static int arm_acpi_map_gsi_irq(u32 gsi, int *irq)
@@ -253,7 +256,7 @@ static int arm_acpi_register_irq_resource(struct platform_device *pdev,
if (ret < 0)
goto out_free;

- /* A group must use the same PPI */
+ /* A group must use the same PPI or only SPIs */
if (group->nr_irqs && !arm_acpi_pmu_irq_matches(irq, res[0].start)) {
pr_warn("ACPI: %s: CPU%d has inconsistent PPI in group, ignoring CPU\n",
pdev->name, map.cpu);
@@ -279,15 +282,28 @@ static int arm_acpi_register_irq_resource(struct platform_device *pdev,
static int arm_acpi_register_sw_node_irq_affinity(struct platform_device *pdev,
struct arm_pmu_acpi_group *group)
{
- int ret;
+ struct fwnode_handle *fwnode;
+ struct resource *res;
+ int i, ret;

/* A MIDR group may span several processor containers */
ret = device_create_managed_software_node(&pdev->dev, NULL, NULL);
if (ret)
return ret;
+ fwnode = dev_fwnode(&pdev->dev);
+
+ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+ if (!res || irq_is_percpu_devid(res->start))
+ return software_node_add_irq_affinity(fwnode, 0, &group->cpus);
+
+ for (i = 0; i < group->nr_irqs; i++) {
+ ret = software_node_add_irq_affinity(fwnode, i,
+ cpumask_of(group->irq_maps[i].cpu));
+ if (ret)
+ return ret;
+ }

- return software_node_add_irq_affinity(dev_fwnode(&pdev->dev), 0,
- &group->cpus);
+ return 0;
}

static int arm_acpi_register_pmu_device(struct arm_pmu_acpi_group *group,

--
2.34.1