thermal: more aggressive CPU throttle policy for shusky am: f627993f9c

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/22039804

Change-Id: Ibc0d97ed03f24fab3b216e66eda4a55d078aba26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter (YM) 2023-03-20 03:51:14 +00:00 committed by Automerger Merge Worker
commit 2146582136
2 changed files with 116 additions and 66 deletions

View file

@ -327,22 +327,21 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.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,
"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
"K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
@ -367,7 +366,7 @@
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
@ -375,7 +374,7 @@
]
},
{
"Name":"VIRTUAL-SKIN-GPU",
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -389,25 +388,51 @@
"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
"K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"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],
"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],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
},
{
"CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 7, 7, 7, 9, 11, 11],
"CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 9, 11, 11]
}
]

View file

@ -334,22 +334,76 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.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,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"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],
"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],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
}
]
},
{
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 37.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,
"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
"K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
@ -374,47 +428,18 @@
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16]
}
]
},
{
"Name":"VIRTUAL-SKIN-GPU",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 37.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,
"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],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 7, 7, 7, 9, 11, 11],
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 9, 11, 11]
}
]