From 1c2f2a4cf2fae635e83e90695675263a17288ac7 Mon Sep 17 00:00:00 2001 From: George Lee Date: Fri, 19 Aug 2022 05:10:47 +0000 Subject: [PATCH] Revert "thermal: remove userspace throttling for BCL tzone" This reverts commit 7e2cc1ebbe6958d59bf7bc40628a07f02ac86f9f. Reason for revert: Move throttling back to userspace Bug: 239887528 Signed-off-by: George Lee Change-Id: I4ef3851a7163e50ed95862ba99330046634e032c --- thermal_info_config_cheetah.json | 68 ++++++++++++++++++++++++++-- thermal_info_config_cloudripper.json | 68 ++++++++++++++++++++++++++-- thermal_info_config_panther.json | 68 ++++++++++++++++++++++++++-- thermal_info_config_ravenclaw.json | 68 ++++++++++++++++++++++++++-- 4 files changed, 256 insertions(+), 16 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 5a134bd..b848b8a 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -511,7 +511,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -532,7 +547,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -541,7 +571,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -550,7 +595,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index 95bde43..a597fac 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -174,7 +174,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -227,7 +242,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -253,7 +283,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -279,7 +324,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 0ea1598..7597ae5 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -512,7 +512,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -533,7 +548,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -542,7 +572,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -551,7 +596,22 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1", diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index f417914..26e5dbd 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -376,7 +376,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 5, 5, 5] + } + ] }, { "Name":"BCL_AUDIO_BAACL", @@ -429,7 +444,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 2, 2, 2] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"vdroop2", @@ -455,7 +485,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 4, 4, 4] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"smpl_gm", @@ -481,7 +526,22 @@ "VrThreshold":"NAN", "Multiplier":1, "Monitor":true, - "PassiveDelay":7000 + "PollingDelay":0, + "PassiveDelay":1000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + }, + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 0, 0, 0, 3, 3, 3] + } + ] }, { "Name":"ocp_cpu1",