Evolution-X-Tensor/device_google_caimito
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

thermal: enable thermal throttling based on virtual-skin-model

Browse source 
- Switch to VIRTUAL-SKIN-MODEL from VIRTUAL-SKIN-LEGACY
- Add a backup shutdown based on VIRTUAL-SKIN-LEGACY
- Remove unnecessary polling delays from few sensors

Bug: 321108353
Test: Build and boot on device

Change-Id: I8b8909ded87ba2b76d5712c474120dbe5ab13c2c
Signed-off-by: Sayanna Chandula <sayanna@google.com>
This commit is contained in:
Sayanna Chandula 2024-01-18 16:08:29 -08:00
parent 1a93070bd9
commit 2842a579c0
6 changed files with 96 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

27
thermal/thermal_info_config_caiman.json
View file

@ -182,9 +182,17 @@
"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],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [55.0],
"Multiplier": 1.0
},
{
"Name": "VIRTUAL-SKIN-MODEL",
@ -195,9 +203,7 @@
"Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
"Coefficient": [1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -207,9 +213,7 @@
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 1
},
{
"Name": "STATS-UPDATOR",
@ -232,8 +236,9 @@
"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-LEGACY"],
"Coefficient": [1],
"Combination": ["VIRTUAL-SKIN-MODEL", "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],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,

27
thermal/thermal_info_config_caiman_proto.json
View file

@ -170,9 +170,17 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
"Coefficient": [1.0, 1.0, 1.0, 1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [55.0],
"Multiplier": 1.0
},
{
"Name": "VIRTUAL-SKIN-MODEL",
@ -183,9 +191,7 @@
"Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
"Coefficient": [1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -195,9 +201,7 @@
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 1
},
{
"Name": "STATS-UPDATOR",
@ -220,8 +224,9 @@
"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-LEGACY"],
"Coefficient": [1],
"Combination": ["VIRTUAL-SKIN-MODEL", "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],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,

27
thermal/thermal_info_config_komodo.json
View file

@ -171,9 +171,17 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
"Coefficient": [1.0, 1.0, 1.0, 1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [55.0],
"Multiplier": 1.0
},
{
"Name": "VIRTUAL-SKIN-MODEL",
@ -184,9 +192,7 @@
"Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
"Coefficient": [1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -196,9 +202,7 @@
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 1
},
{
"Name": "STATS-UPDATOR",
@ -221,8 +225,9 @@
"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-LEGACY"],
"Coefficient": [1],
"Combination": ["VIRTUAL-SKIN-MODEL", "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],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,

27
thermal/thermal_info_config_komodo_proto.json
View file

@ -203,9 +203,17 @@
"Formula": "MAXIMUM",
"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,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [55.0],
"Multiplier": 1.0
},
{
"Name": "VIRTUAL-SKIN-MODEL",
@ -216,9 +224,7 @@
"Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
"Coefficient": [1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -228,9 +234,7 @@
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 1
},
{
"Name": "STATS-UPDATOR",
@ -253,8 +257,9 @@
"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-LEGACY"],
"Coefficient": [1],
"Combination": ["VIRTUAL-SKIN-MODEL", "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],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,

27
thermal/thermal_info_config_tokay.json
View file

@ -161,9 +161,17 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
"Coefficient": [1.0, 1.0, 1.0, 1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [55.0],
"Multiplier": 1.0
},
{
"Name": "VIRTUAL-SKIN-MODEL",
@ -174,9 +182,7 @@
"Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
"Coefficient": [1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -186,9 +192,7 @@
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 1
},
{
"Name": "STATS-UPDATOR",
@ -211,8 +215,9 @@
"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-LEGACY"],
"Coefficient": [1],
"Combination": ["VIRTUAL-SKIN-MODEL", "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],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,

27
thermal/thermal_info_config_tokay_proto.json
View file

@ -149,9 +149,17 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"],
"Coefficient": [1.0, 1.0, 1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-LEGACY-SHUTDOWN",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [55.0],
"Multiplier": 1.0
},
{
"Name": "VIRTUAL-SKIN-MODEL",
@ -162,9 +170,7 @@
"Combination": ["VSYS_PWR_CAMERA", "VSYS_PWR_DISPLAY", "VSYS_PWR_MMWAVE", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_WLAN_BT", "battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"CombinationType":["ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "ODPM", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR"],
"Coefficient": [1.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 0.001
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -174,9 +180,7 @@
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1,
"PollingDelay": 300000,
"PassiveDelay": 7000
"Multiplier": 1
},
{
"Name": "STATS-UPDATOR",
@ -199,8 +203,9 @@
"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-LEGACY"],
"Coefficient": [1],
"Combination": ["VIRTUAL-SKIN-MODEL", "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],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,