Merge "thermal: Move TPU to the VSKIN-SOC PID loop" into main

This commit is contained in:
Peter (YM) 2024-06-12 03:06:40 +00:00 committed by Android (Google) Code Review
commit 071e4e0598
2 changed files with 32 additions and 12 deletions

View file

@ -327,10 +327,6 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{ {
"CdevRequest": "gxp-cooling", "CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6] "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -603,7 +599,7 @@
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -623,7 +619,7 @@
"K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
}, },
@ -663,6 +659,15 @@
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 8, 8, 8, 9, 11, 11], "CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11] "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
} }
] ]
}, },
@ -1138,6 +1143,11 @@
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":1 "PowerSampleCount":1
}, },
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{ {
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,

View file

@ -295,10 +295,6 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{ {
"CdevRequest": "gxp-cooling", "CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6] "LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -571,7 +567,7 @@
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -591,7 +587,7 @@
"K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
}, },
@ -631,6 +627,15 @@
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11], "CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11] "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
} }
] ]
}, },
@ -1171,6 +1176,11 @@
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":1 "PowerSampleCount":1
}, },
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{ {
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,