Skip to content

Commit f652d0a

Browse files
fengchengwenrafaeljw
authored andcommitted
ACPI: Centralize acpi_get_cpu_uid() declaration in include/linux/acpi.h
Centralize acpi_get_cpu_uid() in include/linux/acpi.h (global scope) and remove arch-specific declarations from arm64/loongarch/riscv/x86 asm/acpi.h. This unifies the interface across architectures and simplifies maintenance by eliminating duplicate prototypes. Signed-off-by: Chengwen Feng <fengchengwen@huawei.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Link: https://patch.msgid.link/20260401081640.26875-6-fengchengwen@huawei.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 3cfe889 commit f652d0a

5 files changed

Lines changed: 11 additions & 5 deletions

File tree

arch/arm64/include/asm/acpi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
118118
{
119119
return acpi_cpu_get_madt_gicc(cpu)->uid;
120120
}
121-
int acpi_get_cpu_uid(unsigned int cpu, u32 *uid);
122121
int get_cpu_for_acpi_id(u32 uid);
123122

124123
static inline void arch_fix_phys_package_id(int num, u32 slot) { }

arch/loongarch/include/asm/acpi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
4444
{
4545
return acpi_core_pic[cpu_logical_map(cpu)].processor_id;
4646
}
47-
int acpi_get_cpu_uid(unsigned int cpu, u32 *uid);
4847

4948
#endif /* !CONFIG_ACPI */
5049

arch/riscv/include/asm/acpi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ static inline u32 get_acpi_id_for_cpu(int cpu)
6565
{
6666
return acpi_cpu_get_madt_rintc(cpu)->uid;
6767
}
68-
int acpi_get_cpu_uid(unsigned int cpu, u32 *uid);
6968

7069
int acpi_get_riscv_isa(struct acpi_table_header *table,
7170
unsigned int cpu, const char **isa);

arch/x86/include/asm/acpi.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ static inline bool acpi_has_cpu_in_madt(void)
157157
return !!acpi_lapic;
158158
}
159159

160-
int acpi_get_cpu_uid(unsigned int cpu, u32 *uid);
161-
162160
#define ACPI_HAVE_ARCH_SET_ROOT_POINTER
163161
static __always_inline void acpi_arch_set_root_pointer(u64 addr)
164162
{

include/linux/acpi.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,17 @@ int acpi_unmap_cpu(int cpu);
324324

325325
acpi_handle acpi_get_processor_handle(int cpu);
326326

327+
/**
328+
* acpi_get_cpu_uid() - Get ACPI Processor UID of from MADT table
329+
* @cpu: Logical CPU number (0-based)
330+
* @uid: Pointer to store ACPI Processor UID
331+
*
332+
* Return: 0 on success (ACPI Processor ID stored in *uid);
333+
* -EINVAL if CPU number is invalid or out of range;
334+
* -ENODEV if ACPI Processor UID for the CPU is not found.
335+
*/
336+
int acpi_get_cpu_uid(unsigned int cpu, u32 *uid);
337+
327338
#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
328339
int acpi_get_ioapic_id(acpi_handle handle, u32 gsi_base, u64 *phys_addr);
329340
#endif

0 commit comments

Comments
 (0)