From: Chengwen Feng <fengchengwen@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Huacai Chen <chenhuacai@kernel.org>,
WANG Xuerui <kernel@xen0n.name>, Paul Walmsley <pjw@kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Alexandre Ghiti <alex@ghiti.fr>,
Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>, <x86@kernel.org>,
"H . Peter Anvin" <hpa@zytor.com>,
Juergen Gross <jgross@suse.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Len Brown <lenb@kernel.org>, Sunil V L <sunilvl@ventanamicro.com>,
Mark Rutland <mark.rutland@arm.com>,
Jonathan Cameron <jonathan.cameron@huawei.com>,
Kees Cook <kees@kernel.org>, Yanteng Si <si.yanteng@linux.dev>,
Sean Christopherson <seanjc@google.com>,
Kai Huang <kai.huang@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Thomas Huth <thuth@redhat.com>,
Thorsten Blum <thorsten.blum@linux.dev>,
Kevin Loughlin <kevinloughlin@google.com>,
Zheyun Shen <szy0127@sjtu.edu.cn>,
Peter Zijlstra <peterz@infradead.org>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Xin Li <xin@zytor.com>, "Ahmed S . Darwish" <darwi@linutronix.de>,
Sohil Mehta <sohil.mehta@intel.com>,
Ilkka Koskinen <ilkka@os.amperecomputing.com>,
Robin Murphy <robin.murphy@arm.com>,
James Clark <james.clark@linaro.org>,
Besar Wicaksono <bwicaksono@nvidia.com>,
Ma Ke <make24@iscas.ac.cn>, Wei Huang <wei.huang2@amd.com>,
Andy Gospodarek <andrew.gospodarek@broadcom.com>,
Somnath Kotur <somnath.kotur@broadcom.com>,
<punit.agrawal@oss.qualcomm.com>, <guohanjun@huawei.com>,
<suzuki.poulose@arm.com>, <ryan.roberts@arm.com>,
<chenl311@chinatelecom.cn>, <masahiroy@kernel.org>,
<wangyuquan1236@phytium.com.cn>, <anshuman.khandual@arm.com>,
<heinrich.schuchardt@canonical.com>, <Eric.VanTassell@amd.com>,
<wangzhou1@hisilicon.com>, <wanghuiqiang@huawei.com>,
<liuyonglong@huawei.com>, <fengchengwen@huawei.com>,
<linux-pci@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<loongarch@lists.linux.dev>, <linux-riscv@lists.infradead.org>,
<xen-devel@lists.xenproject.org>, <linux-acpi@vger.kernel.org>,
<linux-perf-users@vger.kernel.org>, <stable@vger.kernel.org>
Subject: [PATCH v9 1/7] arm64/acpi: Add acpi_get_cpu_uid() and switch arm_cspmu to use it
Date: Thu, 19 Mar 2026 14:57:29 +0800 [thread overview]
Message-ID: <20260319065735.45954-2-fengchengwen@huawei.com> (raw)
In-Reply-To: <20260319065735.45954-1-fengchengwen@huawei.com>
Add arch-specific acpi_get_cpu_uid() for arm64, and update dependent
code:
- Declare acpi_get_cpu_uid() in arch/arm64/include/asm/acpi.h
- Implement acpi_get_cpu_uid() with input parameter validation
- Replace get_acpi_id_for_cpu() with acpi_get_cpu_uid() in
drivers/perf/arm_cspmu/arm_cspmu.c
- Reimplement get_cpu_for_acpi_id() based on acpi_get_cpu_uid() (to
align with new interface) and move its implementation next to
acpi_get_cpu_uid()
This is the first step towards unifying ACPI CPU UID retrieval interface
across architectures, while adding input validation for robustness.
Cc: stable@vger.kernel.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
---
arch/arm64/include/asm/acpi.h | 14 ++------------
arch/arm64/kernel/acpi.c | 30 ++++++++++++++++++++++++++++++
drivers/perf/arm_cspmu/arm_cspmu.c | 6 ++++--
3 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index c07a58b96329..2219a3301e72 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -118,18 +118,8 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
{
return acpi_cpu_get_madt_gicc(cpu)->uid;
}
-
-static inline int get_cpu_for_acpi_id(u32 uid)
-{
- int cpu;
-
- for (cpu = 0; cpu < nr_cpu_ids; cpu++)
- if (acpi_cpu_get_madt_gicc(cpu) &&
- uid == get_acpi_id_for_cpu(cpu))
- return cpu;
-
- return -EINVAL;
-}
+int acpi_get_cpu_uid(unsigned int cpu, u32 *uid);
+int get_cpu_for_acpi_id(u32 uid);
static inline void arch_fix_phys_package_id(int num, u32 slot) { }
void __init acpi_init_cpus(void);
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index af90128cfed5..24b9d934be54 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -458,3 +458,33 @@ int acpi_unmap_cpu(int cpu)
}
EXPORT_SYMBOL(acpi_unmap_cpu);
#endif /* CONFIG_ACPI_HOTPLUG_CPU */
+
+int acpi_get_cpu_uid(unsigned int cpu, u32 *uid)
+{
+ struct acpi_madt_generic_interrupt *gicc;
+
+ if (cpu >= nr_cpu_ids)
+ return -EINVAL;
+
+ gicc = acpi_cpu_get_madt_gicc(cpu);
+ if (!gicc)
+ return -ENODEV;
+
+ *uid = gicc->uid;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_get_cpu_uid);
+
+int get_cpu_for_acpi_id(u32 uid)
+{
+ u32 cpu_uid;
+ int ret;
+
+ for (int cpu = 0; cpu < nr_cpu_ids; cpu++) {
+ ret = acpi_get_cpu_uid(cpu, &cpu_uid);
+ if (ret == 0 && uid == cpu_uid)
+ return cpu;
+ }
+
+ return -EINVAL;
+}
diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
index 34430b68f602..ed72c3d1f796 100644
--- a/drivers/perf/arm_cspmu/arm_cspmu.c
+++ b/drivers/perf/arm_cspmu/arm_cspmu.c
@@ -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;
}
--
2.17.1
next prev parent reply other threads:[~2026-03-19 6:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-19 6:57 [PATCH v9 0/7] ACPI: Unify CPU UID interface and fix ARM64 TPH steer-tag issue Chengwen Feng
2026-03-19 6:57 ` Chengwen Feng [this message]
2026-03-19 15:46 ` [PATCH v9 1/7] arm64/acpi: Add acpi_get_cpu_uid() and switch arm_cspmu to use it Punit Agrawal
2026-03-20 3:20 ` fengchengwen
2026-03-19 6:57 ` [PATCH v9 2/7] loongarch/acpi: Add acpi_get_cpu_uid() declaration and implementation Chengwen Feng
2026-03-19 6:57 ` [PATCH v9 3/7] riscv/acpi: Add acpi_get_cpu_uid() implementation and update users Chengwen Feng
2026-03-19 6:57 ` [PATCH v9 4/7] x86/acpi: Add acpi_get_cpu_uid() implementation and update Xen users Chengwen Feng
2026-03-19 7:05 ` Jürgen Groß
2026-03-19 6:57 ` [PATCH v9 5/7] ACPI: Centralize acpi_get_cpu_uid() declaration in include/linux/acpi.h Chengwen Feng
2026-03-19 6:57 ` [PATCH v9 6/7] ACPI: PPTT: Use acpi_get_cpu_uid() and remove get_acpi_id_for_cpu() Chengwen Feng
2026-03-19 6:57 ` [PATCH v9 7/7] PCI/TPH: Fix get cpu steer-tag fail on ARM64 platform Chengwen Feng
2026-03-19 18:32 ` Bjorn Helgaas
2026-03-20 3:26 ` fengchengwen
2026-03-19 10:58 ` [PATCH v9 0/7] ACPI: Unify CPU UID interface and fix ARM64 TPH steer-tag issue Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260319065735.45954-2-fengchengwen@huawei.com \
--to=fengchengwen@huawei.com \
--cc=Eric.VanTassell@amd.com \
--cc=alex@ghiti.fr \
--cc=andrew.gospodarek@broadcom.com \
--cc=anshuman.khandual@arm.com \
--cc=aou@eecs.berkeley.edu \
--cc=bhelgaas@google.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=bwicaksono@nvidia.com \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=chenl311@chinatelecom.cn \
--cc=corbet@lwn.net \
--cc=darwi@linutronix.de \
--cc=dave.hansen@linux.intel.com \
--cc=guohanjun@huawei.com \
--cc=heinrich.schuchardt@canonical.com \
--cc=hpa@zytor.com \
--cc=ilkka@os.amperecomputing.com \
--cc=james.clark@linaro.org \
--cc=jgross@suse.com \
--cc=jonathan.cameron@huawei.com \
--cc=kai.huang@intel.com \
--cc=kees@kernel.org \
--cc=kernel@xen0n.name \
--cc=kevinloughlin@google.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=liuyonglong@huawei.com \
--cc=loongarch@lists.linux.dev \
--cc=make24@iscas.ac.cn \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mingo@redhat.com \
--cc=palmer@dabbelt.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=pjw@kernel.org \
--cc=punit.agrawal@oss.qualcomm.com \
--cc=rafael@kernel.org \
--cc=robin.murphy@arm.com \
--cc=ryan.roberts@arm.com \
--cc=seanjc@google.com \
--cc=si.yanteng@linux.dev \
--cc=skhan@linuxfoundation.org \
--cc=sohil.mehta@intel.com \
--cc=somnath.kotur@broadcom.com \
--cc=stable@vger.kernel.org \
--cc=sunilvl@ventanamicro.com \
--cc=suzuki.poulose@arm.com \
--cc=szy0127@sjtu.edu.cn \
--cc=tglx@kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=thorsten.blum@linux.dev \
--cc=thuth@redhat.com \
--cc=wanghuiqiang@huawei.com \
--cc=wangyuquan1236@phytium.com.cn \
--cc=wangzhou1@hisilicon.com \
--cc=wei.huang2@amd.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=xin@zytor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).