Merge changes from topic "shusky-vs-v1"

* changes:
  thermal: enable PI loop for tskin mitigation
  thermal: update thermal configs with v1 virtual coefficients
This commit is contained in:
Sayanna Chandula 2022-12-16 18:28:36 +00:00 committed by Android (Google) Code Review
commit 2e4641fbbd
2 changed files with 234 additions and 52 deletions

View file

@ -61,6 +61,61 @@
"PollingDelay":60000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-CHARGE-CAM",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["charge_therm", "cam_therm"],
"Coefficient":[0.540, 0.460],
"Offset":-2000,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-DISP-USB",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["disp_therm", "usb_pwr_therm"],
"Coefficient":[0.710, 0.290],
"Offset":-1580,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-CAM-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["cam_therm", "soc_therm"],
"Coefficient":[0.850, 0.150],
"Offset":-1640,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NORTH-CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "charge_therm"],
"Coefficient":[0.550, 0.450],
"Offset":-1970,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-DISP-NEUTRAL",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["disp_therm", "neutral_therm"],
"Coefficient":[0.780, 0.220],
"Offset":-1960,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
@ -68,10 +123,10 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"SendCallback":true,
"PollingDelay":300000,
@ -86,10 +141,10 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
@ -102,30 +157,52 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 1200, 200, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 2400, 1600, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
"TranCycle": 5
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
}
]
},
@ -136,20 +213,34 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 0, 500, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 1500, 200, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 2100, 1700, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
"TranCycle": 5
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 6, 6, 6, 8, 10, 10],
"LimitInfo": [0, 0, 0, 0, 8, 10, 10]
}
]
},
@ -159,10 +250,10 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"WEIGHTED_AVG",
"Combination":["charge_therm", "quiet_therm"],
"Coefficient":[0.282, 0.718],
"Offset":-448,
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
"Combination":["soc_therm", "disp_therm"],
"Coefficient":[0.520, 0.480],
"Offset":-1990,
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
@ -181,9 +272,9 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
"SendCallback":true,

View file

@ -61,6 +61,61 @@
"PollingDelay":60000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-CHARGE-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["charge_therm", "disp_therm"],
"Coefficient":[0.620, 0.380],
"Offset":-1150,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEUTRAL-NORTH",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "north_therm"],
"Coefficient":[0.620, 0.380],
"Offset":-1980,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NORTH-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "soc_therm"],
"Coefficient":[0.720, 0.280],
"Offset":-1750,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NORTH-CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "charge_therm"],
"Coefficient":[0.620, 0.380],
"Offset":-910,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUIET-NEUTRAL",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "neutral_therm"],
"Coefficient":[0.790, 0.210],
"Offset":-2000,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
@ -68,10 +123,10 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"SendCallback":true,
"PollingDelay":300000,
@ -86,10 +141,10 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
@ -102,30 +157,52 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 1200, 200, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 2400, 1600, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
"TranCycle": 5
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 16, 16]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
}
]
},
@ -136,20 +213,34 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 0, 500, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 1500, 200, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 2100, 1700, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
"TranCycle": 5
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 7, 7, 7, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 9, 11, 11]
}
]
},
@ -159,10 +250,10 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"WEIGHTED_AVG",
"Combination":["charge_therm", "quiet_therm"],
"Coefficient":[0.282, 0.718],
"Offset":-448,
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
"Combination":["neutral_therm", "soc_therm"],
"Coefficient":[0.680, 0.320],
"Offset":-830,
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
@ -181,9 +272,9 @@
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM",
"Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
"SendCallback":true,