thermal: start VIRTUAL-SKIN-CHARGE monitoring from 25 degC am: af4434cc65
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/21987868 Change-Id: Iccb911f20bad8a1c8026a28930adaae6a862a8f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TeYuan Wang
Automerger Merge Worker
commit
e1d653236e
2 changed files with 30 additions and 54 deletions
|
|
@ -445,26 +445,27 @@
|
|||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
|
||||
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0],
|
||||
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":300000,
|
||||
"PassiveDelay":7000,
|
||||
"PollingDelay":60000,
|
||||
"PassiveDelay":60000,
|
||||
"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_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
|
||||
"K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"],
|
||||
"K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"],
|
||||
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Max":["NAN", "NAN", 2000, "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"]
|
||||
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
|
||||
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Default":2000
|
||||
},
|
||||
"ExcludedPowerInfo": [
|
||||
{
|
||||
"PowerRail": "PARTIAL_SYSTEM_POWER",
|
||||
"PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
|
||||
"PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
|
||||
}
|
||||
],
|
||||
"BindedCdevInfo": [
|
||||
|
|
@ -473,7 +474,7 @@
|
|||
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 1,
|
||||
"CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
|
||||
"CdevCeiling": [0, 5, 8, 8, 9, 9, 9],
|
||||
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
|
||||
}
|
||||
]
|
||||
|
|
@ -565,17 +566,10 @@
|
|||
}
|
||||
],
|
||||
"PowerRails":[
|
||||
{
|
||||
"Name":"PPVAR_VSYS_PWR_DISP"
|
||||
},
|
||||
{
|
||||
"Name":"VSYS_PWR_MODEM"
|
||||
},
|
||||
{
|
||||
"Name":"S2M_VDD_CPUCL2",
|
||||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":1
|
||||
|
||||
},
|
||||
{
|
||||
"Name":"S3M_VDD_CPUCL1",
|
||||
|
|
@ -587,12 +581,6 @@
|
|||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":1
|
||||
},
|
||||
{
|
||||
"Name":"S5M_VDD_INT"
|
||||
},
|
||||
{
|
||||
"Name":"S1M_VDD_MIF"
|
||||
},
|
||||
{
|
||||
"Name":"S2S_VDD_G3D",
|
||||
"PowerSampleDelay":7000,
|
||||
|
|
@ -602,8 +590,8 @@
|
|||
"Name":"PARTIAL_SYSTEM_POWER",
|
||||
"VirtualRails":true,
|
||||
"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"],
|
||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
||||
"Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "VSYS_PWR_MMWAVE", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"],
|
||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
||||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":5
|
||||
}
|
||||
|
|
|
|||
|
|
@ -452,26 +452,27 @@
|
|||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
|
||||
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0],
|
||||
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":300000,
|
||||
"PassiveDelay":7000,
|
||||
"PollingDelay":60000,
|
||||
"PassiveDelay":60000,
|
||||
"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_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
|
||||
"K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"],
|
||||
"K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"],
|
||||
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Max":["NAN", "NAN", 2000, "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"]
|
||||
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
|
||||
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Default":2000
|
||||
},
|
||||
"ExcludedPowerInfo": [
|
||||
{
|
||||
"PowerRail": "PARTIAL_SYSTEM_POWER",
|
||||
"PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
|
||||
"PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
|
||||
}
|
||||
],
|
||||
"BindedCdevInfo": [
|
||||
|
|
@ -480,7 +481,7 @@
|
|||
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
|
||||
"MaxReleaseStep": 1,
|
||||
"MaxThrottleStep": 1,
|
||||
"CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
|
||||
"CdevCeiling": [0, 5, 8, 8, 9, 9, 9],
|
||||
"LimitInfo": [0, 0, 0, 0, 0, 9, 9]
|
||||
}
|
||||
]
|
||||
|
|
@ -572,17 +573,10 @@
|
|||
}
|
||||
],
|
||||
"PowerRails":[
|
||||
{
|
||||
"Name":"PPVAR_VSYS_PWR_DISP"
|
||||
},
|
||||
{
|
||||
"Name":"VSYS_PWR_MODEM"
|
||||
},
|
||||
{
|
||||
"Name":"S2M_VDD_CPUCL2",
|
||||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":1
|
||||
|
||||
},
|
||||
{
|
||||
"Name":"S3M_VDD_CPUCL1",
|
||||
|
|
@ -594,12 +588,6 @@
|
|||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":1
|
||||
},
|
||||
{
|
||||
"Name":"S5M_VDD_INT"
|
||||
},
|
||||
{
|
||||
"Name":"S1M_VDD_MIF"
|
||||
},
|
||||
{
|
||||
"Name":"S2S_VDD_G3D",
|
||||
"PowerSampleDelay":7000,
|
||||
|
|
@ -609,8 +597,8 @@
|
|||
"Name":"PARTIAL_SYSTEM_POWER",
|
||||
"VirtualRails":true,
|
||||
"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"],
|
||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
||||
"Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "VSYS_PWR_MMWAVE", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"],
|
||||
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
|
||||
"PowerSampleDelay":7000,
|
||||
"PowerSampleCount":5
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue