From 15c78bac5b79592ac8a7d1037a94f52e07a742b0 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Thu, 2 May 2024 22:39:33 +0000
Subject: [PATCH] thermal: Move TPU to the VSKIN-SOC PID loop

Bug: 322223131
Test: run TPU test
Change-Id: I4996071d1618808068dddddd984f3eca4da32517
---
 thermal/thermal_info_config_comet.json | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 22463a5..3d2fac6 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -261,10 +261,6 @@
             "PassiveDelay": 7000,
             "SendCallback": true,
             "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
-                },
                 {
                     "CdevRequest": "gxp-cooling",
                     "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
@@ -556,7 +552,7 @@
             ]
         },
         {
-            "Name": "VIRTUAL-SKIN-CPU-GPU",
+            "Name": "VIRTUAL-SKIN-SOC",
             "Type": "UNKNOWN",
             "Hidden": true,
             "VirtualSensor": true,
@@ -576,7 +572,7 @@
                 "K_D": ["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
                 "I_Max": ["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"],
                 "S_Power": ["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
-                "MinAllocPower": ["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"],
+                "MinAllocPower": ["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"],
                 "MaxAllocPower": ["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"],
                 "I_Cutoff": ["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"]
             },
@@ -607,7 +603,6 @@
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
                     "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000],
                     "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000]
-         
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -617,6 +612,15 @@
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "CdevCeiling": [0, 9, 9, 9, 10, 12, 12],
                     "LimitInfo": [0, 0, 0, 0, 0, 12, 12]
+                },
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "MaxReleaseStep": 1,
+                    "MaxThrottleStep": 1,
+                    "BindedPowerRail": "S7M_VDD_TPU",
+                    "CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
+                    "LimitInfo": [0, 0, 0, 0, 0, 7, 7]
                 }
             ]
         },
@@ -1090,6 +1094,11 @@
             "PowerSampleDelay": 7000,
             "PowerSampleCount": 1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name": "PARTIAL_SYSTEM_POWER",
             "VirtualRails": true,