summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeYuan Wang <kamewang@google.com>2023-09-29 15:37:49 -0700
committerTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-12-13 00:06:21 +0000
commitdcd3d4207e4fc2675c846d229da9da6f2c2738f9 (patch)
treeb1e1d94085403863f497d97b2ddc1baf7712c54e
parent97d2761437bf2c6e5a61b201a437fa997a5cfc66 (diff)
downloadpantah-dcd3d4207e4fc2675c846d229da9da6f2c2738f9.tar.gz
thermal: PID tuning for 26 levels of chg_mdis
Bug: 266625520 Test: verified by emul_temp Change-Id: I6e44ea99e6b350ede3763969b6c6a1769e06e86f
Diffstat
-rw-r--r--thermal_info_config_charge_cheetah.json27
-rw-r--r--thermal_info_config_charge_panther.json31
-rw-r--r--thermal_info_config_cheetah.json27
-rw-r--r--thermal_info_config_panther.json31
4 files changed, 60 insertions, 56 deletions
diff --git a/thermal_info_config_charge_cheetah.json b/thermal_info_config_charge_cheetah.json
index 95724da..ca7e17a 100644
--- a/thermal_info_config_charge_cheetah.json
+++ b/thermal_info_config_charge_cheetah.json
@@ -46,26 +46,27 @@
"Combination":["qi_therm","quiet_therm"],
"Coefficient":[0.35, 0.65],
"Offset":-650,
- "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
+ "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1383
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
+ "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43]
}
],
"BindedCdevInfo": [
@@ -74,8 +75,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 26, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 26, 26, 26]
}
]
},
diff --git a/thermal_info_config_charge_panther.json b/thermal_info_config_charge_panther.json
index b4be800..7ab7626 100644
--- a/thermal_info_config_charge_panther.json
+++ b/thermal_info_config_charge_panther.json
@@ -46,26 +46,27 @@
"Combination":["qi_therm", "quiet_therm"],
"Coefficient":[0.282, 0.718],
"Offset":-448,
- "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
+ "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1300
},
"ExcludedPowerInfo": [
{
- "PowerRail": "POWER_FOR_CHARGING_THROTTLING",
- "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
+ "PowerRail": "PARTIAL_SYSTEM_POWER",
+ "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4]
}
],
"BindedCdevInfo": [
@@ -74,8 +75,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 26, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 26, 26, 26]
}
]
},
@@ -182,7 +183,7 @@
"PowerSampleCount":1
},
{
- "Name":"POWER_FOR_CHARGING_THROTTLING",
+ "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,
"Formula":"WEIGHTED_AVG",
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index a492fd2..aeba547 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -280,26 +280,27 @@
"Combination":["qi_therm","quiet_therm"],
"Coefficient":[0.35, 0.65],
"Offset":-650,
- "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
+ "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1383
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
+ "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43]
}
],
"BindedCdevInfo": [
@@ -308,8 +309,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 26, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 26, 26, 26]
}
]
},
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index b786da2..553b33e 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -280,26 +280,27 @@
"Combination":["qi_therm", "quiet_therm"],
"Coefficient":[0.282, 0.718],
"Offset":-448,
- "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
- "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"]
+ "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"],
+ "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
+ "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1300
},
"ExcludedPowerInfo": [
{
- "PowerRail": "POWER_FOR_CHARGING_THROTTLING",
- "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0]
+ "PowerRail": "PARTIAL_SYSTEM_POWER",
+ "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4]
}
],
"BindedCdevInfo": [
@@ -308,8 +309,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 4, 7, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 26, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 26, 26, 26]
}
]
},
@@ -826,7 +827,7 @@
"PowerSampleCount":1
},
{
- "Name":"POWER_FOR_CHARGING_THROTTLING",
+ "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,
"Formula":"WEIGHTED_AVG",
"Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 02:35:16 +0000