From: Dou Liyang <douly.fnst@cn.fujitsu.com> To: mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, rjw@rjwysocki.net, hpa@zytor.com, rafael@kernel.org, cl@linux.com, tj@kernel.org, akpm@linux-foundation.org, rafael.j.wysocki@intel.com, len.brown@intel.com, izumi.taku@jp.fujitsu.com, xiaolong.ye@intel.com Cc: x86@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Dou Liyang <douly.fnst@cn.fujitsu.com> Subject: [PATCH v2 4/4] acpi: Move the verification of duplicate proc_id from booting time to hot-plug time Date: Mon, 20 Feb 2017 16:47:51 +0800 [thread overview] Message-ID: <1487580471-17665-5-git-send-email-douly.fnst@cn.fujitsu.com> (raw) In-Reply-To: <1487580471-17665-1-git-send-email-douly.fnst@cn.fujitsu.com> After we revert the the mapping of "cpuid <-> nodeid" fixed at the booting time. and do it at the hot-plug time. we should also do the verification of duplicate proc_id at the time. The patch rename the verfication function and move it to drivers/acpi::acpi_processor_get_info. Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> --- drivers/acpi/acpi_processor.c | 13 ++++++++++--- include/linux/acpi.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index eb500e1..2483383 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -280,6 +280,13 @@ static int acpi_processor_get_info(struct acpi_device *device) pr->acpi_id = value; } + if(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, }; @@ -672,7 +679,7 @@ void __init acpi_processor_check_duplicates(void) NULL, NULL); } -bool __init acpi_processor_validate_proc_id(int proc_id) +bool duplicate_processor_id(int proc_id) { int i; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d180cbd..b692a70 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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 duplicate_processor_id(int proc_id); #ifdef CONFIG_ACPI_HOTPLUG_CPU /* Arch dependent functions for cpu hotplug support */ -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: Dou Liyang <douly.fnst@cn.fujitsu.com> To: <mingo@kernel.org>, <tglx@linutronix.de>, <peterz@infradead.org>, <rjw@rjwysocki.net>, <hpa@zytor.com>, <rafael@kernel.org>, <cl@linux.com>, <tj@kernel.org>, <akpm@linux-foundation.org>, <rafael.j.wysocki@intel.com>, <len.brown@intel.com>, <izumi.taku@jp.fujitsu.com>, <xiaolong.ye@intel.com> Cc: <x86@kernel.org>, <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Dou Liyang <douly.fnst@cn.fujitsu.com> Subject: [PATCH v2 4/4] acpi: Move the verification of duplicate proc_id from booting time to hot-plug time Date: Mon, 20 Feb 2017 16:47:51 +0800 [thread overview] Message-ID: <1487580471-17665-5-git-send-email-douly.fnst@cn.fujitsu.com> (raw) In-Reply-To: <1487580471-17665-1-git-send-email-douly.fnst@cn.fujitsu.com> After we revert the the mapping of "cpuid <-> nodeid" fixed at the booting time. and do it at the hot-plug time. we should also do the verification of duplicate proc_id at the time. The patch rename the verfication function and move it to drivers/acpi::acpi_processor_get_info. Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> --- drivers/acpi/acpi_processor.c | 13 ++++++++++--- include/linux/acpi.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index eb500e1..2483383 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -280,6 +280,13 @@ static int acpi_processor_get_info(struct acpi_device *device) pr->acpi_id = value; } + if(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, }; @@ -672,7 +679,7 @@ void __init acpi_processor_check_duplicates(void) NULL, NULL); } -bool __init acpi_processor_validate_proc_id(int proc_id) +bool duplicate_processor_id(int proc_id) { int i; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d180cbd..b692a70 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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 duplicate_processor_id(int proc_id); #ifdef CONFIG_ACPI_HOTPLUG_CPU /* Arch dependent functions for cpu hotplug support */ -- 2.5.5
next prev parent reply other threads:[~2017-02-20 8:47 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-20 8:47 [PATCH v2 0/4] Revert works for the mapping of cpuid <-> nodeid Dou Liyang 2017-02-20 8:47 ` Dou Liyang 2017-02-20 8:47 ` [PATCH v2 1/4] Revert"x86/acpi: Set persistent cpuid <-> nodeid mapping when booting" Dou Liyang 2017-02-20 8:47 ` Dou Liyang 2017-03-01 10:51 ` Thomas Gleixner 2017-03-02 7:58 ` Dou Liyang 2017-03-02 7:58 ` Dou Liyang 2017-02-20 8:47 ` [PATCH v2 2/4] Revert"x86/acpi: Enable MADT APIs to return disabled apicids" Dou Liyang 2017-02-20 8:47 ` Dou Liyang 2017-03-01 10:52 ` Thomas Gleixner 2017-03-02 8:02 ` Dou Liyang 2017-03-02 8:02 ` Dou Liyang 2017-02-20 8:47 ` [PATCH v2 3/4] acpi: Fix the check handle in case of declaring processors using the Device operator Dou Liyang 2017-02-20 8:47 ` Dou Liyang 2017-03-01 11:12 ` Thomas Gleixner 2017-03-02 8:12 ` Dou Liyang 2017-03-02 8:12 ` Dou Liyang 2017-02-20 8:47 ` Dou Liyang [this message] 2017-02-20 8:47 ` [PATCH v2 4/4] acpi: Move the verification of duplicate proc_id from booting time to hot-plug time Dou Liyang 2017-03-01 11:26 ` Thomas Gleixner 2017-03-02 8:20 ` Dou Liyang 2017-03-02 8:20 ` Dou Liyang 2017-02-21 1:02 ` [PATCH v2 0/4] Revert works for the mapping of cpuid <-> nodeid Ye Xiaolong 2017-02-21 7:10 ` Ye Xiaolong 2017-02-21 7:10 ` Ye Xiaolong 2017-02-22 1:56 ` Dou Liyang 2017-02-22 1:56 ` Dou Liyang 2017-02-22 1:56 ` Dou Liyang 2017-03-16 8:14 ` [LKP] " Aaron Lu 2017-03-16 8:14 ` Aaron Lu 2017-03-16 8:28 ` [LKP] " Thomas Gleixner 2017-03-16 8:28 ` Thomas Gleixner 2017-03-16 8:38 ` [LKP] " Aaron Lu 2017-03-16 8:38 ` Aaron Lu
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=1487580471-17665-5-git-send-email-douly.fnst@cn.fujitsu.com \ --to=douly.fnst@cn.fujitsu.com \ --cc=akpm@linux-foundation.org \ --cc=cl@linux.com \ --cc=hpa@zytor.com \ --cc=izumi.taku@jp.fujitsu.com \ --cc=len.brown@intel.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=peterz@infradead.org \ --cc=rafael.j.wysocki@intel.com \ --cc=rafael@kernel.org \ --cc=rjw@rjwysocki.net \ --cc=tglx@linutronix.de \ --cc=tj@kernel.org \ --cc=x86@kernel.org \ --cc=xiaolong.ye@intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.