thermal: update CPU throttling policy

Bug: 258136274
Test: emul_temp
Change-Id: I0afcf40200cecbb1a6bb52f4bad8666015e09eaa
This commit is contained in:
TeYuan Wang 2023-05-05 11:51:33 -07:00 committed by Kame(TeYuan) Wang
parent df4540ccfe
commit 52a07319f4
2 changed files with 245 additions and 55 deletions

View file

@ -401,7 +401,7 @@
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-CPU",
"Name":"VIRTUAL-SKIN-CPU-LIGHT-ODPM",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -409,21 +409,21 @@
"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],
"HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
"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"]
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 4600, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
@ -432,17 +432,15 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 7, 7, 7, 7, 9, 9],
"LimitInfo": [0, 0, 0, 0, 7, 9, 9]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -450,8 +448,105 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
}
]
},
{
"Name":"VIRTUAL-SKIN-CPU-MID",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 2800, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"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, 9, 9, 9, 9, 9, 9]
},
{
"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, 12, 12, 12, 12, 12, 12]
}
]
},
{
"Name":"VIRTUAL-SKIN-CPU-HIGH",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 0.0, 0.0, 0.0],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"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, 11, 11, 11, 11, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
}
]
},
@ -487,17 +582,17 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 7, 7, 7, 7, 9, 9],
"LimitInfo": [0, 0, 0, 0, 7, 9, 9]
"CdevCeiling": [0, 8, 8, 8, 8, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 11, 11, 11, 11, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -505,8 +600,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
},
{
"CdevRequest": "thermal-gpufreq-0",
@ -515,7 +610,7 @@
"MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 9, 11, 11]
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
}
]
},

View file

@ -378,7 +378,7 @@
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-CPU",
"Name":"VIRTUAL-SKIN-CPU-LIGHT-ODPM",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -386,40 +386,38 @@
"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],
"HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
"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"]
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 4600, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 7, 7, 7, 7, 9, 9],
"LimitInfo": [0, 0, 0, 0, 7, 9, 9]
"CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -427,8 +425,105 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
}
]
},
{
"Name":"VIRTUAL-SKIN-CPU-MID",
"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", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 2800, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
},
{
"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, 9, 9, 9, 9, 9, 9]
},
{
"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, 12, 12, 12, 12, 12, 12]
}
]
},
{
"Name":"VIRTUAL-SKIN-CPU-HIGH",
"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", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 0.0, 0.0, 0.0],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
},
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8]
},
{
"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, 11, 11, 11, 11, 11, 11]
},
{
"CdevRequest": "thermal-cpufreq-2",
"CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
}
]
},
@ -464,17 +559,17 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 7, 7, 7, 7, 9, 9],
"LimitInfo": [0, 0, 0, 0, 7, 9, 9]
"CdevCeiling": [0, 8, 8, 8, 8, 9, 9],
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
},
{
"CdevRequest": "thermal-cpufreq-1",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 11, 11, 11, 11, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
},
{
"CdevRequest": "thermal-cpufreq-2",
@ -482,8 +577,8 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 2,
"BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14]
"CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
"LimitInfo": [0, 0, 0, 0, 0, 14, 14]
},
{
"CdevRequest": "thermal-gpufreq-0",
@ -492,7 +587,7 @@
"MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 9, 11, 11]
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
}
]
},