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: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 62c846befb622e5ad22abe8d80f1bce43924d97d..92a5f738e3707657f48dc59fdc3280866fad5746 100644 (file)
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -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);

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index fd4140dabbf1cd4e7098c15f36b9f8a803c809d7..33a38d60463009197f0f80db545ce5e15ce7f880 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -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.

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 913b49f9a6e6f009a92485be38cd821726cd3023..90e4ed1eb191adfb0d74600d2939cd1f6ce4f035 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -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);