Re: [PATCH v4 1/2] ACPI: Rename get_acpi_id_for_cpu() to acpi_get_cpu_acpi_id() on non-x86

[fengchengwen]

Hi Huacai,

On 3/9/2026 9:29 PM, Huacai Chen wrote:
> Hi, Chengwen,
> 
> On Mon, Mar 9, 2026 at 12:17 PM Chengwen Feng <fengchengwen@xxxxxxxxxx> wrote:
>>
>> To unify the CPU ACPI ID retrieval interface across architectures,
>> rename the existing get_acpi_id_for_cpu() function to
>> acpi_get_cpu_acpi_id() on arm64/riscv/loongarch platforms.
> Can we also rename cpu_acpi_id() to acpi_get_cpu_acpi_id() for x86?

Remove cpu_acpi_id() would make it look more concise, this was done in v5, thanks.

> 
> Huacai
> 
>>
>> This is a pure rename with no functional change, preparing for a
>> consistent ACPI Processor UID retrieval interface across all ACPI-enabled
>> platforms.
>>
>> Cc: stable@xxxxxxxxxxxxxxx
>> Signed-off-by: Chengwen Feng <fengchengwen@xxxxxxxxxx>
>> ---
>>  arch/arm64/include/asm/acpi.h      |  4 ++--
>>  arch/loongarch/include/asm/acpi.h  |  2 +-
>>  arch/riscv/include/asm/acpi.h      |  2 +-
>>  arch/riscv/kernel/acpi_numa.c      |  2 +-
>>  drivers/acpi/pptt.c                | 16 ++++++++--------
>>  drivers/acpi/riscv/rhct.c          |  2 +-
>>  drivers/perf/arm_cspmu/arm_cspmu.c |  2 +-
>>  7 files changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
>> index c07a58b96329..202107aeb05b 100644
>> --- a/arch/arm64/include/asm/acpi.h
>> +++ b/arch/arm64/include/asm/acpi.h
>> @@ -114,7 +114,7 @@ static inline bool acpi_has_cpu_in_madt(void)
>>  }
>>
>>  struct acpi_madt_generic_interrupt *acpi_cpu_get_madt_gicc(int cpu);
>> -static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
>> +static inline u32 acpi_get_cpu_acpi_id(unsigned int cpu)
>>  {
>>         return  acpi_cpu_get_madt_gicc(cpu)->uid;
>>  }
>> @@ -125,7 +125,7 @@ static inline int get_cpu_for_acpi_id(u32 uid)
>>
>>         for (cpu = 0; cpu < nr_cpu_ids; cpu++)
>>                 if (acpi_cpu_get_madt_gicc(cpu) &&
>> -                   uid == get_acpi_id_for_cpu(cpu))
>> +                   uid == acpi_get_cpu_acpi_id(cpu))
>>                         return cpu;
>>
>>         return -EINVAL;
>> diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm/acpi.h
>> index 7376840fa9f7..89c6c8f52cc3 100644
>> --- a/arch/loongarch/include/asm/acpi.h
>> +++ b/arch/loongarch/include/asm/acpi.h
>> @@ -40,7 +40,7 @@ extern struct acpi_madt_core_pic acpi_core_pic[MAX_CORE_PIC];
>>
>>  extern int __init parse_acpi_topology(void);
>>
>> -static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
>> +static inline u32 acpi_get_cpu_acpi_id(unsigned int cpu)
>>  {
>>         return acpi_core_pic[cpu_logical_map(cpu)].processor_id;
>>  }
>> diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h
>> index 6e13695120bc..1d23681b61b5 100644
>> --- a/arch/riscv/include/asm/acpi.h
>> +++ b/arch/riscv/include/asm/acpi.h
>> @@ -61,7 +61,7 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
>>
>>  void acpi_init_rintc_map(void);
>>  struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
>> -static inline u32 get_acpi_id_for_cpu(int cpu)
>> +static inline u32 acpi_get_cpu_acpi_id(int cpu)
>>  {
>>         return acpi_cpu_get_madt_rintc(cpu)->uid;
>>  }
>> diff --git a/arch/riscv/kernel/acpi_numa.c b/arch/riscv/kernel/acpi_numa.c
>> index 130769e3a99c..c2eb4824d0f7 100644
>> --- a/arch/riscv/kernel/acpi_numa.c
>> +++ b/arch/riscv/kernel/acpi_numa.c
>> @@ -40,7 +40,7 @@ static inline int get_cpu_for_acpi_id(u32 uid)
>>         int cpu;
>>
>>         for (cpu = 0; cpu < nr_cpu_ids; cpu++)
>> -               if (uid == get_acpi_id_for_cpu(cpu))
>> +               if (uid == acpi_get_cpu_acpi_id(cpu))
>>                         return cpu;
>>
>>         return -EINVAL;
>> diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c
>> index de5f8c018333..c1a8fba4c2b2 100644
>> --- a/drivers/acpi/pptt.c
>> +++ b/drivers/acpi/pptt.c
>> @@ -459,7 +459,7 @@ static void cache_setup_acpi_cpu(struct acpi_table_header *table,
>>  {
>>         struct acpi_pptt_cache *found_cache;
>>         struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
>> -       u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +       u32 acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>         struct cacheinfo *this_leaf;
>>         unsigned int index = 0;
>>         struct acpi_pptt_processor *cpu_node = NULL;
>> @@ -546,7 +546,7 @@ static int topology_get_acpi_cpu_tag(struct acpi_table_header *table,
>>                                      unsigned int cpu, int level, int flag)
>>  {
>>         struct acpi_pptt_processor *cpu_node;
>> -       u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +       u32 acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>
>>         cpu_node = acpi_find_processor_node(table, acpi_cpu_id);
>>         if (cpu_node) {
>> @@ -622,7 +622,7 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag)
>>  static int check_acpi_cpu_flag(unsigned int cpu, int rev, u32 flag)
>>  {
>>         struct acpi_table_header *table;
>> -       u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +       u32 acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>         struct acpi_pptt_processor *cpu_node = NULL;
>>         int ret = -ENOENT;
>>
>> @@ -671,7 +671,7 @@ int acpi_get_cache_info(unsigned int cpu, unsigned int *levels,
>>
>>         pr_debug("Cache Setup: find cache levels for CPU=%d\n", cpu);
>>
>> -       acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +       acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>         cpu_node = acpi_find_processor_node(table, acpi_cpu_id);
>>         if (!cpu_node)
>>                 return -ENOENT;
>> @@ -797,7 +797,7 @@ int find_acpi_cpu_topology_cluster(unsigned int cpu)
>>         if (!table)
>>                 return -ENOENT;
>>
>> -       acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +       acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>         cpu_node = acpi_find_processor_node(table, acpi_cpu_id);
>>         if (!cpu_node || !cpu_node->parent)
>>                 return -ENOENT;
>> @@ -872,7 +872,7 @@ static void acpi_pptt_get_child_cpus(struct acpi_table_header *table_hdr,
>>         cpumask_clear(cpus);
>>
>>         for_each_possible_cpu(cpu) {
>> -               acpi_id = get_acpi_id_for_cpu(cpu);
>> +               acpi_id = acpi_get_cpu_acpi_id(cpu);
>>                 cpu_node = acpi_find_processor_node(table_hdr, acpi_id);
>>
>>                 while (cpu_node) {
>> @@ -966,7 +966,7 @@ int find_acpi_cache_level_from_id(u32 cache_id)
>>         for_each_possible_cpu(cpu) {
>>                 bool empty;
>>                 int level = 1;
>> -               u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +               u32 acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>                 struct acpi_pptt_cache *cache;
>>                 struct acpi_pptt_processor *cpu_node;
>>
>> @@ -1030,7 +1030,7 @@ int acpi_pptt_get_cpumask_from_cache_id(u32 cache_id, cpumask_t *cpus)
>>         for_each_possible_cpu(cpu) {
>>                 bool empty;
>>                 int level = 1;
>> -               u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +               u32 acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>                 struct acpi_pptt_cache *cache;
>>                 struct acpi_pptt_processor *cpu_node;
>>
>> diff --git a/drivers/acpi/riscv/rhct.c b/drivers/acpi/riscv/rhct.c
>> index caa2c16e1697..c15ce8c13136 100644
>> --- a/drivers/acpi/riscv/rhct.c
>> +++ b/drivers/acpi/riscv/rhct.c
>> @@ -44,7 +44,7 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const
>>         struct acpi_rhct_isa_string *isa_node;
>>         struct acpi_table_rhct *rhct;
>>         u32 *hart_info_node_offset;
>> -       u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu);
>> +       u32 acpi_cpu_id = acpi_get_cpu_acpi_id(cpu);
>>
>>         BUG_ON(acpi_disabled);
>>
>> diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
>> index 34430b68f602..506b661c60fd 100644
>> --- a/drivers/perf/arm_cspmu/arm_cspmu.c
>> +++ b/drivers/perf/arm_cspmu/arm_cspmu.c
>> @@ -1115,7 +1115,7 @@ static int arm_cspmu_acpi_get_cpus(struct arm_cspmu *cspmu)
>>         if (affinity_flag == ACPI_APMT_FLAGS_AFFINITY_PROC) {
>>                 for_each_possible_cpu(cpu) {
>>                         if (apmt_node->proc_affinity ==
>> -                           get_acpi_id_for_cpu(cpu)) {
>> +                           acpi_get_cpu_acpi_id(cpu)) {
>>                                 cpumask_set_cpu(cpu, &cspmu->associated_cpus);
>>                                 break;
>>                         }
>> --
>> 2.17.1
>>
>