diff --git a/thermal/thermal_info_config_caiman_wingboard.json b/thermal/thermal_info_config_caiman_wingboard.json index ae8e9be3..18af7775 100644 --- a/thermal/thermal_info_config_caiman_wingboard.json +++ b/thermal/thermal_info_config_caiman_wingboard.json @@ -118,8 +118,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.285, 0.066, 0.04, 0.004, 0.21, 0.048, 0.231, 0.094, 0.023], - "Offset": -736.0, + "Coefficient": [0.064, 0.35, 0.045, 0.34, 0.052, 0.174, 0.026, 0.023, 0.058], + "Offset": -8712.0, "Multiplier": 0.001 }, { @@ -129,8 +129,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.141, 0.208, 0.002, 0.086, 0.25, 0.024, 0.162, 0.015, 0.112], - "Offset": -520.0, + "Coefficient": [0.068, 0.244, 0.195, 0.043, 0.117, 0.194, 0.095, 0.001, 0.042], + "Offset": -3915.0, "Multiplier": 0.001 }, { @@ -140,18 +140,73 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.283, 0.004, 0.01, 0.136, 0.039, 0.091, 0.276, 0.038, 0.123], - "Offset": -436.0, + "Coefficient": [0.004, 0.172, 0.011, 0.211, 0.115, 0.174, 0.167, 0.006, 0.14], + "Offset": -793.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.1, 0.103, 0.103, 0.097, 0.096, 0.102, 0.097, 0.1, 0.097], + "Offset": 2235.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.03, 0.101, 0.009, 0.233, 0.047, 0.013, 0.398, 0.021, 0.147], + "Offset": -532.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.022, 0.007, 0.126, 0.078, 0.205, 0.011, 0.232, 0.103, 0.215], + "Offset": -470.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.293, 0.006, 0.001, 0.15, 0.098, 0.013, 0.158, 0.107, 0.183], + "Offset": -856.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-7", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.032, 0.038, 0.011, 0.219, 0.028, 0.0, 0.207, 0.312, 0.153], + "Offset": -2876.0, "Multiplier": 0.001 }, { "Name": "VIRTUAL-SKIN-LEGACY", "Type": "UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor": true, "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"], - "Coefficient": [1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7"], + "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, { @@ -170,13 +225,34 @@ "VirtualSensor": true, "ModelPath": "vt_estimation_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], + "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], "Multiplier": 0.001, "PreviousSampleCount": 3, - "BackupSensor" : "VIRTUAL-SKIN-LEGACY", "OffsetThresholds" : [50000, 53000], "OffsetValues" : [500, 1000], - "ValidateInput": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY" + }, + { + "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "MINIMUM", + "Combination": ["55000", "VIRTUAL-SKIN-MODEL"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, 1.0], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-MODEL-CLAMPED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "MAXIMUM", + "Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, 1.0], + "Multiplier": 1 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -188,6 +264,63 @@ "Coefficient": [1.0, -1.0], "Multiplier": 1 }, + { + "Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "VT_LEGACY_WEIGHT", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "COUNT_THRESHOLD", + "StepRatio": 0.2, + "Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"], + "Coefficient": [7000, 7000], + "Multiplier": 1, + "PassiveDelay": 7000 + }, + { + "Name": "VT_MODEL_WEIGHT", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["1", "VT_LEGACY_WEIGHT"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-MODEL-UPDATED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"], + "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-LSTM-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_prediction_lstm_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "PreviousSampleCount": 11, + "OutputLabelCount": 6, + "Multiplier": 0.001, + "SupportUnderSampling": true, + "ValidateInput": true + }, { "Name": "STATS-UPDATOR", "Type": "UNKNOWN", @@ -195,8 +328,8 @@ "Hidden": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "Coefficient": [0.0, 0.0, 0.0], + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"], + "Coefficient": [0.0, 0.0, 0.0, 0.0], "Multiplier": 1, "SendPowerHint": true, "PollingDelay": 300000, @@ -209,7 +342,7 @@ "VirtualSensor": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"], + "Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"], "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"], "CoefficientType":["CONSTANT", "SENSOR"], "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], @@ -218,11 +351,10 @@ "SendCallback": true, "PollingDelay": 300000, "PassiveDelay": 7000, + "PredictorInfo": { + "Sensor": "VIRTUAL-SKIN-LSTM-MODEL" + }, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -240,7 +372,7 @@ 0.055, 0.002, 0.029, 0.061, 0.072, 0.011, 0.04, 0.027, 0.072, 0.071, 0.003, 0.026, 0.03, 0.04, 0.015, 0.001, 0.035, 0.042], "OffsetThresholds": [0.0], - "OffsetValues": [-490.0], + "OffsetValues": [-490.0], "Multiplier": 0.001 }, { @@ -335,7 +467,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000] }, { "CdevRequest": "thermal-cpufreq-1", @@ -343,7 +475,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000] }, { "CdevRequest": "thermal-cpufreq-2", @@ -351,7 +483,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 15, 15, 15, 15, 15, 15] + "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000] } ], "Profile": [ @@ -411,21 +543,21 @@ "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 7, 7, 7, 7, 7, 7] + "CdevCeilingFrequency": [1950000, 1098000, 1098000, 1098000, 1098000, 1098000, 1098000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 10, 10, 10, 10, 10, 10] + "CdevCeilingFrequency": [2600000, 1221000, 1221000, 1221000, 1221000, 1221000, 1221000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000] } ], "Profile": [ @@ -502,21 +634,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] + "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000] } ], "Profile": [ @@ -548,28 +680,28 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 15, 15, 15, 15, 15, 15] + "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000] } ] } ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -589,7 +721,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -600,8 +732,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000], + "LimitInfoFrequency": [1950000, 1950000, 1950000, 1950000, 1950000, 820000, 820000] }, { "CdevRequest": "thermal-cpufreq-1", @@ -609,8 +741,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 13, 13, 13, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 0, 16, 16] + "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000], + "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000] }, { "CdevRequest": "thermal-cpufreq-2", @@ -618,8 +750,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17], - "LimitInfo": [0, 0, 0, 0, 0, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000], + "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000] }, { "CdevRequest": "thermal-gpufreq-0", @@ -627,8 +759,17 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], - "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + "CdevCeilingFrequency": [940000, 419000, 419000, 419000, 376000, 302000, 302000], + "LimitInfoFrequency": [940000, 940000, 940000, 940000, 940000, 302000, 302000] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -661,7 +802,7 @@ { "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 9, 9, 10, 12, 12, 12] + "CdevCeilingFrequency": [940000, 419000, 419000, 376000, 302000, 302000, 302000] } ] }, @@ -687,30 +828,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.202, 0.003, 0.056, 0.109, 0.069, 0.02, 0.242, 0.051, 0.249], - "Offset": -825.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-SPEAKER-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.007, 0.001, 0.058, 0.002, 0.13, 0.083, 0.301, 0.04, 0.378], - "Offset": -658.0, + "Coefficient": [0.082, 0.09, 0.029, 0.02, 0.048, 0.009, 0.334, 0.044, 0.38], + "Offset": 2582.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], - "Coefficient":[1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SPEAKER-SUB-0"], + "Coefficient": [1.0], "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -725,74 +855,41 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.304, 0.093, 0.059, 0.023, 0.005, 0.08, 0.117, 0.005, 0.314], - "Offset": -432.0, + "Coefficient": [0.149, 0.166, 0.226, 0.169, 0.159, 0.284, 0.05, 0.059, 0.068], + "Offset": -19933.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-FRONT-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.054, 0.201, 0.012, 0.117, 0.04, 0.276, 0.09, 0.046, 0.163], + "Offset": -2948.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-FRONT-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.25, 0.15, 0.001, 0.114, 0.134, 0.046, 0.178, 0.029, 0.099], + "Offset": -1010.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"4.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination": ["VIRTUAL-SKIN-FRONT-SUB-0"], - "Coefficient": [1.0], - "Multiplier":0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.149, 0.023, 0.113, 0.012, 0.196, 0.052, 0.209, 0.076, 0.169], - "Offset": -473.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.237, 0.013, 0.026, 0.038, 0.219, 0.117, 0.03, 0.091, 0.228], - "Offset": -493.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.139, 0.01, 0.018, 0.252, 0.153, 0.077, 0.281, 0.049, 0.02], - "Offset": -353.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.179, 0.183, 0.041, 0.026, 0.205, 0.068, 0.202, 0.038, 0.058], - "Offset": -1651.0, - "Multiplier": 0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE", - "Type":"UNKNOWN", - "Version":"7.0", - "Hidden":true, - "VirtualSensor":true, - "Formula":"MAXIMUM", - "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], - "Coefficient": [1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], + "Coefficient": [1.0, 1.0, 1.0], "Multiplier":0.001 }, { @@ -860,22 +957,26 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy7/scaling_available_frequencies" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/platform/1f000000.mali/available_frequencies" }, { "Name":"usbc-port", @@ -913,6 +1014,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"S2S_VDD_G3D", "PowerSampleDelay":7000, @@ -990,7 +1096,7 @@ }, { "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "TempRange": [-10000, 10000] + "TempRange": [-7000, 7000] } ] } diff --git a/thermal/thermal_info_config_komodo_wingboard.json b/thermal/thermal_info_config_komodo_wingboard.json index 6d5a5117..d41a65bb 100644 --- a/thermal/thermal_info_config_komodo_wingboard.json +++ b/thermal/thermal_info_config_komodo_wingboard.json @@ -118,8 +118,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.004, 0.071, 0.01, 0.088, 0.239, 0.014, 0.252, 0.083, 0.277], - "Offset": -1528.0, + "Coefficient": [0.071, 0.041, 0.016, 0.089, 0.188, 0.301, 0.227, 0.059, 0.008], + "Offset": -811.0, "Multiplier": 0.001 }, { @@ -129,8 +129,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.08, 0.008, 0.007, 0.225, 0.273, 0.291, 0.084, 0.018, 0.015], - "Offset": -577.0, + "Coefficient": [0.102, 0.108, 0.107, 0.099, 0.098, 0.104, 0.098, 0.103, 0.099], + "Offset": 1481.0, "Multiplier": 0.001 }, { @@ -140,8 +140,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.334, 0.04, 0.045, 0.014, 0.071, 0.054, 0.048, 0.303, 0.091], - "Offset": -2403.0, + "Coefficient": [0.336, 0.016, 0.018, 0.168, 0.064, 0.004, 0.293, 0.064, 0.037], + "Offset": -736.0, "Multiplier": 0.001 }, { @@ -151,8 +151,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.024, 0.02, 0.013, 0.327, 0.056, 0.005, 0.241, 0.038, 0.277], - "Offset": -627.0, + "Coefficient": [0.073, 0.049, 0.02, 0.268, 0.044, 0.085, 0.291, 0.041, 0.212], + "Offset": -2755.0, "Multiplier": 0.001 }, { @@ -162,18 +162,40 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.327, 0.124, 0.0, 0.164, 0.116, 0.019, 0.026, 0.146, 0.078], - "Offset": -740.0, + "Coefficient": [0.242, 0.026, 0.015, 0.012, 0.167, 0.211, 0.132, 0.071, 0.125], + "Offset": -790.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.206, 0.0, 0.039, 0.018, 0.113, 0.043, 0.156, 0.251, 0.174], + "Offset": -806.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.373, 0.038, 0.121, 0.07, 0.112, 0.065, 0.021, 0.175, 0.024], + "Offset": -3129.0, "Multiplier": 0.001 }, { "Name": "VIRTUAL-SKIN-LEGACY", "Type": "UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor": true, "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"], - "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6"], + "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, { @@ -192,14 +214,35 @@ "VirtualSensor": true, "ModelPath": "vt_estimation_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], + "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], "Multiplier": 0.001, "Offset": 500, "PreviousSampleCount": 3, - "BackupSensor" : "VIRTUAL-SKIN-LEGACY", "OffsetThresholds" : [50000, 53000], "OffsetValues" : [500, 1000], - "ValidateInput": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY" + }, + { + "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "MINIMUM", + "Combination": ["55000", "VIRTUAL-SKIN-MODEL"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, 1.0], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-MODEL-CLAMPED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "MAXIMUM", + "Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, 1.0], + "Multiplier": 1 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -211,6 +254,63 @@ "Coefficient": [1.0, -1.0], "Multiplier": 1 }, + { + "Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "VT_LEGACY_WEIGHT", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "COUNT_THRESHOLD", + "StepRatio": 0.2, + "Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"], + "Coefficient": [7000, 7000], + "Multiplier": 1, + "PassiveDelay": 7000 + }, + { + "Name": "VT_MODEL_WEIGHT", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["1", "VT_LEGACY_WEIGHT"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-MODEL-UPDATED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"], + "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-LSTM-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_prediction_lstm_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "PreviousSampleCount": 11, + "OutputLabelCount": 6, + "Multiplier": 0.001, + "SupportUnderSampling": true, + "ValidateInput": true + }, { "Name": "STATS-UPDATOR", "Type": "UNKNOWN", @@ -218,21 +318,21 @@ "Hidden": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "Coefficient": [0.0, 0.0, 0.0], + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"], + "Coefficient": [0.0, 0.0, 0.0, 0.0], "Multiplier": 1, "SendPowerHint": true, "PollingDelay": 300000, "PassiveDelay": 7000 }, - { + { "Name": "VIRTUAL-SKIN", "Type": "SKIN", "Version": "6.1", "VirtualSensor": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"], + "Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"], "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"], "CoefficientType":["CONSTANT", "SENSOR"], "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], @@ -241,11 +341,10 @@ "SendCallback": true, "PollingDelay": 300000, "PassiveDelay": 7000, + "PredictorInfo": { + "Sensor": "VIRTUAL-SKIN-LSTM-MODEL" + }, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -344,7 +443,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000] }, { "CdevRequest": "thermal-cpufreq-1", @@ -352,7 +451,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000] }, { "CdevRequest": "thermal-cpufreq-2", @@ -360,7 +459,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 15, 15, 15, 15, 15, 15] + "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000] } ], "Profile": [ @@ -420,21 +519,21 @@ "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 7, 7, 7, 7, 7, 7] + "CdevCeilingFrequency": [1950000, 1098000, 1098000, 1098000, 1098000, 1098000, 1098000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 10, 10, 10, 10, 10, 10] + "CdevCeilingFrequency": [2600000, 1221000, 1221000, 1221000, 1221000, 1221000, 1221000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000] } ], "Profile": [ @@ -511,21 +610,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] + "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000] } ], "Profile": [ @@ -557,28 +656,28 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 15, 15, 15, 15, 15, 15] + "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000] } ] } ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -598,7 +697,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -609,8 +708,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000], + "LimitInfoFrequency": [1950000, 1950000, 1950000, 1950000, 1950000, 820000, 820000] }, { "CdevRequest": "thermal-cpufreq-1", @@ -618,8 +717,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 13, 13, 13, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 0, 16, 16] + "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000], + "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000] }, { "CdevRequest": "thermal-cpufreq-2", @@ -627,8 +726,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17], - "LimitInfo": [0, 0, 0, 0, 0, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000], + "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000] }, { "CdevRequest": "thermal-gpufreq-0", @@ -636,8 +735,17 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], - "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + "CdevCeilingFrequency": [940000, 419000, 419000, 419000, 376000, 302000, 302000], + "LimitInfoFrequency": [940000, 940000, 940000, 940000, 940000, 302000, 302000] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -670,7 +778,7 @@ { "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 9, 9, 10, 12, 12, 12] + "CdevCeilingFrequency": [940000, 419000, 419000, 376000, 302000, 302000, 302000] } ] }, @@ -696,19 +804,30 @@ "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.218, 0.091, 0.007, 0.24, 0.138, 0.046, 0.052, 0.003, 0.204], - "Offset": -1059.0, + "Coefficient": [0.254, 0.037, 0.024, 0.198, 0.037, 0.001, 0.126, 0.153, 0.169], + "Offset": -3614.0, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-SPEAKER-SUB-1", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.084, 0.09, 0.089, 0.079, 0.08, 0.085, 0.079, 0.087, 0.079], + "Offset": 5528.0, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], - "Coefficient":[1.0], + "Combination": ["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], + "Coefficient": [1.0, 1.0], "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -723,74 +842,41 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.214, 0.019, 0.007, 0.005, 0.082, 0.16, 0.279, 0.012, 0.222], - "Offset": 560.0, + "Coefficient": [0.094, 0.109, 0.105, 0.083, 0.089, 0.097, 0.083, 0.099, 0.083], + "Offset": 3671.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-FRONT-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.281, 0.166, 0.001, 0.309, 0.025, 0.023, 0.021, 0.007, 0.166], + "Offset": -1058.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-FRONT-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.011, 0.049, 0.033, 0.281, 0.024, 0.043, 0.268, 0.089, 0.203], + "Offset": -469.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"4.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-FRONT-SUB-0"], - "Coefficient":[1.0], - "Multiplier":0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.009, 0.008, 0.1, 0.105, 0.07, 0.079, 0.328, 0.032, 0.296], - "Offset": -1102.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.08, 0.008, 0.007, 0.225, 0.273, 0.291, 0.084, 0.018, 0.015], - "Offset": -577.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.151, 0.124, 0.004, 0.053, 0.036, 0.105, 0.222, 0.287, 0.016], - "Offset": -1713.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.327, 0.124, 0.0, 0.164, 0.116, 0.019, 0.026, 0.146, 0.078], - "Offset": -740.0, - "Multiplier": 0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE", - "Type":"UNKNOWN", - "Version":"8.0", - "Hidden":true, - "VirtualSensor":true, - "Formula":"MAXIMUM", - "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], - "Coefficient": [1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], + "Coefficient": [1.0, 1.0, 1.0], "Multiplier":0.001 }, { @@ -858,22 +944,26 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy7/scaling_available_frequencies" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/platform/1f000000.mali/available_frequencies" }, { "Name":"usbc-port", @@ -916,6 +1006,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, @@ -996,7 +1091,7 @@ }, { "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "TempRange": [-10000, 10000] + "TempRange": [-7000, 7000] } ] } diff --git a/thermal/thermal_info_config_tokay_wingboard.json b/thermal/thermal_info_config_tokay_wingboard.json index f3379e3d..606753fd 100644 --- a/thermal/thermal_info_config_tokay_wingboard.json +++ b/thermal/thermal_info_config_tokay_wingboard.json @@ -108,8 +108,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.266, 0.146, 0.012, 0.054, 0.016, 0.222, 0.2, 0.006, 0.078], - "Offset": -1233.0, + "Coefficient": [0.002, 0.229, 0.015, 0.127, 0.181, 0.09, 0.199, 0.003, 0.155], + "Offset": -456.0, "Multiplier": 0.001 }, { @@ -119,8 +119,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.181, 0.063, 0.028, 0.171, 0.041, 0.052, 0.317, 0.021, 0.252], - "Offset": -3069.0, + "Coefficient": [0.049, 0.088, 0.027, 0.067, 0.088, 0.028, 0.181, 0.223, 0.249], + "Offset": -463.0, "Multiplier": 0.001 }, { @@ -130,18 +130,62 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.079, 0.105, 0.028, 0.314, 0.036, 0.046, 0.293, 0.057, 0.157], - "Offset": -2961.0, + "Coefficient": [0.221, 0.012, 0.036, 0.273, 0.015, 0.279, 0.126, 0.003, 0.035], + "Offset": -835.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.131, 0.031, 0.014, 0.248, 0.263, 0.063, 0.016, 0.041, 0.234], + "Offset": -985.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.044, 0.105, 0.21, 0.02, 0.28, 0.099, 0.172, 0.07, 0.0], + "Offset": -2647.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.169, 0.028, 0.014, 0.096, 0.199, 0.17, 0.114, 0.012, 0.196], + "Offset": 54.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.069, 0.107, 0.005, 0.176, 0.183, 0.212, 0.189, 0.037, 0.022], + "Offset": -25.0, "Multiplier": 0.001 }, { "Name": "VIRTUAL-SKIN-LEGACY", "Type": "UNKNOWN", - "Version": "4.0", + "Version": "5.0", "VirtualSensor": true, "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"], - "Coefficient": [1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6"], + "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier": 0.001 }, { @@ -160,13 +204,34 @@ "VirtualSensor": true, "ModelPath": "vt_estimation_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], + "Combination": ["btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"], "Multiplier": 0.001, "PreviousSampleCount": 3, - "BackupSensor" : "VIRTUAL-SKIN-LEGACY", "OffsetThresholds" : [50000, 53000], "OffsetValues" : [500, 1000], - "ValidateInput": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY" + }, + { + "Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "MINIMUM", + "Combination": ["55000", "VIRTUAL-SKIN-MODEL"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, 1.0], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-MODEL-CLAMPED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "MAXIMUM", + "Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, 1.0], + "Multiplier": 1 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -178,6 +243,63 @@ "Coefficient": [1.0, -1.0], "Multiplier": 1 }, + { + "Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "VT_LEGACY_WEIGHT", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "COUNT_THRESHOLD", + "StepRatio": 0.2, + "Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"], + "Coefficient": [7000, 7000], + "Multiplier": 1, + "PassiveDelay": 7000 + }, + { + "Name": "VT_MODEL_WEIGHT", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["1", "VT_LEGACY_WEIGHT"], + "CombinationType": ["CONSTANT", "SENSOR"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-MODEL-UPDATED", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"], + "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 1 + }, + { + "Name": "VIRTUAL-SKIN-LSTM-MODEL", + "Type": "UNKNOWN", + "VirtualSensor": true, + "ModelPath": "vt_prediction_lstm_model.tflite", + "Formula": "USE_ML_MODEL", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "PreviousSampleCount": 11, + "OutputLabelCount": 6, + "Multiplier": 0.001, + "SupportUnderSampling": true, + "ValidateInput": true + }, { "Name": "STATS-UPDATOR", "Type": "UNKNOWN", @@ -185,8 +307,8 @@ "Hidden": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "Coefficient": [0.0, 0.0, 0.0], + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"], + "Coefficient": [0.0, 0.0, 0.0, 0.0], "Multiplier": 1, "SendPowerHint": true, "PollingDelay": 300000, @@ -199,7 +321,7 @@ "VirtualSensor": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"], + "Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"], "Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"], "CoefficientType":["CONSTANT", "SENSOR"], "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], @@ -208,11 +330,10 @@ "SendCallback": true, "PollingDelay": 300000, "PassiveDelay": 7000, + "PredictorInfo": { + "Sensor": "VIRTUAL-SKIN-LSTM-MODEL" + }, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -327,7 +448,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000] }, { "CdevRequest": "thermal-cpufreq-1", @@ -335,7 +456,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000] }, { "CdevRequest": "thermal-cpufreq-2", @@ -343,7 +464,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 15, 15, 15, 15, 15, 15] + "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000] } ], "Profile": [ @@ -403,21 +524,21 @@ "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 7, 7, 7, 7, 7, 7] + "CdevCeilingFrequency": [1950000, 1098000, 1098000, 1098000, 1098000, 1098000, 1098000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 10, 10, 10, 10, 10, 10] + "CdevCeilingFrequency": [2600000, 1221000, 1221000, 1221000, 1221000, 1221000, 1221000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000] } ], "Profile": [ @@ -494,21 +615,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] + "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000] } ], "Profile": [ @@ -540,28 +661,28 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 15, 15, 15, 15, 15, 15] + "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000] } ] } ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -581,7 +702,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -592,8 +713,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000], + "LimitInfoFrequency": [1950000, 1950000, 1950000, 1950000, 1950000, 820000, 820000] }, { "CdevRequest": "thermal-cpufreq-1", @@ -601,8 +722,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 13, 13, 13, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 0, 16, 16] + "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000], + "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000] }, { "CdevRequest": "thermal-cpufreq-2", @@ -610,8 +731,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 17, 17, 17, 17, 17, 17], - "LimitInfo": [0, 0, 0, 0, 0, 17, 17] + "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000], + "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000] }, { "CdevRequest": "thermal-gpufreq-0", @@ -619,8 +740,17 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], - "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + "CdevCeilingFrequency": [940000, 419000, 419000, 419000, 376000, 302000, 302000], + "LimitInfoFrequency": [940000, 940000, 940000, 940000, 940000, 302000, 302000] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -653,7 +783,7 @@ { "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], - "CdevCeiling": [0, 9, 9, 10, 12, 12, 12] + "CdevCeilingFrequency": [940000, 419000, 419000, 376000, 302000, 302000, 302000] } ] }, @@ -679,30 +809,19 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.285, 0.07, 0.012, 0.04, 0.138, 0.097, 0.242, 0.014, 0.103], - "Offset": -2525.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-SPEAKER-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.226, 0.066, 0.0, 0.018, 0.054, 0.244, 0.198, 0.017, 0.176], - "Offset": -2889.0, + "Coefficient": [0.036, 0.143, 0.015, 0.19, 0.03, 0.164, 0.268, 0.008, 0.147], + "Offset": -471.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], - "Coefficient":[1.0, 1.0], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -717,8 +836,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.037, 0.144, 0.017, 0.254, 0.173, 0.191, 0.146, 0.067, 0.066], - "Offset": -4318.0, + "Coefficient": [0.129, 0.234, 0.014, 0.022, 0.197, 0.017, 0.166, 0.16, 0.061], + "Offset": -3073.0, "Multiplier": 0.001 }, { @@ -728,8 +847,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.164, 0.052, 0.003, 0.341, 0.037, 0.042, 0.333, 0.024, 0.004], - "Offset": 1717.0, + "Coefficient": [0.141, 0.11, 0.04, 0.182, 0.169, 0.07, 0.109, 0.006, 0.173], + "Offset": -46.0, "Multiplier": 0.001 }, { @@ -739,8 +858,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.16, 0.053, 0.191, 0.057, 0.312, 0.124, 0.045, 0.019, 0.039], - "Offset": -3022.0, + "Coefficient": [0.24, 0.017, 0.031, 0.23, 0.007, 0.098, 0.21, 0.061, 0.106], + "Offset": -514.0, "Multiplier": 0.001 }, { @@ -750,8 +869,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.228, 0.144, 0.003, 0.096, 0.002, 0.22, 0.189, 0.002, 0.116], - "Offset": -769.0, + "Coefficient": [0.057, 0.158, 0.002, 0.228, 0.216, 0.116, 0.023, 0.047, 0.154], + "Offset": -243.0, "Multiplier": 0.001 }, { @@ -761,14 +880,14 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.068, 0.11, 0.007, 0.368, 0.176, 0.142, 0.092, 0.001, 0.035], - "Offset": 929.0, + "Coefficient": [0.026, 0.136, 0.241, 0.119, 0.243, 0.037, 0.103, 0.083, 0.012], + "Offset": -3832.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"4.0", "VirtualSensor":true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", @@ -776,83 +895,6 @@ "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier":0.001 }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.091, 0.142, 0.014, 0.199, 0.064, 0.181, 0.156, 0.055, 0.176], - "Offset": -3139.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.003, 0.052, 0.032, 0.115, 0.18, 0.198, 0.005, 0.186, 0.229], - "Offset": -1664.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.01, 0.011, 0.075, 0.252, 0.028, 0.268, 0.133, 0.047, 0.176], - "Offset": -36.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.165, 0.137, 0.031, 0.012, 0.228, 0.314, 0.023, 0.015, 0.075], - "Offset": -2975.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.069, 0.116, 0.018, 0.166, 0.222, 0.198, 0.061, 0.004, 0.144], - "Offset": -183.0, - "Multiplier": 0.001 - }, - { - "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", - "Type": "UNKNOWN", - "Hidden": true, - "VirtualSensor": true, - "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0.073, 0.009, 0.217, 0.239, 0.033, 0.233, 0.01, 0.066, 0.12], - "Offset": -1714.0, - "Multiplier": 0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE", - "Type":"UNKNOWN", - "Version":"8.0", - "Hidden":true, - "VirtualSensor":true, - "Formula":"MAXIMUM", - "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], - "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "Multiplier":0.001 - }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN", @@ -918,22 +960,26 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy7/scaling_available_frequencies" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", + "ScalingAvailableFrequenciesPath": "/sys/devices/platform/1f000000.mali/available_frequencies" }, { "Name":"usbc-port", @@ -976,6 +1022,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, @@ -1044,7 +1095,7 @@ }, { "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], - "TempRange": [-10000, 10000] + "TempRange": [-7000, 7000] } ] }