Commit 2b85b3d2 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner

x86/acpi: Restore the order of CPU IDs

The following commits:

  f7c28833 ("x86/acpi: Enable acpi to register all possible cpus at
boot time") and 8f54969d ("x86/acpi: Introduce persistent storage
for cpuid <-> apicid mapping")

... registered all the possible CPUs at boot time via ACPI tables to
make the mapping of cpuid <-> apicid fixed. Both enabled and disabled
CPUs could have a logical CPU ID after boot time.

But, ACPI tables are unreliable. the number amd order of Local APIC
entries which depends on the firmware is often inconsistent with the
physical devices. Even if they are consistent, The disabled CPUs which
take up some logical CPU IDs will also make the order discontinuous.

Revert the part of disabled CPUs registration, keep the allocation
logic of logical CPU IDs and also keep some code location changes.
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-4-git-send-email-douly.fnst@cn.fujitsu.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 09c3f2bd
...@@ -179,10 +179,15 @@ static int acpi_register_lapic(int id, u32 acpiid, u8 enabled) ...@@ -179,10 +179,15 @@ static int acpi_register_lapic(int id, u32 acpiid, u8 enabled)
return -EINVAL; return -EINVAL;
} }
if (!enabled) {
++disabled_cpus;
return -EINVAL;
}
if (boot_cpu_physical_apicid != -1U) if (boot_cpu_physical_apicid != -1U)
ver = boot_cpu_apic_version; ver = boot_cpu_apic_version;
cpu = __generic_processor_info(id, ver, enabled); cpu = generic_processor_info(id, ver);
if (cpu >= 0) if (cpu >= 0)
early_per_cpu(x86_cpu_to_acpiid, cpu) = acpiid; early_per_cpu(x86_cpu_to_acpiid, cpu) = acpiid;
......
...@@ -2063,7 +2063,7 @@ static int allocate_logical_cpuid(int apicid) ...@@ -2063,7 +2063,7 @@ static int allocate_logical_cpuid(int apicid)
return nr_logical_cpuids++; return nr_logical_cpuids++;
} }
int __generic_processor_info(int apicid, int version, bool enabled) int generic_processor_info(int apicid, int version)
{ {
int cpu, max = nr_cpu_ids; int cpu, max = nr_cpu_ids;
bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid, bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid,
...@@ -2121,11 +2121,9 @@ int __generic_processor_info(int apicid, int version, bool enabled) ...@@ -2121,11 +2121,9 @@ int __generic_processor_info(int apicid, int version, bool enabled)
if (num_processors >= nr_cpu_ids) { if (num_processors >= nr_cpu_ids) {
int thiscpu = max + disabled_cpus; int thiscpu = max + disabled_cpus;
if (enabled) {
pr_warning("APIC: NR_CPUS/possible_cpus limit of %i " pr_warning("APIC: NR_CPUS/possible_cpus limit of %i "
"reached. Processor %d/0x%x ignored.\n", "reached. Processor %d/0x%x ignored.\n",
max, thiscpu, apicid); max, thiscpu, apicid);
}
disabled_cpus++; disabled_cpus++;
return -EINVAL; return -EINVAL;
...@@ -2177,23 +2175,13 @@ int __generic_processor_info(int apicid, int version, bool enabled) ...@@ -2177,23 +2175,13 @@ int __generic_processor_info(int apicid, int version, bool enabled)
apic->x86_32_early_logical_apicid(cpu); apic->x86_32_early_logical_apicid(cpu);
#endif #endif
set_cpu_possible(cpu, true); set_cpu_possible(cpu, true);
if (enabled) {
num_processors++;
physid_set(apicid, phys_cpu_present_map); physid_set(apicid, phys_cpu_present_map);
set_cpu_present(cpu, true); set_cpu_present(cpu, true);
} else { num_processors++;
disabled_cpus++;
}
return cpu; return cpu;
} }
int generic_processor_info(int apicid, int version)
{
return __generic_processor_info(apicid, version, true);
}
int hard_smp_processor_id(void) int hard_smp_processor_id(void)
{ {
return read_apic_id(); return read_apic_id();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment