From 110e5b218142d1dcf8df8e1d5c884ef40500a47b Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Mon, 30 Aug 2021 20:02:45 -0700
Subject: [PATCH] thermal: Update thermal config for charging

Add a new virtual sensor VIRTUAL-SKIN-CHARGE dedicated for charging
and lower the temperature threshold for thermal severity.

Bug: 195619668
Test: Boot
Change-Id: Ia8901e55d161a9d989a3d8450b62efe844900765
---
 thermal_info_config_oriole.json | 60 ++++++++++++++++++++++++++-----
 thermal_info_config_raven.json  | 62 ++++++++++++++++++++++++++++-----
 2 files changed, 105 insertions(+), 17 deletions(-)

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 7e201c0..16e5a16 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -373,18 +373,66 @@
                     "PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
                     "ReleaseLogic": "DECREASE"
                 },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "TriggerSensor":"quiet_therm",
+            "Formula":"MAXIMUM",
+            "Combination":[
+                "VIRTUAL-QI-GNSS",
+                "VIRTUAL-QI-BATT",
+                "VIRTUAL-USB2-DISP",
+                "VIRTUAL-QUIET-BATT"
+            ],
+            "Coefficient":[
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "39.0",
+                "41.0",
+                "43.0",
+                "45.0",
+                "47.0",
+                "55.0"
+            ],
+            "HotHysteresis":[
+                0.0,
+                1.9,
+                1.9,
+                1.9,
+                1.9,
+                1.9,
+                1.9
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001,
+            "Monitor":true,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "BindedCdevInfo": [
                 {
                     "CdevRequest": "fcc",
-                    "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
+                    "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 0, 1, 2, 4 ,4 ,4],
+                    "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 },
                 {
                     "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
                     "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
@@ -393,16 +441,12 @@
                 },
                 {
                     "CdevRequest": "wlc_fcc",
-                    "LimitInfo": [0, 2, 2, 5, 5, 5, 5],
+                    "LimitInfo": [0, 2, 2, 4, 5, 5, 5],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
                     "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
                 }
             ]
         },
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 66f5af7..b4b899a 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -373,18 +373,66 @@
                     "PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
                     "ReleaseLogic": "DECREASE"
                 },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "TriggerSensor":"quiet_therm",
+            "Formula":"MAXIMUM",
+            "Combination":[
+                "VIRTUAL-NEUTRAL-QI",
+                "VIRTUAL-USB2-BATT",
+                "VIRTUAL-GNSS-BATT",
+                "VIRTUAL-QI-DISP"
+            ],
+            "Coefficient":[
+                "1.0",
+                "1.0",
+                "1.0",
+                "1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "39.0",
+                "41.0",
+                "43.0",
+                "45.0",
+                "47.0",
+                "55.0"
+            ],
+            "HotHysteresis":[
+                0.0,
+                1.9,
+                1.9,
+                1.9,
+                1.9,
+                1.9,
+                1.9
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001,
+            "Monitor":true,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "BindedCdevInfo": [
                 {
                     "CdevRequest": "fcc",
-                    "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
+                    "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 0, 1, 2, 3 ,4 ,4],
+                    "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 },
                 {
                     "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
                     "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
@@ -393,16 +441,12 @@
                 },
                 {
                     "CdevRequest": "wlc_fcc",
-                    "LimitInfo": [0, 2, 2, 3, 4, 4, 4],
+                    "LimitInfo": [0, 3, 3, 4, 5, 5, 5],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
-                },
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
                 }
             ]
         },