]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drivers/perf: hisi: Support PMUs with no interrupt
authorYicong Yang <yangyicong@hisilicon.com>
Thu, 19 Jun 2025 12:55:55 +0000 (20:55 +0800)
committerWill Deacon <will@kernel.org>
Mon, 14 Jul 2025 14:42:16 +0000 (15:42 +0100)
We'll have PMUs don't have an interrupt to indicate the counter
overflow, but the Uncore PMU core assume all the PMUs have
interrupt. So handle this case in the core. The existing PMUs
won't be affected.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20250619125557.57372-7-yangyicong@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/hisilicon/hisi_uncore_pmu.c

index ef058b1dd50949d5b9fb8e24aca5a5f14beb3193..a449651f79c9f6c4dcef9334ef064657a10eabd0 100644 (file)
@@ -510,7 +510,9 @@ int hisi_uncore_pmu_online_cpu(unsigned int cpu, struct hlist_node *node)
                        return 0;
 
                hisi_pmu->on_cpu = cpumask_local_spread(0, dev_to_node(hisi_pmu->dev));
-               WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(hisi_pmu->on_cpu)));
+               if (hisi_pmu->irq > 0)
+                       WARN_ON(irq_set_affinity(hisi_pmu->irq,
+                                                cpumask_of(hisi_pmu->on_cpu)));
                return 0;
        }
 
@@ -525,7 +527,8 @@ int hisi_uncore_pmu_online_cpu(unsigned int cpu, struct hlist_node *node)
        hisi_pmu->on_cpu = cpu;
 
        /* Overflow interrupt also should use the same CPU */
-       WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(cpu)));
+       if (hisi_pmu->irq > 0)
+               WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(cpu)));
 
        return 0;
 }
@@ -560,7 +563,9 @@ int hisi_uncore_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)
        perf_pmu_migrate_context(&hisi_pmu->pmu, cpu, target);
        /* Use this CPU for event counting */
        hisi_pmu->on_cpu = target;
-       WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(target)));
+
+       if (hisi_pmu->irq > 0)
+               WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(target)));
 
        return 0;
 }