From 9f17360f7b43261874c0ffd96114b430209738fe Mon Sep 17 00:00:00 2001 From: David Chao Date: Wed, 28 Sep 2022 19:01:48 +0800 Subject: [PATCH] thermal: more aggressive thermal throttling policy - CPU/GPU more aggressive throttling Bug: 248392264 Test: boot to home and thermal throttling worked properly Change-Id: Idfa7ec21877a11000d2c6d17e4bbcabc9606f58c --- powerhint.json | 136 +++++++++++++++++----------------- thermal_info_config_lynx.json | 35 ++++++--- 2 files changed, 92 insertions(+), 79 deletions(-) diff --git a/powerhint.json b/powerhint.json index 08790a3..8b7b688 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1322,409 +1322,409 @@ "Value": "572000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "TpuControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "TpuSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatThreads", "Duration": 0, "Value": "6" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3,4,5" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "TpuControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "TpuSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "TpuControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "TpuSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "TpuControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "TpuSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "TpuControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "TpuSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index e57b09d..92ddca6 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -113,7 +113,6 @@ "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, @@ -124,6 +123,21 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, { "Name":"VIRTUAL-SKIN-CPU-GPU", "Type":"UNKNOWN", @@ -133,22 +147,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], "Coefficient":[1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 39.0, 40.0, 41.0, 47.0, 52.0, 55.0], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0], "HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1800, 500, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 400, 500, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 400, 500, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"], - "I_Default": 1000, + "I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2000, 1100, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 10000, 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"], "TranCycle": 5 }, "BindedCdevInfo": [