From nobody Thu Apr 9 09:49:20 2026 Received: from canpmsgout05.his.huawei.com (canpmsgout05.his.huawei.com [113.46.200.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0ECF399007; Tue, 10 Mar 2026 03:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.220 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112863; cv=none; b=F+37/i1RrW2rugoO2M3lBHVh9jNEF1kFuJfPI7i8TAzefRJ3ln9dQdyTXHrYTl80wBlvIsB2x2jG3pUkPKAoAqxNKFGEz/AIxOOUkX9L5OWxloJi8Zs4wdbv+zDO1L2kWpz0+b4ryoJiabnABOlit716DQEDXBdisReg2x/VCb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112863; c=relaxed/simple; bh=qc4RJXO3yacqiDJfF1+tyIfAi+YHvoeMGIIaKNByv3s=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cWgpleF7z8zEX68QHpAO1kHcKkfVeERX2SjQPqNMAUjqRjC3hTnFi7kxfGFBm0yhv4NhHkPkAIpb22AB6VN8T+lp5qHpQnWuP0KMbw6Ekx/js1smXKuNn14p2OxUdbda3uYNLk8jSie1zl62iDa0uhNg89gQRaQjOvLgy4vcExY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=Wcm0KY75; arc=none smtp.client-ip=113.46.200.220 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="Wcm0KY75" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=A0FMIWNr2Dx+OlfZSA1sGW6DfHKLq8qTyrKRNs7QJ7U=; b=Wcm0KY75ufjFNPJyc4zSdiHPUv18HrWLJez1cr9p/yPEHO6W6HDMoMpkYk8j28awyuVeBv3xd Jy3fYOyOLPQ1eo5HCwj2w3Z/yn9Vx8hUTFCorNL3HFqAMJeEV7VRD5qvGecAhYJA/D9L4lA0g07 Dk0fwR1m0uotQ11p7R5z7Yo= Received: from mail.maildlp.com (unknown [172.19.162.140]) by canpmsgout05.his.huawei.com (SkyGuard) with ESMTPS id 4fVJsl23JTz12LCw; Tue, 10 Mar 2026 11:15:23 +0800 (CST) Received: from kwepemk500009.china.huawei.com (unknown [7.202.194.94]) by mail.maildlp.com (Postfix) with ESMTPS id 6E06320104; Tue, 10 Mar 2026 11:20:59 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by kwepemk500009.china.huawei.com (7.202.194.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 10 Mar 2026 11:20:57 +0800 From: Chengwen Feng To: Bjorn Helgaas , Catalin Marinas , Will Deacon , "Rafael J . Wysocki" CC: Jonathan Corbet , Shuah Khan , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H . Peter Anvin" , Juergen Gross , Boris Ostrovsky , Len Brown , Sunil V L , Mark Rutland , Chengwen Feng , Jonathan Cameron , Kees Cook , Yanteng Si , Sean Christopherson , Kai Huang , Tom Lendacky , Thomas Huth , Thorsten Blum , Kevin Loughlin , Zheyun Shen , Peter Zijlstra , Pawan Gupta , Xin Li , "Ahmed S . Darwish" , Sohil Mehta , Ilkka Koskinen , Robin Murphy , James Clark , Besar Wicaksono , Ma Ke , Ajit Khaparde , Wei Huang , Andy Gospodarek , Somnath Kotur , , , , , , , , , , , , , Subject: [PATCH v5 1/2] ACPI: Rename get_acpi_id_for_cpu() to acpi_get_cpu_acpi_id() on non-x86 Date: Tue, 10 Mar 2026 11:20:48 +0800 Message-ID: <20260310032049.25387-2-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20260310032049.25387-1-fengchengwen@huawei.com> References: <20260310032049.25387-1-fengchengwen@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To kwepemk500009.china.huawei.com (7.202.194.94) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. 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@vger.kernel.org Signed-off-by: Chengwen Feng Reviewed-by: Jonathan Cameron --- 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) } =20 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) =20 for (cpu =3D 0; cpu < nr_cpu_ids; cpu++) if (acpi_cpu_get_madt_gicc(cpu) && - uid =3D=3D get_acpi_id_for_cpu(cpu)) + uid =3D=3D acpi_get_cpu_acpi_id(cpu)) return cpu; =20 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_P= IC]; =20 extern int __init parse_acpi_topology(void); =20 -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) { } =20 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; =20 for (cpu =3D 0; cpu < nr_cpu_ids; cpu++) - if (uid =3D=3D get_acpi_id_for_cpu(cpu)) + if (uid =3D=3D acpi_get_cpu_acpi_id(cpu)) return cpu; =20 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_head= er *table, { struct acpi_pptt_cache *found_cache; struct cpu_cacheinfo *this_cpu_ci =3D get_cpu_cacheinfo(cpu); - u32 acpi_cpu_id =3D get_acpi_id_for_cpu(cpu); + u32 acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); struct cacheinfo *this_leaf; unsigned int index =3D 0; struct acpi_pptt_processor *cpu_node =3D 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 =3D get_acpi_id_for_cpu(cpu); + u32 acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); =20 cpu_node =3D 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 =3D get_acpi_id_for_cpu(cpu); + u32 acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); struct acpi_pptt_processor *cpu_node =3D NULL; int ret =3D -ENOENT; =20 @@ -671,7 +671,7 @@ int acpi_get_cache_info(unsigned int cpu, unsigned int = *levels, =20 pr_debug("Cache Setup: find cache levels for CPU=3D%d\n", cpu); =20 - acpi_cpu_id =3D get_acpi_id_for_cpu(cpu); + acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); cpu_node =3D 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; =20 - acpi_cpu_id =3D get_acpi_id_for_cpu(cpu); + acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); cpu_node =3D 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); =20 for_each_possible_cpu(cpu) { - acpi_id =3D get_acpi_id_for_cpu(cpu); + acpi_id =3D acpi_get_cpu_acpi_id(cpu); cpu_node =3D acpi_find_processor_node(table_hdr, acpi_id); =20 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 =3D 1; - u32 acpi_cpu_id =3D get_acpi_id_for_cpu(cpu); + u32 acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); struct acpi_pptt_cache *cache; struct acpi_pptt_processor *cpu_node; =20 @@ -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 =3D 1; - u32 acpi_cpu_id =3D get_acpi_id_for_cpu(cpu); + u32 acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); struct acpi_pptt_cache *cache; struct acpi_pptt_processor *cpu_node; =20 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, u= nsigned int cpu, const struct acpi_rhct_isa_string *isa_node; struct acpi_table_rhct *rhct; u32 *hart_info_node_offset; - u32 acpi_cpu_id =3D get_acpi_id_for_cpu(cpu); + u32 acpi_cpu_id =3D acpi_get_cpu_acpi_id(cpu); =20 BUG_ON(acpi_disabled); =20 diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/ar= m_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 =3D=3D ACPI_APMT_FLAGS_AFFINITY_PROC) { for_each_possible_cpu(cpu) { if (apmt_node->proc_affinity =3D=3D - get_acpi_id_for_cpu(cpu)) { + acpi_get_cpu_acpi_id(cpu)) { cpumask_set_cpu(cpu, &cspmu->associated_cpus); break; } --=20 2.17.1