diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-10-05 20:54:06 +0200 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-10-05 20:59:35 +0200 |
| commit | d24a9da573444ab4aff38af2f4a0da07408ff491 (patch) | |
| tree | f217ec69296dd5c73d26d10f5cc1ab1e453e3d0e /drivers/platform | |
| parent | [PATCH 2/2] IPS driver: disable CPU turbo (diff) | |
| download | linux-d24a9da573444ab4aff38af2f4a0da07408ff491.tar.xz linux-d24a9da573444ab4aff38af2f4a0da07408ff491.zip | |
IPS driver: Fix limit clamping when reducing CPU power
Values here are in internal units rather than Watts, so we shouldn't
perform any conversion.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel_ips.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 4b3ecdefd6e9..c44a5e8b8b82 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -415,7 +415,7 @@ static void ips_cpu_lower(struct ips_driver *ips) new_limit = cur_limit - 8; /* 1W decrease */ /* Clamp to SKU TDP limit */ - if (((new_limit * 10) / 8) < (ips->orig_turbo_limit & TURBO_TDP_MASK)) + if (new_limit < (ips->orig_turbo_limit & TURBO_TDP_MASK)) new_limit = ips->orig_turbo_limit & TURBO_TDP_MASK; thm_writew(THM_MPCPC, (new_limit * 10) / 8); |