Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / drivers / acpi / processor_core.c

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index ac2dfa63646ca9fa7aee8d18cb3b2e3fb0821fad..99a3a28594daf333eb8c9355f2a886ed43f5f626 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -253,31 +253,21 @@ static int acpi_processor_errata(struct acpi_processor *pr)
  * _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;
-       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");
 
-       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,
-                                 "Error evaluating _PDC, using legacy perf. control...\n"));
+                   "Could not evaluate _PDC, using legacy perf. control...\n"));
 
        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;
-               entry->proc_fops->write = acpi_processor_write_throttling;
                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;
-               entry->proc_fops->write = acpi_processor_write_limit;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
@@ -413,20 +401,18 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
 #define ARCH_BAD_APICID                (0xff)
 #endif
 
-static int convert_acpiid_to_cpu(u8 acpi_id, unsigned int *cpu_index)
+static u8 convert_acpiid_to_cpu(u8 acpi_id)
 {
        u16 apic_id;
-       unsigned int i;
+       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) {
-                       *cpu_index = i;
-                       return 0;
-               }
+               if (arch_cpu_to_apicid[i] == apic_id)
+                       return i;
        }
        return -1;
 }
@@ -441,8 +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 };
-       unsigned int  cpu_index;
-       int retval;
+       u8 cpu_index;
        static int cpu0_initialized;
 
        ACPI_FUNCTION_TRACE("acpi_processor_get_info");
@@ -485,10 +470,10 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
         */
        pr->acpi_id = object.processor.proc_id;
 
-       retval = convert_acpiid_to_cpu(pr->acpi_id, &cpu_index);
+       cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
 
        /* Handle UP system running SMP kernel, with no LAPIC in MADT */
-       if (!cpu0_initialized && retval &&
+       if (!cpu0_initialized && (cpu_index == 0xff) &&
            (num_online_cpus() == 1)) {
                cpu_index = 0;
        }
@@ -502,10 +487,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 (retval) {
+       if (cpu_index >= NR_CPUS) {
                if (ACPI_FAILURE
                    (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                          "Error getting cpuindex for acpiid 0x%x\n",
                                          pr->acpi_id));
                        return_VALUE(-ENODEV);
@@ -546,6 +531,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
        return_VALUE(0);
 }
 
+static void *processor_device_array[NR_CPUS];
+
 static int acpi_processor_start(struct acpi_device *device)
 {
        int result = 0;
@@ -564,6 +551,19 @@ static int acpi_processor_start(struct acpi_device *device)
 
        BUG_ON((pr->id >= NR_CPUS) || (pr->id < 0));
 
+       /*
+        * Buggy BIOS check
+        * ACPI id of processors can be reported wrongly by the BIOS.
+        * Don't trust it blindly
+        */
+       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"));
+               return_VALUE(-ENODEV);
+       }
+       processor_device_array[pr->id] = (void *)device;
+
        processors[pr->id] = pr;
 
        result = acpi_processor_add_fs(device);
@@ -577,6 +577,10 @@ static int acpi_processor_start(struct acpi_device *device)
                                  "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) {
@@ -736,7 +740,7 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
                return_VALUE(-ENODEV);
 
        if ((pr->id >= 0) && (pr->id < NR_CPUS)) {
-               kobject_hotplug(&(*device)->kobj, KOBJ_ONLINE);
+               kobject_uevent(&(*device)->kobj, KOBJ_ONLINE);
        }
        return_VALUE(0);
 }
@@ -776,13 +780,13 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
                }
 
                if (pr->id >= 0 && (pr->id < NR_CPUS)) {
-                       kobject_hotplug(&device->kobj, KOBJ_OFFLINE);
+                       kobject_uevent(&device->kobj, KOBJ_OFFLINE);
                        break;
                }
 
                result = acpi_processor_start(device);
                if ((!result) && ((pr->id >= 0) && (pr->id < NR_CPUS))) {
-                       kobject_hotplug(&device->kobj, KOBJ_ONLINE);
+                       kobject_uevent(&device->kobj, KOBJ_ONLINE);
                } else {
                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                          "Device [%s] failed to start\n",
@@ -806,7 +810,7 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
                }
 
                if ((pr->id < NR_CPUS) && (cpu_present(pr->id)))
-                       kobject_hotplug(&device->kobj, KOBJ_OFFLINE);
+                       kobject_uevent(&device->kobj, KOBJ_OFFLINE);
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,