From c3ea2b16cf2081b0685483169d6b9d4151767d8d Mon Sep 17 00:00:00 2001 From: David Chao Date: Thu, 26 May 2022 15:58:42 +0800 Subject: [PATCH] thermal: update thermal config 1) add usbc overheat mitigation v0.1. 2) add VIRTUAL-SKIN formula v0.1. 3) enable thermal throttling as P10 device. Bug: 231404311 Bug: 229581307 Test: Build and boot on device. Change-Id: I6d2f3c4860112df43aef9eedaef121a1f47365d4 Signed-off-by: David Chao --- thermal_info_config_lynx.json | 775 +++++++++++++++++++++++----------- 1 file changed, 531 insertions(+), 244 deletions(-) diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index dba54ac..13a59b1 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -3,76 +3,296 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], + "Multiplier":0.001 + }, + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"skin_therm1", + "Type":"UNKNOWN", + "HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], + "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"skin_therm2", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-SKIN2-USB2", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2"], + "Coefficient":[0.4, 0.3, 0.3], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN2-SKIN1-GNSS-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["skin_therm2", "skin_therm1", "gnss_tcxo_therm", "battery"], + "Coefficient":[0.2, 0.2, 0.1, 0.5], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN", + "Type":"SKIN", + "Version":"0.1", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "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, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "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, + "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_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2500, 1300, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"], + "E_Integral_Default": 50 + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "LimitInfo": [0, 0, 0, 0, 12, 14, 14] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "LimitInfo": [0, 0, 0, 0, 15, 17, 17] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2S_VDD_G3D", + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 3, 6, 6, 8, 8, 8], + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 3, 3, 8 ,8 ,8], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":"skin_therm1", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"], + "Coefficient":[1.0, 1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], + "Multiplier":0.001, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"USB-MINUS-SKIN2", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["usb_pwr_therm", "skin_therm2"], + "Coefficient":[1.0, -1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Version":"0.1", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm", + "Combination":["usb_pwr_therm", "USB-MINUS-SKIN2"], + "Coefficient":[40000, 10000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "2.0", "NAN", "NAN"], + "BindedCdevInfo": [ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } ], "VrThreshold":"NAN", - "Multiplier":0.001 + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-USB-UI", + "Type":"USB_PORT", + "Version":"0.1", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm", + "Combination":["usb_pwr_therm", "USB-MINUS-SKIN2"], + "Coefficient":[40000, 13000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "2.0", "NAN"], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true, + "PollingDelay":60000, + "PassiveDelay":7000 }, { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "Multiplier":0.001 + }, + { + "Name":"BIG", + "Type":"CPU", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], + "Multiplier":0.001 + }, + { + "Name":"TPU", + "Type":"NPU", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 115.0], "Multiplier":0.001 }, { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":1, "Monitor":false }, @@ -82,26 +302,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1150" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":[-10000, 400, 1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "Multiplier":1, "Monitor":true }, @@ -111,26 +314,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1150" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":[-10000, 400, 1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -138,217 +324,286 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - 93, - 96, - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], + "Multiplier":1, + "Monitor":true + }, + { + "Name":"BCL_TPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "TriggerSensor": "ocp_tpu", + "Combination":["ocp_tpu", "battery"], + "Coefficient":[1, -10], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PollingDelay":300000, - "PassiveDelay":5000, + "PassiveDelay":500, "BindedCdevInfo": [ { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] } ] }, { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1150, - "NAN", - "NAN" + "Name":"BCL_GPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "TriggerSensor": "ocp_gpu", + "Combination":["ocp_gpu", "battery"], + "Coefficient":[1, -10], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 9, 9, 9] + } + ] + }, + { + "Name":"BCL_BATOILO_GPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":["batoilo", "ocp_gpu", "battery"], + "Coefficient":[5000, 12000, -1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 9, 9, 9] + } + ] + }, + { + "Name":"BCL_BATOILO_TPU_LOW_TEMP", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":["batoilo", "ocp_tpu", "battery"], + "Coefficient":[5000, 12000, -1000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + } + ] + }, + { + "Name":"BCL_BATOILO_GPU", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":["batoilo", "ocp_gpu"], + "Coefficient":[5000, 12000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] + }, + { + "Name":"BCL_BATOILO_TPU", + "Type":"BCL_CURRENT", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "batoilo", + "Combination":[ + "batoilo", + "ocp_tpu" ], - "VrThreshold":"NAN", + "Coefficient":[5000, 12000], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], + "Multiplier":1, + "Monitor":true, + "PassiveDelay":500, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 6, 6, 6] + } + ] + }, + { + "Name":"batoilo", + "Type":"BCL_CURRENT", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], + "Multiplier":1, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] + }, + { + "Name":"BCL_AUDIO_BAACL", + "Type":"BCL_VOLTAGE", + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "soc", + "Combination":["battery", "soc"], + "Coefficient":[-25000, 80], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true }, + { + "Name":"vdroop1", + "Type":"BCL_VOLTAGE", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], + "Multiplier":1, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] + }, { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1350, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1400, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"soft_ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "Monitor":true - }, - { - "Name":"TPU", - "Type":"NPU", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 115.0 - ], - "VrThreshold":"NAN", - "Multiplier":0.001 + "Hidden":true } ], "CoolingDevices":[ @@ -356,19 +611,42 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600] }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750] }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750] + }, + { + "Name":"thermal-gpufreq-0", + "Type":"GPU", + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", + "State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452] + }, + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + }, + { + "Name":"tpu_cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" } ], "PowerRails":[ @@ -380,19 +658,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -402,6 +680,15 @@ }, { "Name":"S2S_VDD_G3D", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, + { + "Name":"PARTIAL_SYSTEM_POWER", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":14000, "PowerSampleCount":5 }