diff options
| author | Alex Chiang <achiang@hp.com> | 2010-02-22 14:11:34 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-03-14 21:17:21 -0400 |
| commit | 3b1da4c5d1032ebc29fec8bd8f592ba6589be8ed (patch) | |
| tree | b6853cbdea5739beff77b4503dd9734c63e85ee1 | |
| parent | 5d554a7bb0643a6151a84319bfeba8270bf5269e (diff) | |
ACPI: processor: remove early _PDC optin quirks
Now that we check for physically present processors before blindly
evaluating _PDC, we no longer need to maintain a DMI opt-in table
nor a kernel param.
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
| -rw-r--r-- | drivers/acpi/processor_core.c | 37 |
2 files changed, 0 insertions, 41 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 3bc48b0bd3a9..e4cbca58536c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -200,10 +200,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 200 | acpi_display_output=video | 200 | acpi_display_output=video |
| 201 | See above. | 201 | See above. |
| 202 | 202 | ||
| 203 | acpi_early_pdc_eval [HW,ACPI] Evaluate processor _PDC methods | ||
| 204 | early. Needed on some platforms to properly | ||
| 205 | initialize the EC. | ||
| 206 | |||
| 207 | acpi_irq_balance [HW,ACPI] | 203 | acpi_irq_balance [HW,ACPI] |
| 208 | ACPI will balance active IRQs | 204 | ACPI will balance active IRQs |
| 209 | default in APIC mode | 205 | default in APIC mode |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index f0c68c1b86dd..ef34faad6003 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -341,36 +341,6 @@ void acpi_processor_set_pdc(acpi_handle handle) | |||
| 341 | } | 341 | } |
| 342 | EXPORT_SYMBOL_GPL(acpi_processor_set_pdc); | 342 | EXPORT_SYMBOL_GPL(acpi_processor_set_pdc); |
| 343 | 343 | ||
| 344 | static int early_pdc_optin; | ||
| 345 | static int set_early_pdc_optin(const struct dmi_system_id *id) | ||
| 346 | { | ||
| 347 | early_pdc_optin = 1; | ||
| 348 | return 0; | ||
| 349 | } | ||
| 350 | |||
| 351 | static int param_early_pdc_optin(char *s) | ||
| 352 | { | ||
| 353 | early_pdc_optin = 1; | ||
| 354 | return 1; | ||
| 355 | } | ||
| 356 | __setup("acpi_early_pdc_eval", param_early_pdc_optin); | ||
| 357 | |||
| 358 | static struct dmi_system_id __cpuinitdata early_pdc_optin_table[] = { | ||
| 359 | { | ||
| 360 | set_early_pdc_optin, "HP Envy", { | ||
| 361 | DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"), | ||
| 362 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Envy") }, NULL}, | ||
| 363 | { | ||
| 364 | set_early_pdc_optin, "HP Pavilion dv6", { | ||
| 365 | DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"), | ||
| 366 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv6") }, NULL}, | ||
| 367 | { | ||
| 368 | set_early_pdc_optin, "HP Pavilion dv7", { | ||
| 369 | DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"), | ||
| 370 | DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7") }, NULL}, | ||
| 371 | {}, | ||
| 372 | }; | ||
| 373 | |||
| 374 | static acpi_status | 344 | static acpi_status |
| 375 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) | 345 | early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) |
| 376 | { | 346 | { |
| @@ -396,13 +366,6 @@ void __init acpi_early_processor_set_pdc(void) | |||
| 396 | */ | 366 | */ |
| 397 | dmi_check_system(processor_idle_dmi_table); | 367 | dmi_check_system(processor_idle_dmi_table); |
| 398 | 368 | ||
| 399 | /* | ||
| 400 | * Allow systems to opt-in to early _PDC evaluation. | ||
| 401 | */ | ||
| 402 | dmi_check_system(early_pdc_optin_table); | ||
| 403 | if (!early_pdc_optin) | ||
| 404 | return; | ||
| 405 | |||
| 406 | acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, | 369 | acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, |
| 407 | ACPI_UINT32_MAX, | 370 | ACPI_UINT32_MAX, |
| 408 | early_init_pdc, NULL, NULL, NULL); | 371 | early_init_pdc, NULL, NULL, NULL); |
