diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-05 11:26:22 -0700 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-10-05 14:59:25 -0400 |
| commit | 4fd07ac00d87b942cc8d8f30a27192fea2fc4ab2 (patch) | |
| tree | 64b9b818b8a1ae4f01a3adee62e3f2474025b058 | |
| parent | 070c0ee1ef9f5550cac9247190f0289349f28c01 (diff) | |
| download | linux-hpc-4fd07ac00d87b942cc8d8f30a27192fea2fc4ab2.tar.gz | |
IPS driver: apply BIOS provided CPU limit if different from default
The BIOS may hand us a lower CPU power limit than the default for a
given SKU. We should use it in case the platform isn't designed to
dissapate the full TDP of a given part.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
| -rw-r--r-- | drivers/platform/x86/intel_ips.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 76e41dc45f764e..50ab1c93e369cb 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -1391,9 +1391,10 @@ static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips) tdp = turbo_power & TURBO_TDP_MASK; /* Sanity check TDP against CPU */ - if (limits->mcp_power_limit != (tdp / 8) * 1000) { - dev_warn(&ips->dev->dev, "Warning: CPU TDP doesn't match expected value (found %d, expected %d)\n", - tdp / 8, limits->mcp_power_limit / 1000); + if (limits->core_power_limit != (tdp / 8) * 1000) { + dev_info(&ips->dev->dev, "CPU TDP doesn't match expected value (found %d, expected %d)\n", + tdp / 8, limits->core_power_limit / 1000); + limits->core_power_limit = (tdp / 8) * 1000; } out: |