[PATCH 7/8] perf/arm_pmu: Use ACPI CPU affinity in IRQ handling
From: Leo Yan
Date: Mon Nov 16 2026 - 13:23:14 EST
Read each IRQ resource's CPU mask through platform_get_irq_affinity().
For ACPI SPIs, select the CPU from that resource's singleton mask.
Add pmu_get_irq_affinity() for counting-only PMUs, which have no IRQ
resource to query. Fall back to cpu_possible_mask when firmware provides
no affinity mask.
Select DT handling from the device's OF node. Preserve the DT SPI
interrupt-affinity phandle order and the single-PPI path.
The common platform probe initializes the per-CPU PMU pointers and
supported CPU mask before requesting interrupts. Use that mask in
armpmu_request_irq() and remove the cpu_possible_mask fallback needed
by the former ACPI pre-probe IRQ setup.
Signed-off-by: Leo Yan <leo.yan@xxxxxxx>
---
drivers/perf/arm_pmu.c | 3 +--
drivers/perf/arm_pmu_platform.c | 29 ++++++++++++++++++++---------
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 11506956538925fbc72e1d114d511eb3b76f8687..67d1791ab49fe7714983fe30e4ea351dc2ea9ac5 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -631,8 +631,7 @@ int armpmu_request_irq(struct arm_pmu * __percpu *pcpu_armpmu, int irq, int cpu)
{
int err = 0;
struct arm_pmu **armpmu = per_cpu_ptr(pcpu_armpmu, cpu);
- const struct cpumask *affinity = *armpmu ? &(*armpmu)->supported_cpus :
- cpu_possible_mask; /* ACPI */
+ const struct cpumask *affinity = &(*armpmu)->supported_cpus;
const irq_handler_t handler = armpmu_dispatch_irq;
const struct pmu_irq_ops *irq_ops;
diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c
index 397fdb148dc9b6be083e654e091ecc6a95c4905b..5ca211798b60ae3e0b9459aba2170f9c84d8f9c7 100644
--- a/drivers/perf/arm_pmu_platform.c
+++ b/drivers/perf/arm_pmu_platform.c
@@ -20,6 +20,7 @@
#include <linux/perf/arm_pmu.h>
#include <linux/platform_device.h>
#include <linux/printk.h>
+#include <linux/property.h>
#include <linux/slab.h>
#include <linux/smp.h>
#include <linux/string.h>
@@ -63,11 +64,24 @@ static bool pmu_has_irq_affinity(struct device_node *node)
return of_property_present(node, "interrupt-affinity");
}
-static int pmu_parse_irq_affinity(struct device *dev, int i)
+static const struct cpumask *pmu_get_irq_affinity(struct device *dev)
+{
+ const struct cpumask *affinity;
+
+ affinity = fwnode_irq_get_affinity(dev_fwnode(dev), 0);
+ return affinity ?: cpu_possible_mask;
+}
+
+static int pmu_parse_irq_affinity(struct device *dev, int i,
+ const struct cpumask *affinity)
{
struct device_node *dn;
int cpu;
+ /* ACPI software nodes provide a singleton CPU mask for each SPI */
+ if (!dev->of_node)
+ return cpumask_first(affinity);
+
/*
* If we don't have an interrupt-affinity property, we guess irq
* affinity matches our logical CPU order, as we used to assume.
@@ -104,14 +118,10 @@ static int pmu_parse_irqs(struct arm_pmu *pmu)
if (num_irqs < 0)
return dev_err_probe(dev, num_irqs, "unable to count PMU IRQs\n");
- /*
- * In this case we have no idea which CPUs are covered by the PMU.
- * To match our prior behaviour, we assume all CPUs in this case.
- */
if (num_irqs == 0) {
dev_warn(dev, "no irqs for PMU, sampling events not supported\n");
pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
- cpumask_setall(&pmu->supported_cpus);
+ cpumask_copy(&pmu->supported_cpus, pmu_get_irq_affinity(dev));
return 0;
}
@@ -124,13 +134,14 @@ static int pmu_parse_irqs(struct arm_pmu *pmu)
return pmu_parse_percpu_irq(pmu, irq, affinity);
}
- if (nr_cpu_ids != 1 && !pmu_has_irq_affinity(dev->of_node))
+ if (dev->of_node && nr_cpu_ids != 1 && !pmu_has_irq_affinity(dev->of_node))
dev_warn(dev, "no interrupt-affinity property, guessing.\n");
for (i = 0; i < num_irqs; i++) {
+ const struct cpumask *affinity;
int cpu, irq;
- irq = platform_get_irq(pdev, i);
+ irq = platform_get_irq_affinity(pdev, i, &affinity);
if (WARN_ON(irq <= 0))
continue;
@@ -139,7 +150,7 @@ static int pmu_parse_irqs(struct arm_pmu *pmu)
return -EINVAL;
}
- cpu = pmu_parse_irq_affinity(dev, i);
+ cpu = pmu_parse_irq_affinity(dev, i, affinity);
if (cpu < 0)
return cpu;
if (cpu >= nr_cpu_ids)
--
2.34.1