diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-02-06 11:17:12 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 16:06:12 -0400 |
| commit | c264c651fd318274ffe27219947f17f24f07c073 (patch) | |
| tree | 3c90ba2baf22c1cac74e7cdb19b835cd31c33756 | |
| parent | 9bcb8118965ab4631a65ee0726e6518f75cda6c5 (diff) | |
Disable MCP limit exceeded messages from Intel IPS driver
On a system on the thermal limit these are quite noisy and flood the logs.
Better would be a counter anyways. But given that we don't even have
anything for normal throttling this doesn't seem to be urgent either.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/platform/x86/intel_ips.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 88a98cff5a44..f7ba316e0ed6 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c | |||
| @@ -609,25 +609,16 @@ static bool mcp_exceeded(struct ips_driver *ips) | |||
| 609 | bool ret = false; | 609 | bool ret = false; |
| 610 | u32 temp_limit; | 610 | u32 temp_limit; |
| 611 | u32 avg_power; | 611 | u32 avg_power; |
| 612 | const char *msg = "MCP limit exceeded: "; | ||
| 613 | 612 | ||
| 614 | spin_lock_irqsave(&ips->turbo_status_lock, flags); | 613 | spin_lock_irqsave(&ips->turbo_status_lock, flags); |
| 615 | 614 | ||
| 616 | temp_limit = ips->mcp_temp_limit * 100; | 615 | temp_limit = ips->mcp_temp_limit * 100; |
| 617 | if (ips->mcp_avg_temp > temp_limit) { | 616 | if (ips->mcp_avg_temp > temp_limit) |
| 618 | dev_info(&ips->dev->dev, | ||
| 619 | "%sAvg temp %u, limit %u\n", msg, ips->mcp_avg_temp, | ||
| 620 | temp_limit); | ||
| 621 | ret = true; | 617 | ret = true; |
| 622 | } | ||
| 623 | 618 | ||
| 624 | avg_power = ips->cpu_avg_power + ips->mch_avg_power; | 619 | avg_power = ips->cpu_avg_power + ips->mch_avg_power; |
| 625 | if (avg_power > ips->mcp_power_limit) { | 620 | if (avg_power > ips->mcp_power_limit) |
| 626 | dev_info(&ips->dev->dev, | ||
| 627 | "%sAvg power %u, limit %u\n", msg, avg_power, | ||
| 628 | ips->mcp_power_limit); | ||
| 629 | ret = true; | 621 | ret = true; |
| 630 | } | ||
| 631 | 622 | ||
| 632 | spin_unlock_irqrestore(&ips->turbo_status_lock, flags); | 623 | spin_unlock_irqrestore(&ips->turbo_status_lock, flags); |
| 633 | 624 | ||
