From a8b2380667038bd5b12fa8dc04b767a49487c43b Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Wed, 5 Jun 2024 07:25:49 +0000
Subject: [PATCH] thermal: Move TPU to the VSKIN-SOC PID loop

Bug: 345115917
Test: run TPU test
Change-Id: I13ec28e2046398f6d019c3f30833b21fc8607e47
Signed-off-by: Peter (YM) <peterym@google.com>
---
 thermal_info_config_akita.json | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json
index 71f21ad..fc255eb 100644
--- a/thermal_info_config_akita.json
+++ b/thermal_info_config_akita.json
@@ -207,10 +207,6 @@
             "PollingDelay":300000,
             "PassiveDelay":7000,
             "BindedCdevInfo": [
-                {
-                    "CdevRequest": "tpu_cooling",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
-                },
                 {
                     "CdevRequest": "gxp-cooling",
                     "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
@@ -480,7 +476,7 @@
             ]
         },
         {
-            "Name":"VIRTUAL-SKIN-CPU-GPU",
+            "Name":"VIRTUAL-SKIN-SOC",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -500,7 +496,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"]
             },
@@ -540,6 +536,15 @@
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
                     "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                },
+                {
+                    "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]
                 }
             ]
         },
@@ -879,6 +884,11 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,