From 156e8f1afec73ae88ac1e8a9d22488f3979c177d Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 24 May 2021 12:11:48 -0700 Subject: [PATCH] thermal: add soc to thermal HAL monitoring Bug: 188365095 Test: Confirm throttling based on criteria matched Signed-off-by: George Lee Change-Id: I417ced61da6fe2bf44927878676bee877789fd23 --- thermal_info_config_oriole.json | 36 +++++++++++++++++++++++++++++---- thermal_info_config_raven.json | 36 +++++++++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 8 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 7a5ef91..805613b 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -528,14 +528,42 @@ "NAN", "NAN", "NAN", - "NAN", 90, - "NAN", + 93, + 96, "NAN" ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":false + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":5000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "fcc", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + } + ] }, { "Name":"vdroop1", @@ -705,7 +733,7 @@ "NAN", "NAN", "NAN", - 9.0, + 9, "NAN", "NAN" ], diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 3a97c0b..4feded5 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -528,14 +528,42 @@ "NAN", "NAN", "NAN", - "NAN", 90, - "NAN", + 93, + 96, "NAN" ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":false + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":5000, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-2", + "LimitInfo": [0, 0, 0, 7, 7, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "thermal-gpufreq-0", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "fcc", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + } + ] }, { "Name":"vdroop1", @@ -705,7 +733,7 @@ "NAN", "NAN", "NAN", - 12, + 9, "NAN", "NAN" ],