thermal: bringup charge_mdis PID loop
Bug: 209635028 Bug: 226130317 Test: emul_temp with different power workload Change-Id: Ic26adbe21450c14569135dd4694083701070df58
This commit is contained in:
TeYuan Wang
Jia-yi Chen
parent
4bf5bce6ad
commit
d3c9705ecd
2 changed files with 59 additions and 101 deletions
|
|
@ -99,17 +99,6 @@
|
||||||
"Offset":-453,
|
"Offset":-453,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"VIRTUAL-QI-QUIET",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["qi_therm","quiet_therm"],
|
|
||||||
"Coefficient":[0.3, 0.7],
|
|
||||||
"Offset":-500,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-QI-DISP",
|
"Name":"VIRTUAL-QI-DISP",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
|
@ -214,42 +203,40 @@
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"TriggerSensor":"quiet_therm",
|
"TriggerSensor":"quiet_therm",
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"],
|
"Combination":["qi_therm","quiet_therm"],
|
||||||
"Coefficient":[1.0, 1.0],
|
"Coefficient":[0.35, 0.65],
|
||||||
|
"Offset":-650,
|
||||||
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
|
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
|
||||||
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
|
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
|
||||||
"Multiplier":0.001,
|
"Multiplier":0.001,
|
||||||
"Monitor":true,
|
|
||||||
"PollingDelay":300000,
|
"PollingDelay":300000,
|
||||||
"PassiveDelay":7000,
|
"PassiveDelay":7000,
|
||||||
|
"PIDInfo": {
|
||||||
|
"K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"K_Pu":["NAN", "NAN", 800, "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", 800, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
|
||||||
|
},
|
||||||
|
"ExcludedPowerInfo": [
|
||||||
|
{
|
||||||
|
"PowerRail": "PARTIAL_SYSTEM_POWER",
|
||||||
|
"PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
|
||||||
|
}
|
||||||
|
],
|
||||||
"BindedCdevInfo": [
|
"BindedCdevInfo": [
|
||||||
{
|
{
|
||||||
"CdevRequest": "fcc",
|
"CdevRequest": "chg_mdis",
|
||||||
"LimitInfo": [0, 2, 3, 3, 4, 4, 4],
|
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
|
||||||
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
"MaxReleaseStep": 1,
|
||||||
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
|
"MaxThrottleStep": 1,
|
||||||
"CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4],
|
"CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
|
||||||
"ReleaseLogic": "RELEASE_TO_FLOOR",
|
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
|
||||||
"ThrottlingWithPowerLink":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"CdevRequest": "dc_icl",
|
|
||||||
"LimitInfo": [0, 1, 2, 3, 4, 4, 4],
|
|
||||||
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
|
||||||
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
|
|
||||||
"CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4],
|
|
||||||
"ReleaseLogic": "RELEASE_TO_FLOOR",
|
|
||||||
"ThrottlingWithPowerLink":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"CdevRequest": "wlc_fcc",
|
|
||||||
"LimitInfo": [0, 3, 3, 4, 5, 5, 5],
|
|
||||||
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
|
||||||
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
|
|
||||||
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5],
|
|
||||||
"ReleaseLogic": "RELEASE_TO_FLOOR",
|
|
||||||
"ThrottlingWithPowerLink":true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
@ -701,15 +688,7 @@
|
||||||
"State2Power":[4371, 3543, 3085, 2293, 1927, 1707, 1394, 1171, 967, 768, 592, 433]
|
"State2Power":[4371, 3543, 3085, 2293, 1927, 1707, 1394, 1171, 967, 768, 592, 433]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"fcc",
|
"Name":"chg_mdis",
|
||||||
"Type":"BATTERY"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"dc_icl",
|
|
||||||
"Type":"BATTERY"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"wlc_fcc",
|
|
||||||
"Type":"BATTERY"
|
"Type":"BATTERY"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -762,12 +741,12 @@
|
||||||
"PowerSampleCount":1
|
"PowerSampleCount":1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"POWER_FOR_CHARGING_THROTTLING",
|
"Name":"PARTIAL_SYSTEM_POWER",
|
||||||
"VirtualRails":true,
|
"VirtualRails":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
|
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
|
||||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
||||||
"PowerSampleDelay":14000,
|
"PowerSampleDelay":7000,
|
||||||
"PowerSampleCount":5
|
"PowerSampleCount":5
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -99,17 +99,6 @@
|
||||||
"Offset":-500,
|
"Offset":-500,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Name":"VIRTUAL-QI-QUIET",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["qi_therm", "quiet_therm"],
|
|
||||||
"Coefficient":[0.3, 0.7],
|
|
||||||
"Offset":-1400,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-QI-DISP",
|
"Name":"VIRTUAL-QI-DISP",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
|
@ -214,42 +203,40 @@
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"TriggerSensor":"quiet_therm",
|
"TriggerSensor":"quiet_therm",
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"],
|
"Combination":["qi_therm", "quiet_therm"],
|
||||||
"Coefficient":[1.0, 1.0],
|
"Coefficient":[0.282, 0.718],
|
||||||
|
"Offset":-448,
|
||||||
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
|
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
|
||||||
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
|
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
|
||||||
"Multiplier":0.001,
|
"Multiplier":0.001,
|
||||||
"Monitor":true,
|
|
||||||
"PollingDelay":300000,
|
"PollingDelay":300000,
|
||||||
"PassiveDelay":7000,
|
"PassiveDelay":7000,
|
||||||
|
"PIDInfo": {
|
||||||
|
"K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"K_Pu":["NAN", "NAN", 800, "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", 800, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
|
||||||
|
"I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
|
||||||
|
},
|
||||||
|
"ExcludedPowerInfo": [
|
||||||
|
{
|
||||||
|
"PowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
||||||
|
"PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
|
||||||
|
}
|
||||||
|
],
|
||||||
"BindedCdevInfo": [
|
"BindedCdevInfo": [
|
||||||
{
|
{
|
||||||
"CdevRequest": "fcc",
|
"CdevRequest": "chg_mdis",
|
||||||
"LimitInfo": [0, 2, 3, 3, 4, 4, 4],
|
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
|
||||||
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
"MaxReleaseStep": 1,
|
||||||
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
|
"MaxThrottleStep": 1,
|
||||||
"CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4],
|
"CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
|
||||||
"ReleaseLogic": "RELEASE_TO_FLOOR",
|
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
|
||||||
"ThrottlingWithPowerLink":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"CdevRequest": "dc_icl",
|
|
||||||
"LimitInfo": [0, 1, 2, 3, 4, 4, 4],
|
|
||||||
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
|
||||||
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
|
|
||||||
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
|
|
||||||
"ReleaseLogic": "RELEASE_TO_FLOOR",
|
|
||||||
"ThrottlingWithPowerLink":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"CdevRequest": "wlc_fcc",
|
|
||||||
"LimitInfo": [0, 2, 2, 4, 5, 5, 5],
|
|
||||||
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
|
|
||||||
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
|
|
||||||
"CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
|
|
||||||
"ReleaseLogic": "RELEASE_TO_FLOOR",
|
|
||||||
"ThrottlingWithPowerLink":true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
@ -701,15 +688,7 @@
|
||||||
"State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452]
|
"State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"fcc",
|
"Name":"chg_mdis",
|
||||||
"Type":"BATTERY"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"dc_icl",
|
|
||||||
"Type":"BATTERY"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"wlc_fcc",
|
|
||||||
"Type":"BATTERY"
|
"Type":"BATTERY"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -767,7 +746,7 @@
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
|
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
|
||||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
||||||
"PowerSampleDelay":14000,
|
"PowerSampleDelay":7000,
|
||||||
"PowerSampleCount":5
|
"PowerSampleCount":5
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue