]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
perf: arm_cspmu: Switch to acpi_get_cpu_uid() from get_acpi_id_for_cpu()
authorChengwen Feng <fengchengwen@huawei.com>
Wed, 1 Apr 2026 08:16:38 +0000 (16:16 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Apr 2026 14:55:16 +0000 (16:55 +0200)
Update arm_cspmu to use acpi_get_cpu_uid() instead of
get_acpi_id_for_cpu(), aligning with unified ACPI CPU UID interface.

No functional changes are introduced by this switch (valid inputs retain
original behavior).

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/20260401081640.26875-7-fengchengwen@huawei.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/perf/arm_cspmu/arm_cspmu.c

index 34430b68f60254e9666f230ba42f1f875b20b1b8..ed72c3d1f79678c9893b3cb7e37238e4bb766039 100644 (file)
@@ -1107,15 +1107,17 @@ static int arm_cspmu_acpi_get_cpus(struct arm_cspmu *cspmu)
 {
        struct acpi_apmt_node *apmt_node;
        int affinity_flag;
+       u32 cpu_uid;
        int cpu;
+       int ret;
 
        apmt_node = arm_cspmu_apmt_node(cspmu->dev);
        affinity_flag = apmt_node->flags & ACPI_APMT_FLAGS_AFFINITY;
 
        if (affinity_flag == ACPI_APMT_FLAGS_AFFINITY_PROC) {
                for_each_possible_cpu(cpu) {
-                       if (apmt_node->proc_affinity ==
-                           get_acpi_id_for_cpu(cpu)) {
+                       ret = acpi_get_cpu_uid(cpu, &cpu_uid);
+                       if (ret == 0 && apmt_node->proc_affinity == cpu_uid) {
                                cpumask_set_cpu(cpu, &cspmu->associated_cpus);
                                break;
                        }