diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index a9766c5..67032b3 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -50,7 +50,7 @@ "Type":"UNKNOWN", "HotThreshold":[ "NAN", - "40.0", + "NAN", "NAN", "NAN", "NAN", @@ -58,9 +58,7 @@ "NAN" ], "VrThreshold":"NAN", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", @@ -93,18 +91,66 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-GNSS-BATT", + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.9", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-QI-GNSS", "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ - "gnss_tcxo_therm", - "battery" + "qi_therm", + "gnss_tcxo_therm" ], "Coefficient":[ - "0.375", - "0.625" + "0.25", + "0.75" ], + "Offset":-5500, "HotThreshold":[ "NAN", "NAN", @@ -127,9 +173,62 @@ "battery" ], "Coefficient":[ - "0.25", - "0.75" + "0.22", + "0.78" ], + "Offset":-500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB2-DISP", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "disp_therm" + ], + "Coefficient":[ + "0.16", + "0.84" + ], + "Offset":1500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-BATT", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "quiet_therm", + "battery" + ], + "Coefficient":[ + "2.15", + "-1.15" + ], + "Offset":-2000, "HotThreshold":[ "NAN", "NAN", @@ -146,14 +245,16 @@ "Name":"VIRTUAL-SKIN", "Type":"SKIN", "VirtualSensor":true, - "TriggerSensor":"neutral_therm", + "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "neutral_therm", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-BATT" + "VIRTUAL-QI-GNSS", + "VIRTUAL-QI-BATT", + "VIRTUAL-USB2-DISP", + "VIRTUAL-QUIET-BATT" ], "Coefficient":[ + "1.0", "1.0", "1.0", "1.0" @@ -179,7 +280,7 @@ "VrThreshold":"NAN", "Multiplier":0.001, "Monitor":true, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 1700, "NAN", "NAN", "NAN", "NAN"], @@ -196,8 +297,8 @@ { "CdevRequest": "thermal-cpufreq-0", "CdevWeightForPID":0.9, - "CdevCeilingForPID":8, - "LimitInfo": [0, 0, 0, 9, 10, 12, 12], + "CdevCeilingForPID":6, + "LimitInfo": [0, 0, 0, 7, 8, 10, 10], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerSampleDelay":14000, "PowerSampleCount":5, @@ -206,8 +307,8 @@ { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID":1.1, - "CdevCeilingForPID":9, - "LimitInfo": [0, 0, 0, 10, 11, 13, 13], + "CdevCeilingForPID":7, + "LimitInfo": [0, 0, 0, 8, 9, 11, 11], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerSampleDelay":14000, "PowerSampleCount":5, @@ -216,8 +317,8 @@ { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID":2.9, - "CdevCeilingForPID":10, - "LimitInfo": [0, 0, 0, 11, 12, 14, 14], + "CdevCeilingForPID":12, + "LimitInfo": [0, 0, 0, 13, 14, 16, 16], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerSampleDelay":14000, "PowerSampleCount":5, @@ -247,14 +348,16 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor":"neutral_therm", + "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "neutral_therm", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-BATT" + "VIRTUAL-QI-GNSS", + "VIRTUAL-QI-BATT", + "VIRTUAL-USB2-DISP", + "VIRTUAL-QUIET-BATT" ], "Coefficient":[ + "1.0", "1.0", "1.0", "1.0" @@ -265,7 +368,7 @@ "NAN", "NAN", "NAN", - "55.0", + "54.0", "NAN" ], "HotHysteresis":[ @@ -279,7 +382,9 @@ ], "VrThreshold":"NAN", "Multiplier":0.001, - "Monitor":true + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000 }, { "Name":"LITTLE", @@ -311,6 +416,21 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, + { + "Name":"BIG", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 115.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, { "Name":"G3D", "Type":"GPU", @@ -614,29 +734,29 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "921", "684", "568", "479", "359", "322", "265", "228", "171", "117", "86", "41"], - "PowerRail":"S4M_VDD_CPUCL0" + "State2Power":["684", "568", "479", "359", "322", "265", "228", "171", "117", "86", "41"], + "PowerRail":"S4M_VDD_CPUCL0" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1335", "1118", "926", "744", "590", "466", "365", "308", "232", "190", "156", "129", "93", "62"], - "PowerRail":"S3M_VDD_CPUCL1" + "State2Power":["926", "744", "590", "466", "365", "308", "232", "190", "156", "129", "93", "62"], + "PowerRail":"S3M_VDD_CPUCL1" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["3215", "2986", "2563", "2215", "2036", "1702", "1341", "1191", "964", "791", "658", "519", "420", "344", "176"], - "PowerRail":"S2M_VDD_CPUCL2" + "State2Power":["3326", "3300", "3215", "2986", "2563", "2215", "2036", "1702", "1341", "1191", "964", "791", "658", "519", "420", "344", "176"], + "PowerRail":"S2M_VDD_CPUCL2" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", "State2Power":["3950", "3368", "2933", "2278", "2075", "1807", "1508", "1305", "1100", "916", "737", "565"], - "PowerRail":"S2S_VDD_G3D" + "PowerRail":"S2S_VDD_G3D" }, { "Name":"fcc", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index ba3a340..44027e1 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -50,7 +50,7 @@ "Type":"UNKNOWN", "HotThreshold":[ "NAN", - "40.0", + "NAN", "NAN", "NAN", "NAN", @@ -58,9 +58,7 @@ "NAN" ], "VrThreshold":"NAN", - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", @@ -92,6 +90,105 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "34.2", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-DISP", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "disp_therm" + ], + "Coefficient":[ + "0.55", + "0.45" + ], + "Offset":1000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB2-BATT", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "battery" + ], + "Coefficient":[ + "0.05", + "0.95" + ], + "Offset":1000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, { "Name":"VIRTUAL-GNSS-BATT", "Type":"UNKNOWN", @@ -102,9 +199,10 @@ "battery" ], "Coefficient":[ - "0.375", - "0.625" + "0.50", + "0.50" ], + "Offset":1500, "HotThreshold":[ "NAN", "NAN", @@ -127,9 +225,10 @@ "battery" ], "Coefficient":[ - "0.25", - "0.75" + "0.5", + "0.5" ], + "Offset":-4000, "HotThreshold":[ "NAN", "NAN", @@ -146,26 +245,28 @@ "Name":"VIRTUAL-SKIN", "Type":"SKIN", "VirtualSensor":true, - "TriggerSensor":"neutral_therm", + "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "neutral_therm", + "VIRTUAL-NEUTRAL-DISP", + "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-BATT" ], "Coefficient":[ + "1.0", "1.0", "1.0", "1.0" ], "HotThreshold":[ "NAN", - "40.0", - "44.0", - "46.0", - "48.0", - "53.0", - "57.0" + "39.0", + "43.0", + "45.0", + "47.0", + "52.0", + "56.0" ], "HotHysteresis":[ 0.0, @@ -179,7 +280,7 @@ "VrThreshold":"NAN", "Multiplier":0.001, "Monitor":true, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 1700, "NAN", "NAN", "NAN", "NAN"], @@ -196,8 +297,8 @@ { "CdevRequest": "thermal-cpufreq-0", "CdevWeightForPID":0.9, - "CdevCeilingForPID":8, - "LimitInfo": [0, 0, 0, 9, 10, 12, 12], + "CdevCeilingForPID":6, + "LimitInfo": [0, 0, 0, 7, 8, 10, 10], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerSampleDelay":14000, "PowerSampleCount":5, @@ -206,8 +307,8 @@ { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID":1.1, - "CdevCeilingForPID":9, - "LimitInfo": [0, 0, 0, 10, 11, 13, 13], + "CdevCeilingForPID":7, + "LimitInfo": [0, 0, 0, 8, 9, 11, 11], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerSampleDelay":14000, "PowerSampleCount":5, @@ -216,8 +317,8 @@ { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID":2.9, - "CdevCeilingForPID":10, - "LimitInfo": [0, 0, 0, 11, 12, 14, 14], + "CdevCeilingForPID":12, + "LimitInfo": [0, 0, 0, 13, 14, 16, 16], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerSampleDelay":14000, "PowerSampleCount":5, @@ -247,14 +348,16 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor":"neutral_therm", + "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "neutral_therm", + "VIRTUAL-NEUTRAL-DISP", + "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-BATT" ], "Coefficient":[ + "1.0", "1.0", "1.0", "1.0" @@ -265,7 +368,7 @@ "NAN", "NAN", "NAN", - "55.0", + "54.0", "NAN" ], "HotHysteresis":[ @@ -279,7 +382,9 @@ ], "VrThreshold":"NAN", "Multiplier":0.001, - "Monitor":true + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000 }, { "Name":"LITTLE", @@ -311,6 +416,21 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, + { + "Name":"BIG", + "Type":"CPU", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + 115.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, { "Name":"G3D", "Type":"GPU", @@ -614,29 +734,29 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "921", "684", "568", "479", "359", "322", "265", "228", "171", "117", "86", "41"], - "PowerRail":"S4M_VDD_CPUCL0" + "State2Power":["684", "568", "479", "359", "322", "265", "228", "171", "117", "86", "41"], + "PowerRail":"S4M_VDD_CPUCL0" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1335", "1118", "926", "744", "590", "466", "365", "308", "232", "190", "156", "129", "93", "62"], - "PowerRail":"S3M_VDD_CPUCL1" + "State2Power":["926", "744", "590", "466", "365", "308", "232", "190", "156", "129", "93", "62"], + "PowerRail":"S3M_VDD_CPUCL1" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["3215", "2986", "2563", "2215", "2036", "1702", "1341", "1191", "964", "791", "658", "519", "420", "344", "176"], - "PowerRail":"S2M_VDD_CPUCL2" + "State2Power":["3326", "3300", "3215", "2986", "2563", "2215", "2036", "1702", "1341", "1191", "964", "791", "658", "519", "420", "344", "176"], + "PowerRail":"S2M_VDD_CPUCL2" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", "State2Power":["3950", "3368", "2933", "2278", "2075", "1807", "1508", "1305", "1100", "916", "737", "565"], - "PowerRail":"S2S_VDD_G3D" + "PowerRail":"S2S_VDD_G3D" }, { "Name":"fcc",