From 0c44af3a62acb18e4e75581c4752b13085fa5734 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 31 Oct 2023 14:09:24 -0700 Subject: [PATCH] thermal: add cdev_ceiling for all throttling profiles Align the same cdev_ceiling for all the profiles to avoid the unexpected throttling request when switching the profile. Bug: 308646952 Test: emul_temp VSKIN, and monitor thermal throttling log with open/close camera Change-Id: Id108ccea6da4f82fe24ed6d275d6d4688ee78c02 --- thermal/thermal_info_config_husky.json | 9 +++++++++ thermal/thermal_info_config_shiba.json | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index f5aa9b9..218ec69 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -460,16 +460,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -480,16 +483,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -551,16 +557,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 13, 13, 13, 13, 13, 13], "Disabled":true } ] diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 23390c8..9a2181b 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -428,16 +428,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -448,16 +451,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -519,16 +525,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 13, 13, 13, 13, 13, 13], "Disabled":true } ]