From a87e3702a65f6dd2b0d0b2d319da809be440781a Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Fri, 3 Feb 2017 15:23:53 -0800 Subject: msm8996-common: thermal-config: throttling before shutdown Add more aggressive throttling before shutdown Change thermal shutdown to 60C Fix wrong temperature in SKIN-MID-FLOOR Bug: 33276816 Bug: 35933344 Test: on marlin Change-Id: Id20f2299beb7772bbe376342642814b01369731c --- configs/thermal-engine.conf | 27 +++++++++++++++++++++++---- thermal/thermal.c | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf index 9314cc2..30a9bd2 100644 --- a/configs/thermal-engine.conf +++ b/configs/thermal-engine.conf @@ -2,8 +2,8 @@ algo_type monitor sampling 1000 sensor emmc_therm -thresholds 65000 -thresholds_clr 64000 +thresholds 60000 +thresholds_clr 59000 actions shutdown action_info 1 @@ -22,7 +22,7 @@ algo_type ss sampling 2000 sensor emmc_therm device cpu_voltage -set_point 48000 +set_point 49000 set_point_clr 48000 device_perf_floor 1440000 time_constant 0 @@ -33,10 +33,29 @@ sampling 2000 sensor emmc_therm device cpu_voltage set_point 51000 -set_point_clr 49000 +set_point_clr 50000 device_perf_floor 1132800 time_constant 0 +[SKIN-RESTRICT-FLOOR] +algo_type ss +sampling 2000 +sensor emmc_therm +device cpu_voltage +set_point 54000 +set_point_clr 52000 +device_perf_floor 768000 +time_constant 0 + +[SKIN-CRITICAL] +algo_type monitor +sensor emmc_therm +sampling 1000 +thresholds 56000 58000 +thresholds_clr 55000 57000 +actions cluster0+cluster1+gpu cluster0+cluster1+gpu +action_info 691200+691200+133000000 307200+307200+133000000 + [HOT-SKIN-VIRTUAL] algo_type virtual trip_sensor emmc_therm diff --git a/thermal/thermal.c b/thermal/thermal.c index f75a760..5b51673 100644 --- a/thermal/thermal.c +++ b/thermal/thermal.c @@ -49,7 +49,7 @@ const int CPU_SENSORS[] = {4, 6, 9, 11}; #define BATTERY_SHUTDOWN_THRESHOLD 60 // device/zuk/msm8996-common/configs/thermal-engine.conf #define SKIN_THROTTLING_THRESHOLD 47 -#define SKIN_SHUTDOWN_THRESHOLD 65 +#define SKIN_SHUTDOWN_THRESHOLD 60 #define VR_THROTTLED_BELOW_MIN 58 #define GPU_LABEL "GPU" -- cgit v1.2.3