diff options
author | Alex Chiang <achiang@hp.com> | 2009-12-20 14:19:24 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-12-22 03:24:12 -0500 |
commit | 08ea48a326d8030ef5b7fb02292faf5a53c95e0a (patch) | |
tree | c0f9dd9001c50925fc85b18b5f2afc24000d90f6 /arch | |
parent | 407cd87c54e76c266245e8faef8dd4a84b7254fe (diff) |
ACPI: processor: factor out common _PDC settings
Both x86 and ia64 initialize _PDC with mostly common bit settings.
Factor out the common settings and leave the arch-specific ones alone.
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/acpi-processor.c | 10 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/processor.c | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c index ab72d46f52c6..ebe23f58bd6e 100644 --- a/arch/ia64/kernel/acpi-processor.c +++ b/arch/ia64/kernel/acpi-processor.c | |||
@@ -18,15 +18,7 @@ static void init_intel_pdc(struct acpi_processor *pr) | |||
18 | { | 18 | { |
19 | u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer; | 19 | u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer; |
20 | 20 | ||
21 | buf[0] = ACPI_PDC_REVISION_ID; | 21 | buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP; |
22 | buf[1] = 1; | ||
23 | buf[2] = ACPI_PDC_EST_CAPABILITY_SMP; | ||
24 | /* | ||
25 | * The default of PDC_SMP_T_SWCOORD bit is set for IA64 cpu so | ||
26 | * that OSPM is capable of native ACPI throttling software | ||
27 | * coordination using BIOS supplied _TSD info. | ||
28 | */ | ||
29 | buf[2] |= ACPI_PDC_SMP_T_SWCOORD; | ||
30 | 22 | ||
31 | return; | 23 | return; |
32 | } | 24 | } |
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c index 967860b43f2a..d722ca8cb4c7 100644 --- a/arch/x86/kernel/acpi/processor.c +++ b/arch/x86/kernel/acpi/processor.c | |||
@@ -16,16 +16,8 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c) | |||
16 | { | 16 | { |
17 | u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer; | 17 | u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer; |
18 | 18 | ||
19 | buf[0] = ACPI_PDC_REVISION_ID; | 19 | buf[2] |= ACPI_PDC_C_CAPABILITY_SMP; |
20 | buf[1] = 1; | ||
21 | buf[2] = ACPI_PDC_C_CAPABILITY_SMP; | ||
22 | 20 | ||
23 | /* | ||
24 | * The default of PDC_SMP_T_SWCOORD bit is set for intel x86 cpu so | ||
25 | * that OSPM is capable of native ACPI throttling software | ||
26 | * coordination using BIOS supplied _TSD info. | ||
27 | */ | ||
28 | buf[2] |= ACPI_PDC_SMP_T_SWCOORD; | ||
29 | if (cpu_has(c, X86_FEATURE_EST)) | 21 | if (cpu_has(c, X86_FEATURE_EST)) |
30 | buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; | 22 | buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; |
31 | 23 | ||