From 141142a118a7e0dd3adfc5b2178d39e470356dc4 Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Mon, 12 Dec 2022 16:51:59 -0800
Subject: [PATCH] thermal: implement basic tskin mitigation

cdev limit at CRITICAL severity and hard throttling at
EMERGENCY severity

Bug: 262304756
Test: Build and boot on device

Change-Id: Ic79ef7a38a8b64b25285d53581ce1613844a26c1
Signed-off-by: Sayanna Chandula <sayanna@google.com>
---
 thermal_info_config_husky.json | 26 +++++++++++++++++++++++---
 thermal_info_config_shiba.json | 26 +++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/thermal_info_config_husky.json b/thermal_info_config_husky.json
index 4eba292..7ad2909 100644
--- a/thermal_info_config_husky.json
+++ b/thermal_info_config_husky.json
@@ -70,7 +70,7 @@
             "Formula":"MAXIMUM",
             "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -104,7 +104,7 @@
             "Formula":"MAXIMUM",
             "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -112,6 +112,21 @@
             "PIDInfo": {
             },
             "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-cpufreq-1",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 16, 16]
+                },
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 16, 16]
+                }
             ]
         },
         {
@@ -123,7 +138,7 @@
             "Formula":"MAXIMUM",
             "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -131,6 +146,11 @@
             "PIDInfo": {
             },
             "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
             ]
         },
         {
diff --git a/thermal_info_config_shiba.json b/thermal_info_config_shiba.json
index 4eba292..7ad2909 100644
--- a/thermal_info_config_shiba.json
+++ b/thermal_info_config_shiba.json
@@ -70,7 +70,7 @@
             "Formula":"MAXIMUM",
             "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -104,7 +104,7 @@
             "Formula":"MAXIMUM",
             "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -112,6 +112,21 @@
             "PIDInfo": {
             },
             "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
+                },
+                {
+                    "CdevRequest": "thermal-cpufreq-1",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 16, 16]
+                },
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 16, 16]
+                }
             ]
         },
         {
@@ -123,7 +138,7 @@
             "Formula":"MAXIMUM",
             "Combination":["neutral_therm", "cam_therm", "soc_therm", "north_therm"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 65.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -131,6 +146,11 @@
             "PIDInfo": {
             },
             "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
+                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                }
             ]
         },
         {