Merge "thermal: Move TPU to the VSKIN-SOC PID loop" into 24D1-dev am: 30eb0787d6

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27197052

Change-Id: I5f9e2d0709dd876d22998504f048316cf066cda6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-05-03 17:31:39 +00:00 committed by Automerger Merge Worker
commit ba480d5089
3 changed files with 49 additions and 19 deletions

View file

@ -355,10 +355,6 @@
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -376,7 +372,7 @@
0.055, 0.002, 0.029, 0.061, 0.072, 0.011, 0.04, 0.027, 0.072,
0.071, 0.003, 0.026, 0.03, 0.04, 0.015, 0.001, 0.035, 0.042],
"OffsetThresholds": [0.0],
"OffsetValues": [-490.0],
"OffsetValues": [-490.0],
"Multiplier": 0.001
},
{
@ -705,7 +701,7 @@
]
},
{
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -725,7 +721,7 @@
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "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"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
},
@ -765,6 +761,15 @@
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 10, 12, 12],
"LimitInfo": [0, 0, 0, 0, 0, 12, 12]
},
{
"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]
}
]
},
@ -1199,6 +1204,11 @@
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S2S_VDD_G3D",
"PowerSampleDelay":7000,

View file

@ -345,10 +345,6 @@
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -681,7 +677,7 @@
]
},
{
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -701,7 +697,7 @@
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "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"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
},
@ -741,6 +737,15 @@
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 10, 12, 12],
"LimitInfo": [0, 0, 0, 0, 0, 12, 12]
},
{
"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]
}
]
},
@ -1191,6 +1196,11 @@
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,

View file

@ -334,10 +334,6 @@
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -686,7 +682,7 @@
]
},
{
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -706,7 +702,7 @@
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "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"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
},
@ -746,6 +742,15 @@
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 10, 12, 12],
"LimitInfo": [0, 0, 0, 0, 0, 12, 12]
},
{
"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]
}
]
},
@ -1207,6 +1212,11 @@
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,