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

Bug: 345115917
Test: run TPU test
Change-Id: I372473dcedc35ea82ccc739f0ac185a8a83dfa53
Signed-off-by: Peter (YM) <peterym@google.com>
---
 thermal/thermal_info_config_husky.json | 22 ++++++++++++++++------
 thermal/thermal_info_config_shiba.json | 22 ++++++++++++++++------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index b08761a..d25340f 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -327,10 +327,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, 6, 6]
@@ -603,7 +599,7 @@
             ]
         },
         {
-            "Name":"VIRTUAL-SKIN-CPU-GPU",
+            "Name":"VIRTUAL-SKIN-SOC",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -623,7 +619,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"]
             },
@@ -663,6 +659,15 @@
                     "BindedPowerRail": "S2S_VDD_G3D",
                     "CdevCeiling": [0, 8, 8, 8, 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]
                 }
             ]
         },
@@ -1138,6 +1143,11 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index bc6bdf1..a46f42e 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -295,10 +295,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, 6, 6]
@@ -571,7 +567,7 @@
             ]
         },
         {
-            "Name":"VIRTUAL-SKIN-CPU-GPU",
+            "Name":"VIRTUAL-SKIN-SOC",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -591,7 +587,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"]
             },
@@ -631,6 +627,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]
                 }
             ]
         },
@@ -1171,6 +1176,11 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":1
         },
+        {
+            "Name":"S7M_VDD_TPU",
+            "PowerSampleDelay":7000,
+            "PowerSampleCount":1
+        },
         {
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,