From 79753e6c351d43eee29ca60975f3886b973dfc81 Mon Sep 17 00:00:00 2001 From: George Lee Date: Tue, 7 Jun 2022 09:46:43 -0700 Subject: [PATCH] thermal: Remove PassiveDelay for VDROOP1/2/BATOILO Part of removing monitoring of BCL thermal zones. Bug: 234901714 Test: Boot and confirm settings Signed-off-by: George Lee Change-Id: I470951a6a8676079642c7070687198645a163887 --- thermal_info_config_cheetah.json | 13 +------------ thermal_info_config_panther.json | 10 ---------- thermal_info_config_ravenclaw.json | 10 ---------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index b12b655..d82a559 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -386,7 +386,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -405,7 +404,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -424,7 +422,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -443,7 +440,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -462,7 +458,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -484,7 +479,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -498,7 +492,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -532,7 +525,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -554,7 +546,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -576,7 +567,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -634,8 +624,7 @@ "Type":"BCL_CURRENT", "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true + "Multiplier":1 }, { "Name":"soft_ocp_tpu", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 3419f92..442d2e9 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -387,7 +387,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -406,7 +405,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -425,7 +423,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -444,7 +441,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -463,7 +459,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -485,7 +480,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -499,7 +493,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -533,7 +526,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -555,7 +547,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -577,7 +568,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index 8d0611a..d61f670 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -176,7 +176,6 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -210,7 +209,6 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -246,7 +244,6 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -282,7 +279,6 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -316,7 +312,6 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-gpufreq-0", @@ -350,7 +345,6 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "tpu_cooling", @@ -381,7 +375,6 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -447,7 +440,6 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -486,7 +478,6 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", @@ -525,7 +516,6 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "PassiveDelay":500, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2",