From 83b44ed0251f818d184884d1fbe03fbe477913a7 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Sat, 9 Sep 2023 15:18:26 +0800 Subject: [PATCH 1/4] thermal: Add abnormality monitoring config Add config to monitor outlier temp and sensor stuck Bug: 238326225 Test: adb push and verify logs for error Change-Id: I2b4b58c50b566e27ac18538e750d78031183dd17 --- thermal/thermal_info_config_husky.json | 69 +++++++++++++++++++++++++- thermal/thermal_info_config_shiba.json | 56 ++++++++++++++++++++- 2 files changed, 123 insertions(+), 2 deletions(-) diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 970b6d0..7d31e4c 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -1185,6 +1185,18 @@ "Name": "VIRTUAL-SKIN-SUB-7", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] }, + { + "Name": "VIRTUAL-SKIN-SUB-8", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-9", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-10", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, { "Name": "VIRTUAL-SKIN-CHARGE", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] @@ -1193,7 +1205,62 @@ "Name": "VIRTUAL-USB-THROTTLING", "Thresholds": [3.0] } - ] + ], + "Abnormality": { + "Outlier": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8", + "VIRTUAL-SKIN-SUB-9", + "VIRTUAL-SKIN-SUB-10" + ], + "TempRange": [0.0, 55.0] + } + ] + }, + "Stuck": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8", + "VIRTUAL-SKIN-SUB-9", + "VIRTUAL-SKIN-SUB-10", + "VIRTUAL-SKIN-SPEAKER", + "VIRTUAL-SKIN-SPEAKER-SUB-0", + "VIRTUAL-SKIN-SPEAKER-SUB-1", + "VIRTUAL-SKIN-SPEAKER-SUB-2", + "VIRTUAL-SKIN-FRONT", + "VIRTUAL-SKIN-FRONT-SUB-0", + "VIRTUAL-SKIN-FRONT-SUB-1", + "VIRTUAL-SKIN-FRONT-SUB-2" + ], + "TempStuck": { + "MinPollingCount": 8, + "MinStuckDuration": 120000 + } + } + ] + } + } }, "CoolingDevices": { "RecordVotePerSensor": { diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 87adbb9..5609d65 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -1226,7 +1226,61 @@ "Name": "VIRTUAL-USB-THROTTLING", "Thresholds": [3.0] } - ] + ], + "Abnormality": { + "Outlier": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8" + ], + "TempRange": [0.0, 55.0] + } + ] + }, + "Stuck": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8", + "VIRTUAL-SKIN-SPEAKER", + "VIRTUAL-SKIN-SPEAKER-SUB-0", + "VIRTUAL-SKIN-SPEAKER-SUB-1", + "VIRTUAL-SKIN-SPEAKER-SUB-2", + "VIRTUAL-SKIN-SPEAKER-SUB-3", + "VIRTUAL-SKIN-FRONT", + "VIRTUAL-SKIN-FRONT-SUB-0", + "VIRTUAL-SKIN-FRONT-SUB-1", + "VIRTUAL-SKIN-FRONT-SUB-2", + "VIRTUAL-SKIN-FRONT-SUB-3", + "VIRTUAL-SKIN-FRONT-SUB-4" + ], + "TempStuck": { + "MinPollingCount": 8, + "MinStuckDuration": 120000 + } + } + ] + } + } }, "CoolingDevices": { "RecordVotePerSensor": { From 271412790a6eba9107a860d400048ba8239cff01 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 27 Sep 2023 21:20:35 +0000 Subject: [PATCH 2/4] powerhint.json: Undo uclamp_max tuning in LAUNCH_EXTEND Bug: 301807825 Signed-off-by: Qais Yousef Change-Id: I0f0b6752c76f0f6c5f725801f91c57f8f1e289bf --- perf/powerhint-husky.json | 34 ++++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 34 ++++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 142f0b8..bbb5662 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -281,6 +281,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -840,6 +850,12 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 5000, + "Value": "615" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -952,6 +968,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index a987091..0b022fc 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -267,6 +267,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -862,6 +872,12 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 5000, + "Value": "615" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -974,6 +990,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 14d971b..9f65124 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -281,6 +281,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -840,6 +850,12 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 5000, + "Value": "615" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -952,6 +968,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", From 503f0e045291574bbbbadc920af7fec393491361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 28 Sep 2023 00:30:09 +0000 Subject: [PATCH 3/4] OWNERS: master -> main Change-Id: I3bb8a9fa9a6ac5c9232288b5afb4cd28ac016ed6 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 492973e..0914422 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS From 0c21866e598238fe3f6441018390933cf7f83b0c Mon Sep 17 00:00:00 2001 From: David Kimmel Date: Mon, 25 Sep 2023 18:22:24 +0000 Subject: [PATCH 4/4] Game Mode Sched lib affinity Bug: 170648047 Test: sched / hints applied correctly Change-Id: I50b21880a671cb4b40110bc7ac3d75de6e2dc946 Signed-off-by: David Kimmel --- perf/powerhint-husky.json | 27 +++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 27 +++++++++++++++++++++++++++ perf/powerhint-shiba.json | 27 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 142f0b8..7ab6960 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -766,6 +766,15 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "SchedLibMaskIn", + "Path": "/proc/vendor_sched/sched_lib_mask_in", + "Values": [ + "0x100", + "0x0" + ], + "ResetOnInit": true } ], "Actions": [ @@ -922,6 +931,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -982,6 +997,12 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2428,6 +2449,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "SchedLibMaskIn", + "Duration": 0, + "Value": "0x100" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index a987091..842320b 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -788,6 +788,15 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "SchedLibMaskIn", + "Path": "/proc/vendor_sched/sched_lib_mask_in", + "Values": [ + "0x100", + "0x0" + ], + "ResetOnInit": true } ], "Actions": [ @@ -944,6 +953,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1004,6 +1019,12 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2187,6 +2208,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "SchedLibMaskIn", + "Duration": 0, + "Value": "0x100" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 14d971b..0de3cde 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -766,6 +766,15 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "SchedLibMaskIn", + "Path": "/proc/vendor_sched/sched_lib_mask_in", + "Values": [ + "0x100", + "0x0" + ], + "ResetOnInit": true } ], "Actions": [ @@ -922,6 +931,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -982,6 +997,12 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2332,6 +2353,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "SchedLibMaskIn", + "Duration": 0, + "Value": "0x100" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL",