thermal: Re-enable Monitoring of BCL tzones

Given that PTS-Thermal fix for Monitored tzones and TRIP_DOWN
is enabled.  We can re-enable monitoring of BCL thermal zones.

Bug: 236930961
Test: Boot and confirm settings
Signed-off-by: George Lee <geolee@google.com>
Change-Id: Ic848bff8824d693904e7a575b8679a7e305275b4
This commit is contained in:
George Lee 2022-06-16 15:37:17 -07:00
parent 43ec1192d2
commit 133bcdf2ef
4 changed files with 54 additions and 6 deletions

View file

@ -492,6 +492,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -525,6 +528,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -546,6 +552,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -567,6 +576,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",

View file

@ -173,6 +173,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -238,6 +241,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -245,11 +251,11 @@
}, },
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7] "LimitInfo": [0, 0, 0, 0, 2, 2, 2]
}, },
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 4, 4, 4] "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
} }
] ]
}, },
@ -276,6 +282,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -283,11 +292,11 @@
}, },
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 15, 15, 15] "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
}, },
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 4, 4, 4] "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
} }
] ]
}, },
@ -314,6 +323,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -321,11 +333,11 @@
}, },
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 13, 13, 13] "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}, },
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",
"LimitInfo": [0, 0, 0, 0, 4, 4, 4] "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
} }
] ]
}, },

View file

@ -493,6 +493,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -526,6 +529,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -547,6 +553,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -568,6 +577,9 @@
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",

View file

@ -375,6 +375,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -440,6 +443,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -478,6 +484,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -516,6 +525,9 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":60000,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",