diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-23 00:18:28 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-23 00:18:28 +0200 |
| commit | 4a973f2495fba8775d1c408b3ee7f2c19b19f13f (patch) | |
| tree | 302484851e44029a208cce8c79294a82f25561d9 /arch/x86 | |
| parent | Merge branch 'bugzilla-102904-workaround' into release (diff) | |
| parent | ACPI: create "processor.bm_check_disable" boot param (diff) | |
| download | linux-4a973f2495fba8775d1c408b3ee7f2c19b19f13f.tar.xz linux-4a973f2495fba8775d1c408b3ee7f2c19b19f13f.zip | |
Merge branch 'bugzilla-15886' into release
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/acpi/cstate.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index 2e837f5080fe..fb7a5f052e2b 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -145,6 +145,15 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, percpu_entry->states[cx->index].eax = cx->address; percpu_entry->states[cx->index].ecx = MWAIT_ECX_INTERRUPT_BREAK; } + + /* + * For _CST FFH on Intel, if GAS.access_size bit 1 is cleared, + * then we should skip checking BM_STS for this C-state. + * ref: "Intel Processor Vendor-Specific ACPI Interface Specification" + */ + if ((c->x86_vendor == X86_VENDOR_INTEL) && !(reg->access_size & 0x2)) + cx->bm_sts_skip = 1; + return retval; } EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe); |