[ACPI] fix processor_core.c for NR_CPUS > 256
http://bugzilla.kernel.org/show_bug.cgi?id=5128 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
dbed12da5b
commit
9a31477a95
|
@ -413,18 +413,20 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
|
|||
#define ARCH_BAD_APICID (0xff)
|
||||
#endif
|
||||
|
||||
static u8 convert_acpiid_to_cpu(u8 acpi_id)
|
||||
static int convert_acpiid_to_cpu(u8 acpi_id, unsigned int *cpu_index)
|
||||
{
|
||||
u16 apic_id;
|
||||
int i;
|
||||
unsigned int i;
|
||||
|
||||
apic_id = arch_acpiid_to_apicid[acpi_id];
|
||||
if (apic_id == ARCH_BAD_APICID)
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < NR_CPUS; i++) {
|
||||
if (arch_cpu_to_apicid[i] == apic_id)
|
||||
return i;
|
||||
if (arch_cpu_to_apicid[i] == apic_id) {
|
||||
*cpu_index = i;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
@ -439,7 +441,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
|||
acpi_status status = 0;
|
||||
union acpi_object object = { 0 };
|
||||
struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
|
||||
u8 cpu_index;
|
||||
unsigned int cpu_index;
|
||||
int retval;
|
||||
static int cpu0_initialized;
|
||||
|
||||
ACPI_FUNCTION_TRACE("acpi_processor_get_info");
|
||||
|
@ -482,10 +485,10 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
|||
*/
|
||||
pr->acpi_id = object.processor.proc_id;
|
||||
|
||||
cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
|
||||
retval = convert_acpiid_to_cpu(pr->acpi_id, &cpu_index);
|
||||
|
||||
/* Handle UP system running SMP kernel, with no LAPIC in MADT */
|
||||
if (!cpu0_initialized && (cpu_index == 0xff) &&
|
||||
if (!cpu0_initialized && retval &&
|
||||
(num_online_cpus() == 1)) {
|
||||
cpu_index = 0;
|
||||
}
|
||||
|
@ -499,10 +502,10 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
|||
* less than the max # of CPUs. They should be ignored _iff
|
||||
* they are physically not present.
|
||||
*/
|
||||
if (cpu_index >= NR_CPUS) {
|
||||
if (retval) {
|
||||
if (ACPI_FAILURE
|
||||
(acpi_processor_hotadd_init(pr->handle, &pr->id))) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||
"Error getting cpuindex for acpiid 0x%x\n",
|
||||
pr->acpi_id));
|
||||
return_VALUE(-ENODEV);
|
||||
|
|
Loading…
Reference in a new issue