From 5243b1a5cae31c9987bf43ad4c81a15ac8225080 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Tue, 28 Jun 2022 12:16:42 +0800
Subject: [PATCH] thermal: enable logging for USBC virtual sensor

Bug: 222577017
Test: Verified by emul_temp
06-28 14:33:25.423 I/pixel-thermal( 6959): usb_pwr_therm: 37
06-28 14:33:25.424 I/pixel-thermal( 6959): USB-MINUS-USB2: 8.456
06-28 14:33:25.425 I/pixel-thermal( 6959): USB-MINUS-NEUTRAL: 7.676

Change-Id: I13a13aa4df7d68946ed0aab7937495b5b5365704
---
 thermal_info_config_cheetah.json | 26 ++++++++++++++++++++++----
 thermal_info_config_panther.json | 26 ++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 9b45769..f0c7896 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -259,19 +259,39 @@
             "Name":"USB-MINUS-USB2",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
+            "TriggerSensor": "usb_pwr_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_pwr_therm", "usb_pwr_therm2"],
             "Coefficient":[1.0, -1.0],
-            "Multiplier":0.001
+            "HotThreshold":["NAN", "2.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                }
+            ],
+            "Multiplier":0.001,
+            "PollingDelay":0,
+            "PassiveDelay":7000
         },
         {
             "Name":"USB-MINUS-NEUTRAL",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
+            "TriggerSensor": "usb_pwr_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_pwr_therm", "neutral_therm"],
             "Coefficient":[1.0, -1.0],
-            "Multiplier":0.001
+            "HotThreshold":["NAN", "4.5", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                }
+            ],
+            "Multiplier":0.001,
+            "PollingDelay":0,
+            "PassiveDelay":7000
         },
         {
             "Name":"VIRTUAL-USB-THROTTLING",
@@ -288,7 +308,6 @@
                     "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
                 }
             ],
-            "VrThreshold":"NAN",
             "Multiplier":1,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -302,7 +321,6 @@
             "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
             "Coefficient":[43500, 2800, 6000],
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"],
-            "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
             "PollingDelay":60000,
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index e0ebfa1..65fa9a0 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -259,19 +259,39 @@
             "Name":"USB-MINUS-USB2",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
+            "TriggerSensor": "usb_pwr_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_pwr_therm", "usb_pwr_therm2"],
             "Coefficient":[1.0, -1.0],
-            "Multiplier":0.001
+            "HotThreshold":["NAN", "1.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                }
+            ],
+            "Multiplier":0.001,
+            "PollingDelay":0,
+            "PassiveDelay":7000
         },
         {
             "Name":"USB-MINUS-NEUTRAL",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
+            "TriggerSensor": "usb_pwr_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_pwr_therm", "neutral_therm"],
             "Coefficient":[1.0, -1.0],
-            "Multiplier":0.001
+            "HotThreshold":["NAN", "2.5", "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                }
+            ],
+            "Multiplier":0.001,
+            "PollingDelay":0,
+            "PassiveDelay":7000
         },
         {
             "Name":"VIRTUAL-USB-THROTTLING",
@@ -288,7 +308,6 @@
                     "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
                 }
             ],
-            "VrThreshold":"NAN",
             "Multiplier":1,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -302,7 +321,6 @@
             "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
             "Coefficient":[42000, 2000, 4000],
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"],
-            "VrThreshold":"NAN",
             "Multiplier":1,
             "Monitor":true,
             "PollingDelay":60000,