From 7e31fdad99c1f6b6d41bf8209ea242fb1b7baaa5 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 6 Dec 2022 17:31:36 +0800 Subject: [PATCH] thermal: update thermal config 1. VSKIN equation V0.4 2. Charging throttling policy V0.2 Bug: 254163925 Bug: 239372822 Test: adb shell lshal debug android.hardware.thermal@2.0::IThermal/default Change-Id: I5928850b0e26a17c5712addcb0f1d728cf34d7c9 --- thermal_info_config_charge_felix.json | 135 ++++++++++---------------- thermal_info_config_felix.json | 129 +++++++++++------------- 2 files changed, 109 insertions(+), 155 deletions(-) diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json index d00234c..8262159 100644 --- a/thermal_info_config_charge_felix.json +++ b/thermal_info_config_charge_felix.json @@ -88,9 +88,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[0.06, 0.06, 0.7, 0.06, 0.06, 0.06], - "Offset":-1800, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.35, -0.3, 0.75, -0.1, 0.75, -0.55, 0.55, -0.45], + "Offset":1460, "Multiplier":0.001 }, { @@ -99,9 +99,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.3, -0.3, -0.3, 2.5, -0.3, -0.3], - "Offset":-18000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.65, 0.35, 0.95, 0.1, -1.7, 0.25, 0.1, 0.2], + "Offset":-3780, "Multiplier":0.001 }, { @@ -110,9 +110,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.05, -0.05, 1.25, -0.05, -0.05, -0.05], - "Offset":-5000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-1.05, -0.1, 0.4, 0.1, 1.0, 0.45, -0.35, 0.55], + "Offset":-1260, "Multiplier":0.001 }, { @@ -121,9 +121,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.09, -0.09, -0.09, -0.09, 1.45, -0.09], - "Offset":0, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-0.2, -1.0, 1.5, -0.1, 0.85, 0.2, 0.65, -0.9], + "Offset":940, "Multiplier":0.001 }, { @@ -132,9 +132,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-1.45, 0.49, 0.49, 0.49, 0.49, 0.49], - "Offset":-2000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-0.15, -0.85, 1.7, -0.05, 0.95, -0.45, 0.2, -0.35], + "Offset":-2490, "Multiplier":0.001 }, { @@ -163,9 +163,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.55, 0.31, 0.31, 0.31, 0.31, 0.31], - "Offset":1000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.2, -0.15, 0.05, 0.05, -0.4, 1.0, 0.05, 0.2], + "Offset":1180, "Multiplier":0.001 }, { @@ -174,9 +174,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[0.01, 0.01, 0.95, 0.01, 0.01, 0.01], - "Offset":-2500, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm"], + "Coefficient":[-0.3, -0.65, 1.0, -0.1, 0.9, 0.25, -0.1], + "Offset":340, "Multiplier":0.001 }, { @@ -185,9 +185,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[0.09, 0.09, 0.09, 0.09, 0.055, 0.09], - "Offset":500, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-0.95, -0.85, 0.6, 0.15, 0.8, 0.75, -0.15, 0.65], + "Offset":-2550, "Multiplier":0.001 }, { @@ -196,9 +196,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.03, -0.03, -0.03, -0.03, -0.03, 1.15], - "Offset":500, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm"], + "Coefficient":[-0.15, -0.7, 0.05, 0.3, -0.35, 1.9, -0.15], + "Offset":1380, "Multiplier":0.001 }, { @@ -207,9 +207,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.5, 0.3, 0.3, 0.3, 0.3, 0.3], - "Offset":1200, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.1, -0.3, 0.75, 0.4, 0.85, 0.1, -0.9], + "Offset":850, "Multiplier":0.001 }, { @@ -235,32 +235,33 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Version":"0.2", "Hidden":true, "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], + "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 47.0, 60.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":300000, - "PassiveDelay":7000, + "PollingDelay":60000, + "PassiveDelay":60000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [1.6, 1.6, 1.6, 1.6, 1.6, 1.6, 1.6] } ], "BindedCdevInfo": [ @@ -269,7 +270,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 7, 10, 11, 12, 12, 12], + "CdevCeiling": [0, 10, 11, 11, 12, 12, 12], "LimitInfo": [0, 0, 0, 0, 0, 12, 12] } ] @@ -318,7 +319,8 @@ "CoolingDevices":[ { "Name":"chg_mdis", - "Type":"BATTERY" + "Type":"BATTERY", + "State2Power":[4122, 3623, 3308, 2824, 2524, 2241, 1864, 1635, 1319, 932, 632, 344, 0] }, { "Name":"usbc-port", @@ -326,52 +328,15 @@ } ], "PowerRails":[ - { - "Name":"PPVAR_VSYS_PWR_DISP" - }, - { - "Name":"VSYS_PWR_MODEM" - }, - { - "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":7000, - "PowerSampleCount":1 - - }, - { - "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":7000, - "PowerSampleCount":1 - }, - { - "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":7000, - "PowerSampleCount":1 - }, - { - "Name":"S5M_VDD_INT" - }, - { - "Name":"S1M_VDD_MIF" - }, - { - "Name":"S2S_VDD_G3D", - "PowerSampleDelay":7000, - "PowerSampleCount":1 - }, - { - "Name":"VSYS_PWR_WLAN_BT", - "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", "VSYS_PWR_WLAN_BT"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "PowerSampleDelay":7000, - "PowerSampleCount":5 + "Combination":["VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S8M_LLDO2", + "S10M_VDD_TPU", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "VSYS_PWR_CAM", "S1S_VDD_CAM","S2S_VDD_G3D", "S4S_VDD2H_MEM", "S8S_VDD_G3D_L2", "L2S_PLL_MIPI_UFS"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "PowerSampleDelay":60000, + "PowerSampleCount":1 } ] } diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 565682d..c128df5 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -94,9 +94,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[0.06, 0.06, 0.7, 0.06, 0.06, 0.06], - "Offset":-1800, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.35, -0.3, 0.75, -0.1, 0.75, -0.55, 0.55, -0.45], + "Offset":1460, "Multiplier":0.001 }, { @@ -105,9 +105,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.3, -0.3, -0.3, 2.5, -0.3, -0.3], - "Offset":-18000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.65, 0.35, 0.95, 0.1, -1.7, 0.25, 0.1, 0.2], + "Offset":-3780, "Multiplier":0.001 }, { @@ -116,9 +116,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.05, -0.05, 1.25, -0.05, -0.05, -0.05], - "Offset":-5000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-1.05, -0.1, 0.4, 0.1, 1.0, 0.45, -0.35, 0.55], + "Offset":-1260, "Multiplier":0.001 }, { @@ -127,9 +127,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.09, -0.09, -0.09, -0.09, 1.45, -0.09], - "Offset":0, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-0.2, -1.0, 1.5, -0.1, 0.85, 0.2, 0.65, -0.9], + "Offset":940, "Multiplier":0.001 }, { @@ -138,9 +138,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-1.45, 0.49, 0.49, 0.49, 0.49, 0.49], - "Offset":-2000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-0.15, -0.85, 1.7, -0.05, 0.95, -0.45, 0.2, -0.35], + "Offset":-2490, "Multiplier":0.001 }, { @@ -169,9 +169,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.55, 0.31, 0.31, 0.31, 0.31, 0.31], - "Offset":1000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.2, -0.15, 0.05, 0.05, -0.4, 1.0, 0.05, 0.2], + "Offset":1180, "Multiplier":0.001 }, { @@ -180,9 +180,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[0.01, 0.01, 0.95, 0.01, 0.01, 0.01], - "Offset":-2500, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm"], + "Coefficient":[-0.3, -0.65, 1.0, -0.1, 0.9, 0.25, -0.1], + "Offset":340, "Multiplier":0.001 }, { @@ -191,9 +191,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[0.09, 0.09, 0.09, 0.09, 0.055, 0.09], - "Offset":500, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[-0.95, -0.85, 0.6, 0.15, 0.8, 0.75, -0.15, 0.65], + "Offset":-2550, "Multiplier":0.001 }, { @@ -202,9 +202,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.03, -0.03, -0.03, -0.03, -0.03, 1.15], - "Offset":500, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm"], + "Coefficient":[-0.15, -0.7, 0.05, 0.3, -0.35, 1.9, -0.15], + "Offset":1380, "Multiplier":0.001 }, { @@ -213,9 +213,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], - "Coefficient":[-0.5, 0.3, 0.3, 0.3, 0.3, 0.3], - "Offset":1200, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm2", "inner_disp_therm", "outer_disp_therm", "gnss_tcxo_therm"], + "Coefficient":[0.1, -0.3, 0.75, 0.4, 0.85, 0.1, -0.9], + "Offset":850, "Multiplier":0.001 }, { @@ -241,13 +241,13 @@ { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"0.3", + "Version":"0.4", "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, @@ -269,7 +269,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendPowerHint":true, @@ -300,7 +300,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 60.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -361,7 +361,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -419,32 +419,33 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Version":"0.2", "Hidden":true, "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], + "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 47.0, 60.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":300000, - "PassiveDelay":7000, + "PollingDelay":60000, + "PassiveDelay":60000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [1.6, 1.6, 1.6, 1.6, 1.6, 1.6, 1.6] } ], "BindedCdevInfo": [ @@ -453,7 +454,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 7, 10, 11, 12, 12, 12], + "CdevCeiling": [0, 10, 11, 11, 12, 12, 12], "LimitInfo": [0, 0, 0, 0, 0, 12, 12] } ] @@ -864,29 +865,30 @@ "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":[516, 456, 392, 296, 264, 216, 184, 140, 100, 68, 28] }, { "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":[2466, 2166, 1840, 1544, 1260, 1024, 816, 642, 538, 410, 342, 276, 224, 162, 104] }, { "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":[4920, 4614, 4092, 3684, 3198, 2820, 2354, 2184, 1862, 1476, 1338, 1110, 928, 738, 552, 450, 362, 188] }, { "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] + "State2Power":[1925, 1528, 1258, 928, 795, 703, 573, 481, 396, 314, 236] }, { "Name":"chg_mdis", - "Type":"BATTERY" + "Type":"BATTERY", + "State2Power":[4122, 3623, 3308, 2824, 2524, 2241, 1864, 1635, 1319, 932, 632, 344, 0] }, { "Name":"usbc-port", @@ -899,9 +901,6 @@ } ], "PowerRails":[ - { - "Name":"PPVAR_VSYS_PWR_DISP" - }, { "Name":"VSYS_PWR_MODEM", "PowerSampleDelay":7000, @@ -923,30 +922,20 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, - { - "Name":"S5M_VDD_INT" - }, - { - "Name":"S1M_VDD_MIF" - }, { "Name":"S2S_VDD_G3D", "PowerSampleDelay":7000, "PowerSampleCount":1 }, - { - "Name":"VSYS_PWR_WLAN_BT", - "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", "VSYS_PWR_WLAN_BT"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "PowerSampleDelay":7000, - "PowerSampleCount":5 + "Combination":["VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S8M_LLDO2", + "S10M_VDD_TPU", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "VSYS_PWR_CAM", "S1S_VDD_CAM","S2S_VDD_G3D", "S4S_VDD2H_MEM", "S8S_VDD_G3D_L2", "L2S_PLL_MIPI_UFS"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "PowerSampleDelay":60000, + "PowerSampleCount":1 } ] }