bcl: enable batoilo thermal zone
Enable batoilo thermal zone for further bcl policy definition.
Also fix the multiplier for ocp_warn tzone.
Bug: 194240210
Test: batoilo trigger under stress test.
Signed-off-by: George Lee <geolee@google.com>
Change-Id: Idfd3efc72efaa8813a2b6c62271ce4e6fec3bca7
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index f08234d..3e9022e 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -696,6 +696,22 @@
]
},
{
+ "Name":"batoilo",
+ "Type":"BCL_CURRENT",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ 5000,
+ "NAN",
+ "NAN"
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":1,
+ "Monitor":true
+ },
+ {
"Name":"vdroop1",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
@@ -751,13 +767,13 @@
"NAN",
"NAN",
"NAN",
- 7,
+ 7000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_cpu2",
@@ -767,13 +783,13 @@
"NAN",
"NAN",
"NAN",
- 12,
+ 12000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_tpu",
@@ -783,13 +799,13 @@
"NAN",
"NAN",
"NAN",
- 10.5,
+ 10500,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_gpu",
@@ -799,13 +815,13 @@
"NAN",
"NAN",
"NAN",
- 12,
+ 12000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_cpu2",
@@ -815,13 +831,13 @@
"NAN",
"NAN",
"NAN",
- 9,
+ 9000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_cpu1",
@@ -831,13 +847,13 @@
"NAN",
"NAN",
"NAN",
- 7.00,
+ 7000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_tpu",
@@ -847,13 +863,13 @@
"NAN",
"NAN",
"NAN",
- 8.5,
+ 8500,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_gpu",
@@ -863,13 +879,13 @@
"NAN",
"NAN",
"NAN",
- 9,
+ 9000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"TPU",
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index 4b4f17d..c0597b5 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -385,6 +385,22 @@
]
},
{
+ "Name":"batoilo",
+ "Type":"BCL_CURRENT",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ 5000,
+ "NAN",
+ "NAN"
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":1,
+ "Monitor":true
+ },
+ {
"Name":"vdroop1",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
@@ -446,7 +462,7 @@
],
"VrThreshold":"NAN",
"Multiplier":0.001,
- "Monitor":false
+ "Monitor":true
},
{
"Name":"ocp_cpu2",
@@ -456,13 +472,13 @@
"NAN",
"NAN",
"NAN",
- 12,
+ 12000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_tpu",
@@ -472,13 +488,13 @@
"NAN",
"NAN",
"NAN",
- 10.5,
+ 10500,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_gpu",
@@ -488,13 +504,13 @@
"NAN",
"NAN",
"NAN",
- 12,
+ 12000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_cpu2",
@@ -504,13 +520,13 @@
"NAN",
"NAN",
"NAN",
- 9,
+ 9000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_cpu1",
@@ -520,13 +536,13 @@
"NAN",
"NAN",
"NAN",
- 7.00,
+ 7000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_tpu",
@@ -536,13 +552,13 @@
"NAN",
"NAN",
"NAN",
- 8.5,
+ 8500,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_gpu",
@@ -552,13 +568,13 @@
"NAN",
"NAN",
"NAN",
- 9,
+ 9000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"TPU",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 3203be9..5d59943 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -696,6 +696,22 @@
]
},
{
+ "Name":"batoilo",
+ "Type":"BCL_CURRENT",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ 5000,
+ "NAN",
+ "NAN"
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":1,
+ "Monitor":true
+ },
+ {
"Name":"vdroop1",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
@@ -751,13 +767,13 @@
"NAN",
"NAN",
"NAN",
- 7,
+ 7000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_cpu2",
@@ -767,13 +783,13 @@
"NAN",
"NAN",
"NAN",
- 12,
+ 12000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_tpu",
@@ -783,13 +799,13 @@
"NAN",
"NAN",
"NAN",
- 10.5,
+ 10500,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"ocp_gpu",
@@ -799,13 +815,13 @@
"NAN",
"NAN",
"NAN",
- 12,
+ 12000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_cpu2",
@@ -815,13 +831,13 @@
"NAN",
"NAN",
"NAN",
- 9,
+ 9000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_cpu1",
@@ -831,13 +847,13 @@
"NAN",
"NAN",
"NAN",
- 7.00,
+ 7000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_tpu",
@@ -847,13 +863,13 @@
"NAN",
"NAN",
"NAN",
- 8.5,
+ 8500,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"soft_ocp_gpu",
@@ -863,13 +879,13 @@
"NAN",
"NAN",
"NAN",
- 9,
+ 9000,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
+ "Multiplier":1,
+ "Monitor":true
},
{
"Name":"TPU",