ACPI: plan to delete "acpi=ht" boot option

[safe/jmp/linux-2.6] / drivers / acpi / processor_pdc.c

diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index e786e2c..e306ba9 100644 (file)
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -54,26 +54,24 @@ static void acpi_set_pdc_bits(u32 *buf)
        arch_acpi_set_pdc_bits(buf);
 }
 
-static void acpi_processor_init_pdc(struct acpi_processor *pr)
+static struct acpi_object_list *acpi_processor_alloc_pdc(void)
 {
        struct acpi_object_list *obj_list;
        union acpi_object *obj;
        u32 *buf;
 
-       pr->pdc = NULL;
-
        /* 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");
-               return;
+               return NULL;
        }
 
        obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
        if (!obj) {
                printk(KERN_ERR "Memory allocation error\n");
                kfree(obj_list);
-               return;
+               return NULL;
        }
 
        buf = kmalloc(12, GFP_KERNEL);
@@ -81,7 +79,7 @@ static void acpi_processor_init_pdc(struct acpi_processor *pr)
                printk(KERN_ERR "Memory allocation error\n");
                kfree(obj);
                kfree(obj_list);
-               return;
+               return NULL;
        }
 
        acpi_set_pdc_bits(buf);
@@ -91,22 +89,19 @@ static void acpi_processor_init_pdc(struct acpi_processor *pr)
        obj->buffer.pointer = (u8 *) buf;
        obj_list->count = 1;
        obj_list->pointer = obj;
-       pr->pdc = obj_list;
 
-       return;
+       return obj_list;
 }
 
 /*
  * _PDC is required for a BIOS-OS handshake for most of the newer
  * ACPI processor features.
  */
-static int acpi_processor_eval_pdc(struct acpi_processor *pr)
+static int
+acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
 {
-       struct acpi_object_list *pdc_in = pr->pdc;
        acpi_status status = AE_OK;
 
-       if (!pdc_in)
-               return status;
        if (idle_nomwait) {
                /*
                 * If mwait is disabled for CPU C-states, the C2C3_FFH access
@@ -121,7 +116,7 @@ static int acpi_processor_eval_pdc(struct acpi_processor *pr)
                buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
 
        }
-       status = acpi_evaluate_object(pr->handle, "_PDC", pdc_in, NULL);
+       status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL);
 
        if (ACPI_FAILURE(status))
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -130,47 +125,68 @@ static int acpi_processor_eval_pdc(struct acpi_processor *pr)
        return status;
 }
 
-static void acpi_processor_cleanup_pdc(struct acpi_processor *pr)
-{
-       if (pr->pdc) {
-               kfree(pr->pdc->pointer->buffer.pointer);
-               kfree(pr->pdc->pointer);
-               kfree(pr->pdc);
-               pr->pdc = NULL;
-       }
-}
+static int early_pdc_done;
 
-void acpi_processor_set_pdc(struct acpi_processor *pr)
+void acpi_processor_set_pdc(acpi_handle handle)
 {
+       struct acpi_object_list *obj_list;
+
        if (arch_has_acpi_pdc() == false)
                return;
 
-       acpi_processor_init_pdc(pr);
-       acpi_processor_eval_pdc(pr);
-       acpi_processor_cleanup_pdc(pr);
+       if (early_pdc_done)
+               return;
+
+       obj_list = acpi_processor_alloc_pdc();
+       if (!obj_list)
+               return;
+
+       acpi_processor_eval_pdc(handle, obj_list);
+
+       kfree(obj_list->pointer->buffer.pointer);
+       kfree(obj_list->pointer);
+       kfree(obj_list);
 }
 EXPORT_SYMBOL_GPL(acpi_processor_set_pdc);
 
-static acpi_status
-early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
+static int early_pdc_optin;
+static int set_early_pdc_optin(const struct dmi_system_id *id)
 {
-       struct acpi_processor pr;
-
-       pr.handle = handle;
+       early_pdc_optin = 1;
+       return 0;
+}
 
-       /* x86 implementation looks at pr.id to determine some
-        * CPU capabilites. We can just hard code to 0 since we're
-        * assuming the CPUs in the system are homogenous and all
-        * have the same capabilities.
-        */
-       pr.id = 0;
+static int param_early_pdc_optin(char *s)
+{
+       early_pdc_optin = 1;
+       return 1;
+}
+__setup("acpi_early_pdc_eval", param_early_pdc_optin);
 
-       acpi_processor_set_pdc(&pr);
+static struct dmi_system_id __cpuinitdata early_pdc_optin_table[] = {
+       {
+       set_early_pdc_optin, "HP Envy", {
+       DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
+       DMI_MATCH(DMI_PRODUCT_NAME, "HP Envy") }, NULL},
+       {
+       set_early_pdc_optin, "HP Pavilion dv6", {
+       DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
+       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv6") }, NULL},
+       {
+       set_early_pdc_optin, "HP Pavilion dv7", {
+       DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
+       DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7") }, NULL},
+       {},
+};
 
+static acpi_status
+early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+       acpi_processor_set_pdc(handle);
        return AE_OK;
 }
 
-void acpi_early_processor_set_pdc(void)
+void __init acpi_early_processor_set_pdc(void)
 {
        /*
         * Check whether the system is DMI table. If yes, OSPM
@@ -178,7 +194,16 @@ void acpi_early_processor_set_pdc(void)
         */
        dmi_check_system(processor_idle_dmi_table);
 
+       /*
+        * Allow systems to opt-in to early _PDC evaluation.
+        */
+       dmi_check_system(early_pdc_optin_table);
+       if (!early_pdc_optin)
+               return;
+
        acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
                            ACPI_UINT32_MAX,
                            early_init_pdc, NULL, NULL, NULL);
+
+       early_pdc_done = 1;
 }