2009-12-20 19:19:34 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2005 Intel Corporation
|
|
|
|
* Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
|
|
|
|
*
|
|
|
|
* Alex Chiang <achiang@hp.com>
|
|
|
|
* - Unified x86/ia64 implementations
|
|
|
|
* Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
|
|
|
|
* - Added _PDC for platforms with Intel CPUs
|
|
|
|
*/
|
2011-10-26 20:22:14 +00:00
|
|
|
#include <linux/export.h>
|
2009-12-20 19:19:09 +00:00
|
|
|
#include <linux/dmi.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2009-12-20 19:19:09 +00:00
|
|
|
|
|
|
|
#include <acpi/acpi_drivers.h>
|
|
|
|
#include <acpi/processor.h>
|
|
|
|
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
|
|
#define PREFIX "ACPI: "
|
|
|
|
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
2010-02-22 19:11:14 +00:00
|
|
|
ACPI_MODULE_NAME("processor_core");
|
2009-12-20 19:19:09 +00:00
|
|
|
|
2011-02-17 16:33:53 +00:00
|
|
|
static int __init set_no_mwait(const struct dmi_system_id *id)
|
2009-12-20 19:19:09 +00:00
|
|
|
{
|
|
|
|
printk(KERN_NOTICE PREFIX "%s detected - "
|
|
|
|
"disabling mwait for CPU C-states\n", id->ident);
|
2010-11-03 16:06:14 +00:00
|
|
|
boot_option_idle_override = IDLE_NOMWAIT;
|
2009-12-20 19:19:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-02-17 16:33:53 +00:00
|
|
|
static struct dmi_system_id __initdata processor_idle_dmi_table[] = {
|
2009-12-20 19:19:09 +00:00
|
|
|
{
|
|
|
|
set_no_mwait, "Extensa 5220", {
|
|
|
|
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
|
|
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
|
|
|
|
DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
|
|
|
|
DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},
|
|
|
|
{},
|
|
|
|
};
|
|
|
|
|
2010-02-22 19:11:24 +00:00
|
|
|
static int map_lapic_id(struct acpi_subtable_header *entry,
|
|
|
|
u32 acpi_id, int *apic_id)
|
|
|
|
{
|
|
|
|
struct acpi_madt_local_apic *lapic =
|
|
|
|
(struct acpi_madt_local_apic *)entry;
|
2010-02-22 19:11:44 +00:00
|
|
|
|
|
|
|
if (!(lapic->lapic_flags & ACPI_MADT_ENABLED))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (lapic->processor_id != acpi_id)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
*apic_id = lapic->id;
|
|
|
|
return 1;
|
2010-02-22 19:11:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int map_x2apic_id(struct acpi_subtable_header *entry,
|
|
|
|
int device_declaration, u32 acpi_id, int *apic_id)
|
|
|
|
{
|
|
|
|
struct acpi_madt_local_x2apic *apic =
|
|
|
|
(struct acpi_madt_local_x2apic *)entry;
|
|
|
|
|
|
|
|
if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
|
|
|
|
return 0;
|
|
|
|
|
2010-02-22 19:11:50 +00:00
|
|
|
if (device_declaration && (apic->uid == acpi_id)) {
|
|
|
|
*apic_id = apic->local_apic_id;
|
|
|
|
return 1;
|
2010-02-22 19:11:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int map_lsapic_id(struct acpi_subtable_header *entry,
|
|
|
|
int device_declaration, u32 acpi_id, int *apic_id)
|
|
|
|
{
|
|
|
|
struct acpi_madt_local_sapic *lsapic =
|
|
|
|
(struct acpi_madt_local_sapic *)entry;
|
|
|
|
|
|
|
|
if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (device_declaration) {
|
2010-02-22 19:11:55 +00:00
|
|
|
if ((entry->length < 16) || (lsapic->uid != acpi_id))
|
|
|
|
return 0;
|
|
|
|
} else if (lsapic->processor_id != acpi_id)
|
|
|
|
return 0;
|
2010-02-22 19:11:24 +00:00
|
|
|
|
2010-02-22 19:11:55 +00:00
|
|
|
*apic_id = (lsapic->id << 8) | lsapic->eid;
|
2010-02-22 19:11:24 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int map_madt_entry(int type, u32 acpi_id)
|
|
|
|
{
|
|
|
|
unsigned long madt_end, entry;
|
2010-02-22 19:12:00 +00:00
|
|
|
static struct acpi_table_madt *madt;
|
|
|
|
static int read_madt;
|
2010-02-22 19:11:24 +00:00
|
|
|
int apic_id = -1;
|
|
|
|
|
2010-02-22 19:12:00 +00:00
|
|
|
if (!read_madt) {
|
|
|
|
if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
|
|
|
|
(struct acpi_table_header **)&madt)))
|
|
|
|
madt = NULL;
|
|
|
|
read_madt++;
|
|
|
|
}
|
|
|
|
|
2010-02-22 19:11:24 +00:00
|
|
|
if (!madt)
|
|
|
|
return apic_id;
|
|
|
|
|
|
|
|
entry = (unsigned long)madt;
|
|
|
|
madt_end = entry + madt->header.length;
|
|
|
|
|
|
|
|
/* Parse all entries looking for a match. */
|
|
|
|
|
|
|
|
entry += sizeof(struct acpi_table_madt);
|
|
|
|
while (entry + sizeof(struct acpi_subtable_header) < madt_end) {
|
|
|
|
struct acpi_subtable_header *header =
|
|
|
|
(struct acpi_subtable_header *)entry;
|
|
|
|
if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
|
|
|
|
if (map_lapic_id(header, acpi_id, &apic_id))
|
|
|
|
break;
|
|
|
|
} else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
|
|
|
|
if (map_x2apic_id(header, type, acpi_id, &apic_id))
|
|
|
|
break;
|
|
|
|
} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
|
|
|
|
if (map_lsapic_id(header, type, acpi_id, &apic_id))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
entry += header->length;
|
|
|
|
}
|
|
|
|
return apic_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
|
|
|
|
{
|
|
|
|
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
|
|
|
|
union acpi_object *obj;
|
|
|
|
struct acpi_subtable_header *header;
|
|
|
|
int apic_id = -1;
|
|
|
|
|
|
|
|
if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
if (!buffer.length || !buffer.pointer)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
obj = buffer.pointer;
|
|
|
|
if (obj->type != ACPI_TYPE_BUFFER ||
|
|
|
|
obj->buffer.length < sizeof(struct acpi_subtable_header)) {
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
header = (struct acpi_subtable_header *)obj->buffer.pointer;
|
|
|
|
if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
|
|
|
|
map_lapic_id(header, acpi_id, &apic_id);
|
|
|
|
} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
|
|
|
|
map_lsapic_id(header, type, acpi_id, &apic_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
exit:
|
|
|
|
if (buffer.pointer)
|
|
|
|
kfree(buffer.pointer);
|
|
|
|
return apic_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
|
|
|
|
{
|
ACPI: processor: fix processor_physically_present in UP kernel
Usually, there are multiple processors defined in ACPI table, for
example
Scope (_PR)
{
Processor (CPU0, 0x00, 0x00000410, 0x06) {}
Processor (CPU1, 0x01, 0x00000410, 0x06) {}
Processor (CPU2, 0x02, 0x00000410, 0x06) {}
Processor (CPU3, 0x03, 0x00000410, 0x06) {}
}
processor_physically_present(...) will be called to check whether those
processors are physically present.
Currently we have below codes in processor_physically_present,
cpuid = acpi_get_cpuid(...);
if ((cpuid == -1) && (num_possible_cpus() > 1))
return false;
return true;
In UP kernel, acpi_get_cpuid(...) always return -1 and
num_possible_cpus() always return 1, so
processor_physically_present(...) always returns true for all passed in
processor handles.
This is wrong for UP processor or SMP processor running UP kernel.
This patch removes the !SMP version of acpi_get_cpuid(), so both UP and
SMP kernel use the same acpi_get_cpuid function.
And for UP kernel, only processor 0 is valid.
https://bugzilla.kernel.org/show_bug.cgi?id=16548
https://bugzilla.kernel.org/show_bug.cgi?id=16357
Tested-by: Anton Kochkov <anton.kochkov@gmail.com>
Tested-by: Ambroz Bizjak <ambrop7@gmail.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2011-05-16 01:11:00 +00:00
|
|
|
#ifdef CONFIG_SMP
|
2010-02-22 19:11:24 +00:00
|
|
|
int i;
|
ACPI: processor: fix processor_physically_present in UP kernel
Usually, there are multiple processors defined in ACPI table, for
example
Scope (_PR)
{
Processor (CPU0, 0x00, 0x00000410, 0x06) {}
Processor (CPU1, 0x01, 0x00000410, 0x06) {}
Processor (CPU2, 0x02, 0x00000410, 0x06) {}
Processor (CPU3, 0x03, 0x00000410, 0x06) {}
}
processor_physically_present(...) will be called to check whether those
processors are physically present.
Currently we have below codes in processor_physically_present,
cpuid = acpi_get_cpuid(...);
if ((cpuid == -1) && (num_possible_cpus() > 1))
return false;
return true;
In UP kernel, acpi_get_cpuid(...) always return -1 and
num_possible_cpus() always return 1, so
processor_physically_present(...) always returns true for all passed in
processor handles.
This is wrong for UP processor or SMP processor running UP kernel.
This patch removes the !SMP version of acpi_get_cpuid(), so both UP and
SMP kernel use the same acpi_get_cpuid function.
And for UP kernel, only processor 0 is valid.
https://bugzilla.kernel.org/show_bug.cgi?id=16548
https://bugzilla.kernel.org/show_bug.cgi?id=16357
Tested-by: Anton Kochkov <anton.kochkov@gmail.com>
Tested-by: Ambroz Bizjak <ambrop7@gmail.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2011-05-16 01:11:00 +00:00
|
|
|
#endif
|
2010-02-22 19:11:24 +00:00
|
|
|
int apic_id = -1;
|
|
|
|
|
|
|
|
apic_id = map_mat_entry(handle, type, acpi_id);
|
|
|
|
if (apic_id == -1)
|
|
|
|
apic_id = map_madt_entry(type, acpi_id);
|
ACPI: processor: fix acpi_get_cpuid for UP processor
For UP processor, it is likely that no _MAT method or MADT table defined.
So currently acpi_get_cpuid(...) always return -1 for UP processor.
This is wrong. It should return valid value for CPU0.
In the other hand, BIOS may define multiple CPU handles even for UP
processor, for example
Scope (_PR)
{
Processor (CPU0, 0x00, 0x00000410, 0x06) {}
Processor (CPU1, 0x01, 0x00000410, 0x06) {}
Processor (CPU2, 0x02, 0x00000410, 0x06) {}
Processor (CPU3, 0x03, 0x00000410, 0x06) {}
}
We should only return valid value for CPU0's acpi handle.
And return invalid value for others.
http://marc.info/?t=132329819900003&r=1&w=2
Cc: stable@vger.kernel.org
Reported-and-tested-by: wallak@free.fr
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2011-12-13 01:36:03 +00:00
|
|
|
if (apic_id == -1) {
|
|
|
|
/*
|
|
|
|
* On UP processor, there is no _MAT or MADT table.
|
|
|
|
* So above apic_id is always set to -1.
|
|
|
|
*
|
|
|
|
* BIOS may define multiple CPU handles even for UP processor.
|
|
|
|
* For example,
|
|
|
|
*
|
|
|
|
* Scope (_PR)
|
|
|
|
* {
|
|
|
|
* Processor (CPU0, 0x00, 0x00000410, 0x06) {}
|
|
|
|
* Processor (CPU1, 0x01, 0x00000410, 0x06) {}
|
|
|
|
* Processor (CPU2, 0x02, 0x00000410, 0x06) {}
|
|
|
|
* Processor (CPU3, 0x03, 0x00000410, 0x06) {}
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* Ignores apic_id and always return 0 for CPU0's handle.
|
|
|
|
* Return -1 for other CPU's handle.
|
|
|
|
*/
|
|
|
|
if (acpi_id == 0)
|
|
|
|
return acpi_id;
|
|
|
|
else
|
|
|
|
return apic_id;
|
|
|
|
}
|
2010-02-22 19:11:24 +00:00
|
|
|
|
ACPI: processor: fix processor_physically_present in UP kernel
Usually, there are multiple processors defined in ACPI table, for
example
Scope (_PR)
{
Processor (CPU0, 0x00, 0x00000410, 0x06) {}
Processor (CPU1, 0x01, 0x00000410, 0x06) {}
Processor (CPU2, 0x02, 0x00000410, 0x06) {}
Processor (CPU3, 0x03, 0x00000410, 0x06) {}
}
processor_physically_present(...) will be called to check whether those
processors are physically present.
Currently we have below codes in processor_physically_present,
cpuid = acpi_get_cpuid(...);
if ((cpuid == -1) && (num_possible_cpus() > 1))
return false;
return true;
In UP kernel, acpi_get_cpuid(...) always return -1 and
num_possible_cpus() always return 1, so
processor_physically_present(...) always returns true for all passed in
processor handles.
This is wrong for UP processor or SMP processor running UP kernel.
This patch removes the !SMP version of acpi_get_cpuid(), so both UP and
SMP kernel use the same acpi_get_cpuid function.
And for UP kernel, only processor 0 is valid.
https://bugzilla.kernel.org/show_bug.cgi?id=16548
https://bugzilla.kernel.org/show_bug.cgi?id=16357
Tested-by: Anton Kochkov <anton.kochkov@gmail.com>
Tested-by: Ambroz Bizjak <ambrop7@gmail.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2011-05-16 01:11:00 +00:00
|
|
|
#ifdef CONFIG_SMP
|
2010-02-22 19:11:24 +00:00
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
if (cpu_physical_id(i) == apic_id)
|
|
|
|
return i;
|
|
|
|
}
|
ACPI: processor: fix processor_physically_present in UP kernel
Usually, there are multiple processors defined in ACPI table, for
example
Scope (_PR)
{
Processor (CPU0, 0x00, 0x00000410, 0x06) {}
Processor (CPU1, 0x01, 0x00000410, 0x06) {}
Processor (CPU2, 0x02, 0x00000410, 0x06) {}
Processor (CPU3, 0x03, 0x00000410, 0x06) {}
}
processor_physically_present(...) will be called to check whether those
processors are physically present.
Currently we have below codes in processor_physically_present,
cpuid = acpi_get_cpuid(...);
if ((cpuid == -1) && (num_possible_cpus() > 1))
return false;
return true;
In UP kernel, acpi_get_cpuid(...) always return -1 and
num_possible_cpus() always return 1, so
processor_physically_present(...) always returns true for all passed in
processor handles.
This is wrong for UP processor or SMP processor running UP kernel.
This patch removes the !SMP version of acpi_get_cpuid(), so both UP and
SMP kernel use the same acpi_get_cpuid function.
And for UP kernel, only processor 0 is valid.
https://bugzilla.kernel.org/show_bug.cgi?id=16548
https://bugzilla.kernel.org/show_bug.cgi?id=16357
Tested-by: Anton Kochkov <anton.kochkov@gmail.com>
Tested-by: Ambroz Bizjak <ambrop7@gmail.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2011-05-16 01:11:00 +00:00
|
|
|
#else
|
|
|
|
/* In UP kernel, only processor 0 is valid */
|
|
|
|
if (apic_id == 0)
|
|
|
|
return apic_id;
|
|
|
|
#endif
|
2010-02-22 19:11:24 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(acpi_get_cpuid);
|
|
|
|
|
2011-02-17 16:33:53 +00:00
|
|
|
static bool __init processor_physically_present(acpi_handle handle)
|
2010-02-22 19:11:29 +00:00
|
|
|
{
|
|
|
|
int cpuid, type;
|
|
|
|
u32 acpi_id;
|
|
|
|
acpi_status status;
|
|
|
|
acpi_object_type acpi_type;
|
|
|
|
unsigned long long tmp;
|
|
|
|
union acpi_object object = { 0 };
|
|
|
|
struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
|
|
|
|
|
|
|
|
status = acpi_get_type(handle, &acpi_type);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
switch (acpi_type) {
|
|
|
|
case ACPI_TYPE_PROCESSOR:
|
|
|
|
status = acpi_evaluate_object(handle, NULL, NULL, &buffer);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
return false;
|
|
|
|
acpi_id = object.processor.proc_id;
|
|
|
|
break;
|
|
|
|
case ACPI_TYPE_DEVICE:
|
|
|
|
status = acpi_evaluate_integer(handle, "_UID", NULL, &tmp);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
return false;
|
|
|
|
acpi_id = tmp;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0;
|
|
|
|
cpuid = acpi_get_cpuid(handle, type, acpi_id);
|
|
|
|
|
ACPI: processor: fix processor_physically_present in UP kernel
Usually, there are multiple processors defined in ACPI table, for
example
Scope (_PR)
{
Processor (CPU0, 0x00, 0x00000410, 0x06) {}
Processor (CPU1, 0x01, 0x00000410, 0x06) {}
Processor (CPU2, 0x02, 0x00000410, 0x06) {}
Processor (CPU3, 0x03, 0x00000410, 0x06) {}
}
processor_physically_present(...) will be called to check whether those
processors are physically present.
Currently we have below codes in processor_physically_present,
cpuid = acpi_get_cpuid(...);
if ((cpuid == -1) && (num_possible_cpus() > 1))
return false;
return true;
In UP kernel, acpi_get_cpuid(...) always return -1 and
num_possible_cpus() always return 1, so
processor_physically_present(...) always returns true for all passed in
processor handles.
This is wrong for UP processor or SMP processor running UP kernel.
This patch removes the !SMP version of acpi_get_cpuid(), so both UP and
SMP kernel use the same acpi_get_cpuid function.
And for UP kernel, only processor 0 is valid.
https://bugzilla.kernel.org/show_bug.cgi?id=16548
https://bugzilla.kernel.org/show_bug.cgi?id=16357
Tested-by: Anton Kochkov <anton.kochkov@gmail.com>
Tested-by: Ambroz Bizjak <ambrop7@gmail.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
2011-05-16 01:11:00 +00:00
|
|
|
if (cpuid == -1)
|
2010-02-22 19:11:29 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2010-02-22 19:11:24 +00:00
|
|
|
|
2011-02-17 16:36:24 +00:00
|
|
|
static void __cpuinit acpi_set_pdc_bits(u32 *buf)
|
2009-12-20 19:19:24 +00:00
|
|
|
{
|
|
|
|
buf[0] = ACPI_PDC_REVISION_ID;
|
|
|
|
buf[1] = 1;
|
|
|
|
|
|
|
|
/* Enable coordination with firmware's _TSD info */
|
|
|
|
buf[2] = ACPI_PDC_SMP_T_SWCOORD;
|
2009-12-20 19:19:29 +00:00
|
|
|
|
|
|
|
/* Twiddle arch-specific bits needed for _PDC */
|
|
|
|
arch_acpi_set_pdc_bits(buf);
|
2009-12-20 19:19:24 +00:00
|
|
|
}
|
|
|
|
|
2011-02-17 16:36:24 +00:00
|
|
|
static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
|
2009-12-20 19:19:19 +00:00
|
|
|
{
|
|
|
|
struct acpi_object_list *obj_list;
|
|
|
|
union acpi_object *obj;
|
|
|
|
u32 *buf;
|
|
|
|
|
|
|
|
/* allocate and initialize pdc. It will be used later. */
|
|
|
|
obj_list = kmalloc(sizeof(struct acpi_object_list), GFP_KERNEL);
|
|
|
|
if (!obj_list) {
|
|
|
|
printk(KERN_ERR "Memory allocation error\n");
|
2009-12-20 19:19:39 +00:00
|
|
|
return NULL;
|
2009-12-20 19:19:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
|
|
|
|
if (!obj) {
|
|
|
|
printk(KERN_ERR "Memory allocation error\n");
|
|
|
|
kfree(obj_list);
|
2009-12-20 19:19:39 +00:00
|
|
|
return NULL;
|
2009-12-20 19:19:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
buf = kmalloc(12, GFP_KERNEL);
|
|
|
|
if (!buf) {
|
|
|
|
printk(KERN_ERR "Memory allocation error\n");
|
|
|
|
kfree(obj);
|
|
|
|
kfree(obj_list);
|
2009-12-20 19:19:39 +00:00
|
|
|
return NULL;
|
2009-12-20 19:19:19 +00:00
|
|
|
}
|
|
|
|
|
2009-12-20 19:19:24 +00:00
|
|
|
acpi_set_pdc_bits(buf);
|
|
|
|
|
2009-12-20 19:19:19 +00:00
|
|
|
obj->type = ACPI_TYPE_BUFFER;
|
|
|
|
obj->buffer.length = 12;
|
|
|
|
obj->buffer.pointer = (u8 *) buf;
|
|
|
|
obj_list->count = 1;
|
|
|
|
obj_list->pointer = obj;
|
|
|
|
|
2009-12-20 19:19:39 +00:00
|
|
|
return obj_list;
|
2009-12-20 19:19:19 +00:00
|
|
|
}
|
|
|
|
|
2009-12-20 19:19:09 +00:00
|
|
|
/*
|
|
|
|
* _PDC is required for a BIOS-OS handshake for most of the newer
|
|
|
|
* ACPI processor features.
|
|
|
|
*/
|
2011-02-17 16:36:24 +00:00
|
|
|
static int __cpuinit
|
2009-12-20 19:19:45 +00:00
|
|
|
acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
|
2009-12-20 19:19:09 +00:00
|
|
|
{
|
|
|
|
acpi_status status = AE_OK;
|
|
|
|
|
2010-11-03 16:06:14 +00:00
|
|
|
if (boot_option_idle_override == IDLE_NOMWAIT) {
|
2009-12-20 19:19:09 +00:00
|
|
|
/*
|
|
|
|
* If mwait is disabled for CPU C-states, the C2C3_FFH access
|
|
|
|
* mode will be disabled in the parameter of _PDC object.
|
|
|
|
* Of course C1_FFH access mode will also be disabled.
|
|
|
|
*/
|
|
|
|
union acpi_object *obj;
|
|
|
|
u32 *buffer = NULL;
|
|
|
|
|
|
|
|
obj = pdc_in->pointer;
|
|
|
|
buffer = (u32 *)(obj->buffer.pointer);
|
|
|
|
buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
|
|
|
|
|
|
|
|
}
|
2009-12-20 19:19:45 +00:00
|
|
|
status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL);
|
2009-12-20 19:19:09 +00:00
|
|
|
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
|
|
"Could not evaluate _PDC, using legacy perf. control.\n"));
|
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2011-02-17 16:36:24 +00:00
|
|
|
void __cpuinit acpi_processor_set_pdc(acpi_handle handle)
|
2009-12-20 19:19:09 +00:00
|
|
|
{
|
2009-12-20 19:19:39 +00:00
|
|
|
struct acpi_object_list *obj_list;
|
|
|
|
|
2009-12-20 19:19:14 +00:00
|
|
|
if (arch_has_acpi_pdc() == false)
|
|
|
|
return;
|
|
|
|
|
2009-12-20 19:19:39 +00:00
|
|
|
obj_list = acpi_processor_alloc_pdc();
|
|
|
|
if (!obj_list)
|
|
|
|
return;
|
|
|
|
|
2009-12-20 19:23:16 +00:00
|
|
|
acpi_processor_eval_pdc(handle, obj_list);
|
2009-12-20 19:23:11 +00:00
|
|
|
|
|
|
|
kfree(obj_list->pointer->buffer.pointer);
|
|
|
|
kfree(obj_list->pointer);
|
|
|
|
kfree(obj_list);
|
2009-12-20 19:19:09 +00:00
|
|
|
}
|
|
|
|
|
2011-02-17 16:33:53 +00:00
|
|
|
static acpi_status __init
|
2009-12-20 19:19:09 +00:00
|
|
|
early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
|
|
|
|
{
|
2010-02-22 19:11:29 +00:00
|
|
|
if (processor_physically_present(handle) == false)
|
|
|
|
return AE_OK;
|
|
|
|
|
2009-12-20 19:23:16 +00:00
|
|
|
acpi_processor_set_pdc(handle);
|
2009-12-20 19:19:09 +00:00
|
|
|
return AE_OK;
|
|
|
|
}
|
|
|
|
|
2009-12-28 18:39:23 +00:00
|
|
|
void __init acpi_early_processor_set_pdc(void)
|
2009-12-20 19:19:09 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Check whether the system is DMI table. If yes, OSPM
|
|
|
|
* should not use mwait for CPU-states.
|
|
|
|
*/
|
|
|
|
dmi_check_system(processor_idle_dmi_table);
|
|
|
|
|
|
|
|
acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
|
|
|
|
ACPI_UINT32_MAX,
|
|
|
|
early_init_pdc, NULL, NULL, NULL);
|
2010-09-18 06:26:24 +00:00
|
|
|
acpi_get_devices("ACPI0007", early_init_pdc, NULL, NULL);
|
2009-12-20 19:19:09 +00:00
|
|
|
}
|