diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-07-22 12:21:36 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-08-05 15:21:49 -0400 |
| commit | 70fda70a724c737b0df4195763f9124d181fe64d (patch) | |
| tree | 0ae756cfa304b3b328fef7d673768f20ce8b9719 /drivers/platform/x86 | |
| parent | 78a7539b881eb557494a7c810625c0307b27296c (diff) | |
x86 driver: fix typo in TDP override enabling
When enabling turbo, we need to set both the TDC and TDP bits. IIRC
only the TDC one actually matters, but fix it up anyway since the
current code is confusing.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/intel_ips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 5ffe7c39814..809a3ae943c 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c | |||
| @@ -403,7 +403,7 @@ static void ips_cpu_raise(struct ips_driver *ips) | |||
| 403 | 403 | ||
| 404 | thm_writew(THM_MPCPC, (new_tdp_limit * 10) / 8); | 404 | thm_writew(THM_MPCPC, (new_tdp_limit * 10) / 8); |
| 405 | 405 | ||
| 406 | turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDC_OVR_EN; | 406 | turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDP_OVR_EN; |
| 407 | wrmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_override); | 407 | wrmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_override); |
| 408 | 408 | ||
| 409 | turbo_override &= ~TURBO_TDP_MASK; | 409 | turbo_override &= ~TURBO_TDP_MASK; |
| @@ -438,7 +438,7 @@ static void ips_cpu_lower(struct ips_driver *ips) | |||
| 438 | 438 | ||
| 439 | thm_writew(THM_MPCPC, (new_limit * 10) / 8); | 439 | thm_writew(THM_MPCPC, (new_limit * 10) / 8); |
| 440 | 440 | ||
| 441 | turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDC_OVR_EN; | 441 | turbo_override |= TURBO_TDC_OVR_EN | TURBO_TDP_OVR_EN; |
| 442 | wrmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_override); | 442 | wrmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_override); |
| 443 | 443 | ||
| 444 | turbo_override &= ~TURBO_TDP_MASK; | 444 | turbo_override &= ~TURBO_TDP_MASK; |