summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSameer Nanda <snanda@chromium.org>2012-10-15 11:27:09 -0700
committerVic Yang <victoryang@chromium.org>2012-10-16 21:14:26 -0700
commita73d4a88816dae109008019f9944c9963490c137 (patch)
tree5c99480fcb66db9491ed89d71a19407ffd8b700f
parent5c85a4fadf857d55532f4f854a403db8ed145fb4 (diff)
downloadchrome-ec-a73d4a88816dae109008019f9944c9963490c137.tar.gz
temp_metrics: disable ACPI thermal zone 1
ACPI thermal zone 0 is used for critical thermal events while thermal zone 1 is used for asserting (internal) prochot and duty cycling. Since the equivalent of thermal zone 1 functionality exists in temp_metrics, disable ACPI's thermal zone 1 in order to prevent conflicts between ACPI and temp_metrics. BUG=chrome-os-partner:9193 TEST='cat /sys/class/thermal/thermal_zone1/mode' and check that it is disabled. BRANCH=none Original-Change-Id: I689e8e5c1747c5f259f4a72a9f86396f4aa5c0b2 Signed-off-by: Sameer Nanda <snanda@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/35593 Reviewed-by: Vincent Palatin <vpalatin@chromium.org> (cherry picked from commit 4dd3940d19196fc3f872f08ec30d6d5a6ad8ef28) Change-Id: Ib286cab8fad0323df72198467e2c7e5ddcbcdf09 Signed-off-by: Vic Yang <victoryang@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/35800
-rw-r--r--util/temp_metrics.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/util/temp_metrics.conf b/util/temp_metrics.conf
index 5dba2c04bc..8c39b71d8a 100644
--- a/util/temp_metrics.conf
+++ b/util/temp_metrics.conf
@@ -321,6 +321,12 @@ script
set_fan_rpm $rpm
}
+ # Thermal zone 1 is for operating systems where a userland thermal loop
+ # doesn't exist. Disable it.
+ if [ -e /sys/class/thermal/thermal_zone1/mode ]; then
+ echo -n 'disabled' > /sys/class/thermal/thermal_zone1/mode
+ fi
+
# Get list of sensors to monitor.
sensor_list=$(get_sensor_list)