From c761b412d48d32cbb38cea7c7356f5cde1872878 Mon Sep 17 00:00:00 2001 From: George Lee Date: Mon, 8 Mar 2021 09:26:59 -0800 Subject: [PATCH] thermal: enable monitor mode on vdroop Change smpl_gm triggered to vdroop triggered. Bug: 170304779 Test: Local Test Signed-off-by: George Lee Change-Id: I90b9849be74500fb0d4d072301e3c357cf9838fc --- thermal_info_config_oriole.json | 38 ++++++++++++++++++++++++++++--- thermal_info_config_raven.json | 38 ++++++++++++++++++++++++++++--- thermal_info_config_slider.json | 38 ++++++++++++++++++++++++++++--- thermal_info_config_whitefin.json | 38 ++++++++++++++++++++++++++++--- 4 files changed, 140 insertions(+), 12 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index b6e096b..afa79f0 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -300,16 +300,16 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", + "TriggerSensor": "vdroop1", "Combination":[ "battery", "battery_cycle", - "smpl_gm" + "vdroop1" ], "Coefficient":[ "-10000", "400", - "1400" + "1200" ], "HotThreshold":[ "NAN", @@ -341,6 +341,38 @@ "Multiplier":1, "Monitor":false }, + { + "Name":"vdroop1", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, + { + "Name":"vdroop2", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 55a19ee..872b284 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -300,16 +300,16 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", + "TriggerSensor": "vdroop1", "Combination":[ "battery", "battery_cycle", - "smpl_gm" + "vdroop1" ], "Coefficient":[ "-10000", "400", - "1400" + "1200" ], "HotThreshold":[ "NAN", @@ -341,6 +341,38 @@ "Multiplier":1, "Monitor":false }, + { + "Name":"vdroop1", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, + { + "Name":"vdroop2", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index b4c90a0..02201e6 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -107,16 +107,16 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", + "TriggerSensor": "vdroop1", "Combination":[ "battery", "battery_cycle", - "smpl_gm" + "vdroop1" ], "Coefficient":[ "-10000", "400", - "1400" + "1200" ], "HotThreshold":[ "NAN", @@ -148,6 +148,38 @@ "Multiplier":1, "Monitor":false }, + { + "Name":"vdroop1", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, + { + "Name":"vdroop2", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index b4c90a0..02201e6 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -107,16 +107,16 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", + "TriggerSensor": "vdroop1", "Combination":[ "battery", "battery_cycle", - "smpl_gm" + "vdroop1" ], "Coefficient":[ "-10000", "400", - "1400" + "1200" ], "HotThreshold":[ "NAN", @@ -148,6 +148,38 @@ "Multiplier":1, "Monitor":false }, + { + "Name":"vdroop1", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, + { + "Name":"vdroop2", + "Type":"BCL_VOLTAGE", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + 1200, + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":1, + "Monitor":true + }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE",