projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c
[powerpc.git]
/
drivers
/
acpi
/
processor_core.c
diff --git
a/drivers/acpi/processor_core.c
b/drivers/acpi/processor_core.c
index
1278aca
..
decaebb
100644
(file)
--- a/
drivers/acpi/processor_core.c
+++ b/
drivers/acpi/processor_core.c
@@
-110,7
+110,7
@@
static struct file_operations acpi_processor_info_fops = {
};
struct acpi_processor *processors[NR_CPUS];
};
struct acpi_processor *processors[NR_CPUS];
-struct acpi_processor_errata errata;
+struct acpi_processor_errata errata
__read_mostly
;
/* --------------------------------------------------------------------------
Errata Handling
/* --------------------------------------------------------------------------
Errata Handling
@@
-246,38
+246,28
@@
static int acpi_processor_errata(struct acpi_processor *pr)
}
/* --------------------------------------------------------------------------
}
/* --------------------------------------------------------------------------
- Common ACPI processor fu
cn
tions
+ Common ACPI processor fu
nc
tions
-------------------------------------------------------------------------- */
/*
* _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features.
*/
-------------------------------------------------------------------------- */
/*
* _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features.
*/
-
-int acpi_processor_set_pdc(struct acpi_processor *pr,
- struct acpi_object_list *pdc_in)
+static int acpi_processor_set_pdc(struct acpi_processor *pr)
{
{
+ struct acpi_object_list *pdc_in = pr->pdc;
acpi_status status = AE_OK;
acpi_status status = AE_OK;
- u32 arg0_buf[3];
- union acpi_object arg0 = { ACPI_TYPE_BUFFER };
- struct acpi_object_list no_object = { 1, &arg0 };
- struct acpi_object_list *pdc;
ACPI_FUNCTION_TRACE("acpi_processor_set_pdc");
ACPI_FUNCTION_TRACE("acpi_processor_set_pdc");
- arg0.buffer.length = 12;
- arg0.buffer.pointer = (u8 *) arg0_buf;
- arg0_buf[0] = ACPI_PDC_REVISION_ID;
- arg0_buf[1] = 0;
- arg0_buf[2] = 0;
-
- pdc = (pdc_in) ? pdc_in : &no_object;
+ if (!pdc_in)
+ return_VALUE(status);
- status = acpi_evaluate_object(pr->handle, "_PDC", pdc, NULL);
+ status = acpi_evaluate_object(pr->handle, "_PDC", pdc
_in
, NULL);
- if (
(ACPI_FAILURE(status)) && (pdc_in
))
+ if (
ACPI_FAILURE(status
))
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-
"Error evaluating
_PDC, using legacy perf. control...\n"));
+
"Could not evaluate
_PDC, using legacy perf. control...\n"));
return_VALUE(status);
}
return_VALUE(status);
}
@@
-357,7
+347,6
@@
static int acpi_processor_add_fs(struct acpi_device *device)
ACPI_PROCESSOR_FILE_THROTTLING));
else {
entry->proc_fops = &acpi_processor_throttling_fops;
ACPI_PROCESSOR_FILE_THROTTLING));
else {
entry->proc_fops = &acpi_processor_throttling_fops;
- entry->proc_fops->write = acpi_processor_write_throttling;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
@@
-372,7
+361,6
@@
static int acpi_processor_add_fs(struct acpi_device *device)
ACPI_PROCESSOR_FILE_LIMIT));
else {
entry->proc_fops = &acpi_processor_limit_fops;
ACPI_PROCESSOR_FILE_LIMIT));
else {
entry->proc_fops = &acpi_processor_limit_fops;
- entry->proc_fops->write = acpi_processor_write_limit;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
@@
-400,7
+388,7
@@
static int acpi_processor_remove_fs(struct acpi_device *device)
/* Use the acpiid in MADT to map cpus in case of SMP */
#ifndef CONFIG_SMP
/* Use the acpiid in MADT to map cpus in case of SMP */
#ifndef CONFIG_SMP
-#define convert_acpiid_to_cpu(acpi_id) (
0xff
)
+#define convert_acpiid_to_cpu(acpi_id) (
-1
)
#else
#ifdef CONFIG_IA64
#else
#ifdef CONFIG_IA64
@@
-413,7
+401,7
@@
static int acpi_processor_remove_fs(struct acpi_device *device)
#define ARCH_BAD_APICID (0xff)
#endif
#define ARCH_BAD_APICID (0xff)
#endif
-static
u8
convert_acpiid_to_cpu(u8 acpi_id)
+static
int
convert_acpiid_to_cpu(u8 acpi_id)
{
u16 apic_id;
int i;
{
u16 apic_id;
int i;
@@
-439,7
+427,7
@@
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 };
acpi_status status = 0;
union acpi_object object = { 0 };
struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
-
u8
cpu_index;
+
int
cpu_index;
static int cpu0_initialized;
ACPI_FUNCTION_TRACE("acpi_processor_get_info");
static int cpu0_initialized;
ACPI_FUNCTION_TRACE("acpi_processor_get_info");
@@
-485,7
+473,7
@@
static int acpi_processor_get_info(struct acpi_processor *pr)
cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
/* Handle UP system running SMP kernel, with no LAPIC in MADT */
cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
/* Handle UP system running SMP kernel, with no LAPIC in MADT */
- if (!cpu0_initialized && (cpu_index ==
0xff
) &&
+ if (!cpu0_initialized && (cpu_index ==
-1
) &&
(num_online_cpus() == 1)) {
cpu_index = 0;
}
(num_online_cpus() == 1)) {
cpu_index = 0;
}
@@
-499,7
+487,7
@@
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.
*/
* less than the max # of CPUs. They should be ignored _iff
* they are physically not present.
*/
- if (cpu_index
>= NR_CPUS
) {
+ if (cpu_index
== -1
) {
if (ACPI_FAILURE
(acpi_processor_hotadd_init(pr->handle, &pr->id))) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
if (ACPI_FAILURE
(acpi_processor_hotadd_init(pr->handle, &pr->id))) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@
-570,8
+558,8
@@
static int acpi_processor_start(struct acpi_device *device)
*/
if (processor_device_array[pr->id] != NULL &&
processor_device_array[pr->id] != (void *)device) {
*/
if (processor_device_array[pr->id] != NULL &&
processor_device_array[pr->id] != (void *)device) {
-
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting
wrong ACPI id"
- "for the processor\n")
)
;
+
printk(KERN_WARNING "BIOS reported
wrong ACPI id"
+ "for the processor\n");
return_VALUE(-ENODEV);
}
processor_device_array[pr->id] = (void *)device;
return_VALUE(-ENODEV);
}
processor_device_array[pr->id] = (void *)device;
@@
-589,6
+577,10
@@
static int acpi_processor_start(struct acpi_device *device)
"Error installing device notify handler\n"));
}
"Error installing device notify handler\n"));
}
+ /* _PDC call should be done before doing anything else (if reqd.). */
+ arch_acpi_processor_init_pdc(pr);
+ acpi_processor_set_pdc(pr);
+
acpi_processor_power_init(pr, device);
if (pr->flags.throttling) {
acpi_processor_power_init(pr, device);
if (pr->flags.throttling) {