From ba2a4ec4588b18f59ad6d7e9fe154f3136357c28 Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 18 Oct 2021 10:28:51 -0700 Subject: [PATCH] bcl: Enable limitation on VDROOPX and BATOILO To mitigate Synthetic load in brownout test, we need to increase UVLO1 to 3.2V, UVLO2 to 3.0V, and increase BAT_OILO deglitch time from 100us to 1ms. In addition, we must limit DVFS State whenever the interrupts are triggered. Bug: 200943374 Test: Local test Signed-off-by: George Lee Change-Id: Iaf607b48eda878fc47cb4eb85e326e2d0a8684f0 --- thermal_info_config_oriole.json | 82 +++++++++++++++++++++++++++++---- thermal_info_config_raven.json | 82 +++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 18 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index ef850a8..148676a 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -724,7 +724,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -753,7 +753,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -790,6 +790,14 @@ { "CdevRequest": "thermal-cpufreq-2", "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 7, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 0, 4, 5] } ] }, @@ -816,7 +824,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop1", @@ -826,7 +848,7 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], @@ -841,7 +863,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop2", @@ -851,7 +887,7 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], @@ -866,7 +902,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 15, 15, 15] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"smpl_gm", @@ -876,7 +926,7 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], @@ -891,7 +941,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 13, 13, 13] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 3730e83..db9cb5e 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -699,7 +699,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -728,7 +728,7 @@ "Coefficient":[ "-10000", "400", - "1200" + "1000" ], "HotThreshold":[ "NAN", @@ -765,6 +765,14 @@ { "CdevRequest": "thermal-cpufreq-2", "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 7, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 0, 4, 5] } ] }, @@ -791,7 +799,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop1", @@ -801,7 +823,7 @@ "NAN", "NAN", "NAN", - 1150, + 1000, "NAN", "NAN" ], @@ -816,7 +838,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"vdroop2", @@ -826,7 +862,7 @@ "NAN", "NAN", "NAN", - 1350, + 1200, "NAN", "NAN" ], @@ -841,7 +877,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 15, 15, 15] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"smpl_gm", @@ -851,7 +901,7 @@ "NAN", "NAN", "NAN", - 1400, + 1100, "NAN", "NAN" ], @@ -866,7 +916,21 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Monitor":true, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 13, 13, 13] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + } + ] }, { "Name":"ocp_cpu1",