Merge "thermal: update charging thermal throttling" into main

This commit is contained in:
Treehugger Robot 2024-06-26 09:42:33 +00:00 committed by Android (Google) Code Review
commit adb687fe6a
2 changed files with 47 additions and 47 deletions

View file

@ -108,24 +108,24 @@
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1600
"I_Default":846
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
"PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
}
],
"BindedCdevInfo": [
@ -149,27 +149,27 @@
"Combination":["charging_therm", "usb_pwr_therm", "soc_therm"],
"Coefficient":[0.259, 0.418, 0.23],
"Offset":2146,
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1400, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":400
"I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1383
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
"PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42]
}
],
"BindedCdevInfo": [
@ -179,7 +179,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 1, 1, 1, 1, 26, 26]
"LimitInfo": [0, 0, 1, 1, 26, 26, 26]
}
]
},

View file

@ -702,24 +702,24 @@
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1600
"I_Default":846
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
"PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
}
],
"BindedCdevInfo": [
@ -743,27 +743,27 @@
"Combination":["charging_therm", "usb_pwr_therm", "soc_therm"],
"Coefficient":[0.259, 0.418, 0.23],
"Offset":2146,
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
"K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1400, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":400
"I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1383
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
"PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
"PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42]
}
],
"BindedCdevInfo": [
@ -773,7 +773,7 @@
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 1, 1, 1, 1, 26, 26]
"LimitInfo": [0, 0, 1, 1, 26, 26, 26]
}
]
},
@ -1035,4 +1035,4 @@
}
}
}
}
}