Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcc18f5 authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI / processor: Introduce invalid_phys_cpuid() 



Introduce invalid_phys_cpuid() to identify cpu with invalid
physical ID, then used it as replacement of the direct comparisons
with PHYS_CPUID_INVALID.

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d3da7cb9

drivers/acpi/acpi_processor.c

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
	acpi_status status;

	int ret;



	if (pr->phys_id == PHYS_CPUID_INVALID)

	if (invalid_phys_cpuid(pr->phys_id))

		return -ENODEV;



	status = acpi_evaluate_integer(pr->handle, "_STA", NULL, &sta);
@@ -264,7 +264,7 @@ static int acpi_processor_get_info(struct acpi_device *device) 


	pr->phys_id = acpi_get_phys_id(pr->handle, device_declaration,

					pr->acpi_id);

	if (pr->phys_id == PHYS_CPUID_INVALID)

	if (invalid_phys_cpuid(pr->phys_id))

		acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n");



	pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id);

drivers/acpi/processor_core.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ phys_cpuid_t acpi_get_phys_id(acpi_handle handle, int type, u32 acpi_id) 
	phys_cpuid_t phys_id;



	phys_id = map_mat_entry(handle, type, acpi_id);

	if (phys_id == PHYS_CPUID_INVALID)

	if (invalid_phys_cpuid(phys_id))

		phys_id = map_madt_entry(type, acpi_id);



	return phys_id;
@@ -196,7 +196,7 @@ int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id) 
	int i;

#endif



	if (phys_id == PHYS_CPUID_INVALID) {

	if (invalid_phys_cpuid(phys_id)) {

		/*

		 * On UP processor, there is no _MAT or MADT table.

		 * So above phys_id is always set to PHYS_CPUID_INVALID.

include/linux/acpi.h

+5 −0
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ static inline bool invalid_logical_cpuid(u32 cpuid) 
	return (int)cpuid < 0;

}



static inline bool invalid_phys_cpuid(phys_cpuid_t phys_id)

{

	return phys_id == PHYS_CPUID_INVALID;

}



#ifdef CONFIG_ACPI_HOTPLUG_CPU

/* Arch dependent functions for cpu hotplug support */

int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu);