thermal: Remove Monitor flag for BCL tzones.

Since all of the BCL tzones are triggered from IRQ, we do not need to
monitor the tzones.

Bug: 197189623
Test: Pts Thermal test passing
Signed-off-by: George Lee <geolee@google.com>
Change-Id: I96a245329e59a19f5baf15992c87a3ea568b7ddf
This commit is contained in:
George Lee 2022-04-28 13:55:44 -07:00
parent 5d30102080
commit b2180f952b
4 changed files with 26 additions and 68 deletions

View file

@ -373,8 +373,7 @@
"Name":"soc", "Name":"soc",
"Type":"BCL_PERCENTAGE", "Type":"BCL_PERCENTAGE",
"HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"],
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"BCL_TPU_LOW_TEMP", "Name":"BCL_TPU_LOW_TEMP",
@ -499,7 +498,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -534,7 +532,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -557,7 +554,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -580,7 +576,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -618,24 +613,21 @@
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "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
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "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
}, },
{ {
"Name":"soft_ocp_cpu2", "Name":"soft_ocp_cpu2",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "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
}, },
{ {
"Name":"soft_ocp_cpu1", "Name":"soft_ocp_cpu1",

View file

@ -148,8 +148,7 @@
"NAN" "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"batoilo", "Name":"batoilo",
@ -174,7 +173,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -240,7 +238,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -279,7 +276,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -318,7 +314,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -356,8 +351,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"ocp_cpu2", "Name":"ocp_cpu2",
@ -381,8 +375,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"ocp_tpu", "Name":"ocp_tpu",
@ -406,8 +399,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
@ -431,8 +423,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_cpu2", "Name":"soft_ocp_cpu2",
@ -456,8 +447,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_cpu1", "Name":"soft_ocp_cpu1",
@ -481,8 +471,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_tpu", "Name":"soft_ocp_tpu",
@ -506,8 +495,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",
@ -531,8 +519,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"TPU", "Name":"TPU",

View file

@ -499,7 +499,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -534,7 +533,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -557,7 +555,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -580,7 +577,6 @@
"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,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -618,32 +614,28 @@
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "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
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "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
}, },
{ {
"Name":"soft_ocp_cpu2", "Name":"soft_ocp_cpu2",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "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
}, },
{ {
"Name":"soft_ocp_cpu1", "Name":"soft_ocp_cpu1",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "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
}, },
{ {
"Name":"soft_ocp_tpu", "Name":"soft_ocp_tpu",

View file

@ -148,8 +148,7 @@
"NAN" "NAN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"BCL_TPU_LOW_TEMP", "Name":"BCL_TPU_LOW_TEMP",
@ -382,7 +381,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -449,7 +447,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -489,7 +486,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -529,7 +525,6 @@
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true,
"PassiveDelay":500, "PassiveDelay":500,
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -568,8 +563,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"ocp_cpu2", "Name":"ocp_cpu2",
@ -593,8 +587,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"ocp_tpu", "Name":"ocp_tpu",
@ -618,8 +611,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
@ -643,8 +635,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_cpu2", "Name":"soft_ocp_cpu2",
@ -668,8 +659,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_cpu1", "Name":"soft_ocp_cpu1",
@ -693,8 +683,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_tpu", "Name":"soft_ocp_tpu",
@ -718,8 +707,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",
@ -743,8 +731,7 @@
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1
"Monitor":true
}, },
{ {
"Name":"TPU", "Name":"TPU",