From fa5437f715fb0f8e26d34767c4fd22fcefbebfa4 Mon Sep 17 00:00:00 2001 From: George Lee Date: Wed, 12 Jan 2022 09:50:00 -0800 Subject: [PATCH] thermal: update BCL policy changes Bug: 197028142 Test: Boot and confirm temperature reading Signed-off-by: George Lee Change-Id: If63882cd7335e002a6df51cd6bd1d37f5d8d24e3 --- thermal_info_config_cheetah.json | 164 ++++++++++++++++++++++++-- thermal_info_config_cloudripper.json | 166 +++++++++++++++++++++++++-- thermal_info_config_panther.json | 164 ++++++++++++++++++++++++-- thermal_info_config_ravenclaw.json | 166 +++++++++++++++++++++++++-- 4 files changed, 626 insertions(+), 34 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index adf68b4..20e3f88 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -448,7 +448,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -477,7 +477,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -517,6 +517,37 @@ } ] }, + { + "Name":"batoilo", + "Type":"BCL_CURRENT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 5000, + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] + }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", @@ -525,13 +556,28 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"vdroop2", @@ -541,13 +587,28 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"smpl_gm", @@ -557,13 +618,28 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"ocp_cpu1", @@ -577,6 +653,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -593,6 +678,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -609,6 +703,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -625,6 +728,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -641,6 +753,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -657,6 +778,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -673,6 +803,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -689,6 +828,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index dba54ac..207916c 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -90,7 +90,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -98,7 +98,7 @@ "NAN", "NAN", "NAN", - 3.00, + 3.00, "NAN" ], "VrThreshold":"NAN", @@ -119,7 +119,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -159,6 +159,37 @@ } ] }, + { + "Name":"batoilo", + "Type":"BCL_CURRENT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 5000, + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] + }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", @@ -167,13 +198,28 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"vdroop2", @@ -183,13 +229,28 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"smpl_gm", @@ -199,13 +260,28 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"ocp_cpu1", @@ -219,6 +295,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -235,6 +320,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -251,6 +345,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -267,6 +370,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -283,6 +395,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -299,6 +420,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -315,6 +445,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -331,6 +470,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index d888118..a9d6b4a 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -476,7 +476,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -505,7 +505,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -545,6 +545,37 @@ } ] }, + { + "Name":"batoilo", + "Type":"BCL_CURRENT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 5000, + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] + }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", @@ -553,13 +584,28 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"vdroop2", @@ -569,13 +615,28 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"smpl_gm", @@ -585,13 +646,28 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"ocp_cpu1", @@ -605,6 +681,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -621,6 +706,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -637,6 +731,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -653,6 +756,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -669,6 +781,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -685,6 +806,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -701,6 +831,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -717,6 +856,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index dba54ac..207916c 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -90,7 +90,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -98,7 +98,7 @@ "NAN", "NAN", "NAN", - 3.00, + 3.00, "NAN" ], "VrThreshold":"NAN", @@ -119,7 +119,7 @@ "Coefficient":[ "-10000", "400", - "1150" + "1000" ], "HotThreshold":[ "NAN", @@ -159,6 +159,37 @@ } ] }, + { + "Name":"batoilo", + "Type":"BCL_CURRENT", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 5000, + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] + }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", @@ -167,13 +198,28 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"vdroop2", @@ -183,13 +229,28 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"smpl_gm", @@ -199,13 +260,28 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + } + ] }, { "Name":"ocp_cpu1", @@ -219,6 +295,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -235,6 +320,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -251,6 +345,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -267,6 +370,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -283,6 +395,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -299,6 +420,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -315,6 +445,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -331,6 +470,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true