From 520b88f8488f3ae5c65ff9af1fe717dbe91bc651 Mon Sep 17 00:00:00 2001 From: Ramya Subramanian Date: Fri, 5 Jan 2024 00:32:09 +0000 Subject: [PATCH] thermal: Update cdev ceiling to match latest EM table Bug: 318313844 Test: Tested on EVT1.0(A0) TK4 and Tskin controlled to 45C with MH offscreen, all 3 devices booted home Change-Id: I3e10a1cd9c4493c9bb5f6a08a64e68b04713c41a Signed-off-by: Ramya Subramanian --- thermal/thermal_info_config_caiman.json | 34 ++++++++++++------------- thermal/thermal_info_config_komodo.json | 34 ++++++++++++------------- thermal/thermal_info_config_tokay.json | 34 ++++++++++++------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index f9fc5513..739bf5b7 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -319,7 +319,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeiling": [0, 4, 4, 4, 4, 4, 4] }, { "CdevRequest": "thermal-cpufreq-1", @@ -327,7 +327,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-2", @@ -335,7 +335,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } ] }, @@ -370,21 +370,21 @@ "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 16, 16, 16, 16, 16, 16] } ], "Profile": [ @@ -461,21 +461,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] + "CdevCeiling": [0, 10, 10, 10, 10, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 11, 11, 11, 11, 11, 11] + "CdevCeiling": [0, 14, 14, 14, 14, 14, 14] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] + "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] } ], "Profile": [ @@ -507,14 +507,14 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 4, 4, 4, 4, 4, 4] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-2", @@ -559,8 +559,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 8, 8, 8, 8, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 0, 11, 11] }, { "CdevRequest": "thermal-cpufreq-1", @@ -568,8 +568,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 11, 11, 11, 11, 14, 14], - "LimitInfo": [0, 0, 0, 0, 0, 14, 14] + "CdevCeiling": [0, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 0, 16, 16] }, { "CdevRequest": "thermal-cpufreq-2", @@ -577,8 +577,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], - "LimitInfo": [0, 0, 0, 0, 0, 14, 14] + "CdevCeiling": [0, 17, 17, 17, 17, 17, 17], + "LimitInfo": [0, 0, 0, 0, 0, 17, 17] }, { "CdevRequest": "thermal-gpufreq-0", diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 0f6544ea..eea06049 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -352,7 +352,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeiling": [0, 4, 4, 4, 4, 4, 4] }, { "CdevRequest": "thermal-cpufreq-1", @@ -360,7 +360,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-2", @@ -368,7 +368,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } ] }, @@ -403,21 +403,21 @@ "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 16, 16, 16, 16, 16, 16] } ], "Profile": [ @@ -494,21 +494,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] + "CdevCeiling": [0, 10, 10, 10, 10, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 11, 11, 11, 11, 11, 11] + "CdevCeiling": [0, 14, 14, 14, 14, 14, 14] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] + "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] } ], "Profile": [ @@ -540,14 +540,14 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 4, 4, 4, 4, 4, 4] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-2", @@ -592,8 +592,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 8, 8, 8, 8, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 0, 11, 11] }, { "CdevRequest": "thermal-cpufreq-1", @@ -601,8 +601,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 11, 11, 11, 11, 14, 14], - "LimitInfo": [0, 0, 0, 0, 0, 14, 14] + "CdevCeiling": [0, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 0, 16, 16] }, { "CdevRequest": "thermal-cpufreq-2", @@ -610,8 +610,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], - "LimitInfo": [0, 0, 0, 0, 0, 14, 14] + "CdevCeiling": [0, 17, 17, 17, 17, 17, 17], + "LimitInfo": [0, 0, 0, 0, 0, 17, 17] }, { "CdevRequest": "thermal-gpufreq-0", diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 1f053cb1..4a2fc2cb 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -297,7 +297,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 2, 2, 2, 2, 2, 2] + "CdevCeiling": [0, 4, 4, 4, 4, 4, 4] }, { "CdevRequest": "thermal-cpufreq-1", @@ -305,7 +305,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-2", @@ -313,7 +313,7 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } ] }, @@ -348,21 +348,21 @@ "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 16, 16, 16, 16, 16, 16] } ], "Profile": [ @@ -439,21 +439,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] + "CdevCeiling": [0, 10, 10, 10, 10, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 11, 11, 11, 11, 11, 11] + "CdevCeiling": [0, 14, 14, 14, 14, 14, 14] }, { "CdevRequest": "thermal-cpufreq-2", "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] + "CdevCeiling": [0, 17, 17, 17, 17, 17, 17] } ], "Profile": [ @@ -485,14 +485,14 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 4, 4, 4, 4, 4, 4] }, { "CdevRequest": "thermal-cpufreq-1", "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] }, { "CdevRequest": "thermal-cpufreq-2", @@ -537,8 +537,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "CdevCeiling": [0, 8, 8, 8, 8, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 0, 11, 11] }, { "CdevRequest": "thermal-cpufreq-1", @@ -546,8 +546,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S2M_VDD_CPUCL1", - "CdevCeiling": [0, 11, 11, 11, 11, 14, 14], - "LimitInfo": [0, 0, 0, 0, 0, 14, 14] + "CdevCeiling": [0, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 0, 16, 16] }, { "CdevRequest": "thermal-cpufreq-2", @@ -555,8 +555,8 @@ "MaxReleaseStep": 1, "MaxThrottleStep": 2, "BindedPowerRail": "S3M_VDD_CPUCL2", - "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], - "LimitInfo": [0, 0, 0, 0, 0, 14, 14] + "CdevCeiling": [0, 17, 17, 17, 17, 17, 17], + "LimitInfo": [0, 0, 0, 0, 0, 17, 17] }, { "CdevRequest": "thermal-gpufreq-0",