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

Commit a77d6cd9 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files

acpi/processor: Check for duplicate processor ids at hotplug time 



The check for duplicate processor ids happens at boot time based on the
ACPI table contents, but the final sanity checks for a processor happen
at hotplug time.

At hotplug time, where the physical information is available, which might
differ from the ACPI table information, a check for duplicate processor
ids is missing.

Add it to the hotplug checks and rename the function so it better
reflects its purpose.

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Tested-by: default avatarXiaolong Ye <xiaolong.ye@intel.com>
Cc: rjw@rjwysocki.net
Cc: linux-acpi@vger.kernel.org
Cc: guzheng1@huawei.com
Cc: izumi.taku@jp.fujitsu.com
Cc: lenb@kernel.org
Link: http://lkml.kernel.org/r/1488528147-2279-6-git-send-email-douly.fnst@cn.fujitsu.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8c8cb30f

drivers/acpi/acpi_processor.c

+10 −3
Original line number Diff line number Diff line
@@ -280,6 +280,13 @@ static int acpi_processor_get_info(struct acpi_device *device) 
		pr->acpi_id = value;

	}



	if (acpi_duplicate_processor_id(pr->acpi_id)) {

		dev_err(&device->dev,

			"Failed to get unique processor _UID (0x%x)\n",

			pr->acpi_id);

		return -ENODEV;

	}



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

					pr->acpi_id);

	if (invalid_phys_cpuid(pr->phys_id))
@@ -580,7 +587,7 @@ static struct acpi_scan_handler processor_container_handler = { 
static int nr_unique_ids __initdata;



/* The number of the duplicate processor IDs */

static int nr_duplicate_ids __initdata;

static int nr_duplicate_ids;



/* Used to store the unique processor IDs */

static int unique_processor_ids[] __initdata = {
@@ -588,7 +595,7 @@ static int unique_processor_ids[] __initdata = { 
};



/* Used to store the duplicate processor IDs */

static int duplicate_processor_ids[] __initdata = {

static int duplicate_processor_ids[] = {

	[0 ... NR_CPUS - 1] = -1,

};
@@ -679,7 +686,7 @@ void __init acpi_processor_check_duplicates(void) 
						NULL, NULL);

}



bool __init acpi_processor_validate_proc_id(int proc_id)

bool acpi_duplicate_processor_id(int proc_id)

{

	int i;

include/linux/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static inline bool invalid_phys_cpuid(phys_cpuid_t phys_id) 
}



/* Validate the processor object's proc_id */

bool acpi_processor_validate_proc_id(int proc_id);

bool acpi_duplicate_processor_id(int proc_id);



#ifdef CONFIG_ACPI_HOTPLUG_CPU

/* Arch dependent functions for cpu hotplug support */