From cc7f8444295159565bcef1496c0c788297d17e94 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 12 May 2023 13:22:19 +0800 Subject: [PATCH 1/8] audio: use VIRTUAL-SKIN-SPEAKER for playback throttle Bug: 282062889 Test: manual test Change-Id: I30fcb91c4f8dc8d9208389f551034e829166afda Signed-off-by: Jasmine Cha --- audio/husky/config/audio_platform_configuration.xml | 4 ++-- audio/shiba/config/audio_platform_configuration.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index fca3509..84c045b 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -248,7 +248,7 @@ - + @@ -304,7 +304,7 @@ - + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index fca3509..84c045b 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -248,7 +248,7 @@ - + @@ -304,7 +304,7 @@ - + From df5fa53c5d849b1057e87936a8c793f4d927045d Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 12 May 2023 15:06:57 -0700 Subject: [PATCH 2/8] thermal: enable sendCallback for VSKIN-SPEAKER Bug: 282062889 Test: adb shell dumpsys android.hardware.thermal.IThermal/default emul_temp VIRTUAL-SKIN-SPEAKER 37001 Change-Id: Ib2b180b49223da178f1fb6f7e694a17166187829 --- thermal/thermal_info_config_husky.json | 5 ++++- thermal/thermal_info_config_shiba.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 64f02cd..2b33b94 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -351,7 +351,10 @@ "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Coefficient":[0.09, 0.01, 0, 0.18, 0.2, 0.21, 0, 0.35, 0.03], "Offset":-4990, - "Multiplier":0.001 + "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], + "Multiplier":0.001, + "SendCallback":true }, { "Name":"VIRTUAL-SKIN", diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 418208b..b4c7b2f 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -330,7 +330,10 @@ "Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Coefficient":[0.06, 0, 0.31, 0.08, 0.29, 0.1, 0, 0.16, 0], "Offset":-1970, - "Multiplier":0.001 + "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], + "Multiplier":0.001, + "SendCallback":true }, { "Name":"VIRTUAL-SKIN", From e0b027a14df49774a7eef3c83a84855c9c585641 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Tue, 16 May 2023 03:42:36 +0000 Subject: [PATCH 3/8] add display high blocking zone High blocking zone: 50k lux && normal brightness max(1000 nits) lock at 120 Hz Bug:282254151 test: check refresh rate in high zone Change-Id: Ib3308eddf240a93cccc64d2aa5d3174ba7f51c35 --- .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index 7e91ef1..a82e841 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -157,6 +157,19 @@ 120 + + + + 181 + + + + 50000 + + + + 120 2 From a010254a29b50056f6b80d8866e3d7fe03cc47e3 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 16 May 2023 19:07:34 -0700 Subject: [PATCH 4/8] thermal: update powerhints for thermal trips Bug: 241784772 Test: Build and boot on device Change-Id: Ibf3ad81c4df6a30948bb53359b2b8a4001e5d214 Signed-off-by: Sayanna Chandula --- perf/powerhint-shiba.json | 96 +++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 3d8003d..98f0213 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -380,8 +380,8 @@ "Name": "BigControlTempSet", "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", "Values": [ - "85000", - "80000" + "75000", + "70000" ], "DefaultIndex": 0, "ResetOnInit": false @@ -390,8 +390,8 @@ "Name": "MidControlTempSet", "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", "Values": [ - "85000", - "80000" + "75000", + "70000" ], "DefaultIndex": 0, "ResetOnInit": false @@ -400,8 +400,8 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "85000", - "80000" + "75000", + "70000" ], "DefaultIndex": 0, "ResetOnInit": false @@ -440,8 +440,8 @@ "Name": "BigSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", "Values": [ - "65000", - "60000" + "55000", + "50000" ], "DefaultIndex": 0, "ResetOnInit": false @@ -450,8 +450,8 @@ "Name": "MidSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", "Values": [ - "65000", - "60000" + "55000", + "50000" ], "DefaultIndex": 0, "ResetOnInit": false @@ -460,8 +460,8 @@ "Name": "LittleSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", "Values": [ - "65000", - "60000" + "55000", + "50000" ], "DefaultIndex": 0, "ResetOnInit": false @@ -1783,19 +1783,19 @@ "PowerHint": "LOW_POWER", "Node": "BigControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "LOW_POWER", "Node": "MidControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "LOW_POWER", "Node": "LittleControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "LOW_POWER", @@ -1819,19 +1819,19 @@ "PowerHint": "LOW_POWER", "Node": "BigSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "LOW_POWER", "Node": "MidSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "LOW_POWER", "Node": "LittleSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "LOW_POWER", @@ -1926,19 +1926,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", @@ -1962,19 +1962,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", @@ -2016,19 +2016,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", @@ -2052,19 +2052,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", @@ -2106,19 +2106,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", @@ -2142,19 +2142,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", @@ -2196,19 +2196,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", @@ -2232,19 +2232,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", @@ -2304,19 +2304,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, - "Value": "80000" + "Value": "70000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", @@ -2340,19 +2340,19 @@ "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, - "Value": "60000" + "Value": "50000" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", From 55915c839b96485f8c615244169af42af37c5a4a Mon Sep 17 00:00:00 2001 From: Jason CH Hsu Date: Sun, 7 May 2023 01:39:29 +0000 Subject: [PATCH 5/8] Revert "audio: FM table check in (2023/04/13) for telephony." This reverts commit 95e65ad4c87400c745688fda99771eeb5ffc58b7. Reason for revert: remove temp WA and requires aoc ag/23243138 Bug: 277993237 Change-Id: Ie87648482160edffd29e3548402e887b166a43d4 --- audio/husky/tuning/fortemedia/mcps.dat | Bin 292 -> 292 bytes audio/shiba/tuning/fortemedia/mcps.dat | Bin 292 -> 292 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/husky/tuning/fortemedia/mcps.dat b/audio/husky/tuning/fortemedia/mcps.dat index 6194de4b959b657eda3984b26f5e4fa48f7dc96d..1c1631473eeb21412a0dfb8bf6f005254022636f 100644 GIT binary patch literal 292 zcmY+HTs0$VRe>FGQ7 hVmLB(;TTTg6!)ZlUGC*@4(D(VHvs&<9gI?xffviYKJg3`0>nzKL!Fnsii1wCu`cAW?8Xm4ESy^m!fI-tWcz?b%bh*D|V5S<7&S bGo0ZHuHXu;-~t!8zy)qd`oA4U6)MsLZ=FY9 diff --git a/audio/shiba/tuning/fortemedia/mcps.dat b/audio/shiba/tuning/fortemedia/mcps.dat index 6194de4b959b657eda3984b26f5e4fa48f7dc96d..1c1631473eeb21412a0dfb8bf6f005254022636f 100644 GIT binary patch literal 292 zcmY+HTs0$VRe>FGQ7 hVmLB(;TTTg6!)ZlUGC*@4(D(VHvs&<9gI?xffviYKJg3`0>nzKL!Fnsii1wCu`cAW?8Xm4ESy^m!fI-tWcz?b%bh*D|V5S<7&S bGo0ZHuHXu;-~t!8zy)qd`oA4U6)MsLZ=FY9 From d6469ed471ebd2fbc13cd8c873f5cb312db6e29d Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Mon, 15 May 2023 14:02:30 -0700 Subject: [PATCH 6/8] thermal: Adjust throttling policy w/ 26 chg_mdis levels The kernel side supports 26 levels of chg_mdis throttling now (pa/2492504), so having this change to provide more smooth charging throttling. Bug: 258136311 Test: check VSKIN-CHARGE temperature w/ charging test Change-Id: I0d4eddc95aaef5777c07a26985929ee72dc2d1e6 --- thermal/thermal_info_config_charge_husky.json | 30 +++++++++---------- thermal/thermal_info_config_charge_shiba.json | 30 +++++++++---------- thermal/thermal_info_config_husky.json | 30 +++++++++---------- thermal/thermal_info_config_shiba.json | 30 +++++++++---------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 13a8c62..ed8e176 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -143,33 +143,33 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"2.1", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, - "PassiveDelay":60000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "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", 2000, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], - "I_Default":2000 + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] } ], "BindedCdevInfo": [ @@ -178,8 +178,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 5, 8, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] } ] }, diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 4fb6451..43ec1aa 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -154,33 +154,33 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"2.1", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, - "PassiveDelay":60000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], - "I_Default":2000 + "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1099 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] } ], "BindedCdevInfo": [ @@ -189,8 +189,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 5, 8, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] } ] }, diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 64f02cd..65ab063 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -552,33 +552,33 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"2.1", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, - "PassiveDelay":60000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "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", 2000, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], - "I_Default":2000 + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] } ], "BindedCdevInfo": [ @@ -587,8 +587,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 5, 8, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] } ] }, diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 418208b..2d7b3b4 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -529,33 +529,33 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"2.1", "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, - "PassiveDelay":60000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"], - "I_Default":2000 + "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1099 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] } ], "BindedCdevInfo": [ @@ -564,8 +564,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 5, 8, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] } ] }, From 0557a425aebfb228e17c09ce11cbfee086290a7c Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 25 Apr 2023 16:15:10 +0800 Subject: [PATCH 7/8] thermal: Update config for stats Bug: 259903201 Test: local build and verify stats Change-Id: Ic79dc44db69238b2ec13be5f9b200a0725f642ac --- thermal/thermal_info_config_husky.json | 34 +++++++++++++++++++++++++- thermal/thermal_info_config_shiba.json | 30 ++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index bc7e97d..80843cb 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -741,5 +741,37 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN", "VIRTUAL-SKIN-CHARGE"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-BTS-WINDOW-PARTIAL", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SPEAKER", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "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] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 0098fcc..65f164e 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -718,5 +718,33 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN", "VIRTUAL-SKIN-CHARGE"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-SKIN-SPEAKER", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "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] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } From fcb6669e47661f16fa9a42c86f6911b346fa6fa0 Mon Sep 17 00:00:00 2001 From: Jia-yi Chen Date: Tue, 16 May 2023 18:19:31 -0700 Subject: [PATCH 8/8] powerhint: Update CAMERA_STREAMING_VIDEO_CALL powerhint 1) Raise the CPU max frequencies 2) Use PMU LIMIT for little cores 3) Set cpuset to 0-7 Bug: 280308326 Test: Boot & check logs Change-Id: I3435309ea6920b34c8e68b98979ffcc88559ddf3 --- perf/powerhint-husky.json | 101 +++++++++++++++++++++++++++++---- perf/powerhint-ripcurrent.json | 101 +++++++++++++++++++++++++++++---- perf/powerhint-shiba.json | 101 +++++++++++++++++++++++++++++---- 3 files changed, 270 insertions(+), 33 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 26ad93d..7517864 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -92,6 +92,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "5000" + ], + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -124,6 +133,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "20000" + ], + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", @@ -158,6 +176,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "20000" + ], + "ResetOnInit": true + }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -567,9 +594,18 @@ ], "DefaultIndex": 0 }, + { + "Name": "PMU_LIT_LIMIT_FREQ", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency", + "Values": [ + "1328000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "PMU_LIT_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold", "Values": [ "2", "0" @@ -578,16 +614,17 @@ }, { "Name": "PMU_LIT_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "30", "0" ], "DefaultIndex": 0 }, { "Name": "PMU_MID_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold", "Values": [ "6", "3" @@ -596,7 +633,7 @@ }, { "Name": "PMU_MID_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ "65", "50" @@ -605,7 +642,7 @@ }, { "Name": "PMU_BIG_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/limit_frequency", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2556000", "1852000" @@ -614,7 +651,7 @@ }, { "Name": "PMU_BIG_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold", "Values": [ "5", "3" @@ -623,7 +660,7 @@ }, { "Name": "PMU_BIG_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ "69", "50" @@ -1665,19 +1702,37 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1164000" + "Value": "2049000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1328000" + "Value": "1836000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1328000" + "Value": "1704000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -1707,7 +1762,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDCpuset", "Duration": 0, - "Value": "4-7" + "Value": "0-7" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -1721,6 +1776,30 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_LIMIT_FREQ", + "Duration": 0, + "Value": "1328000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "30" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "NPITaskPacking", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 122b0bf..2b5d43b 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -92,6 +92,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "5000" + ], + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -120,6 +129,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "20000" + ], + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", @@ -148,6 +166,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "20000" + ], + "ResetOnInit": true + }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -557,9 +584,18 @@ ], "DefaultIndex": 0 }, + { + "Name": "PMU_LIT_LIMIT_FREQ", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency", + "Values": [ + "1328000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "PMU_LIT_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold", "Values": [ "2", "0" @@ -568,16 +604,17 @@ }, { "Name": "PMU_LIT_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "30", "0" ], "DefaultIndex": 0 }, { "Name": "PMU_MID_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold", "Values": [ "6", "3" @@ -586,7 +623,7 @@ }, { "Name": "PMU_MID_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ "65", "50" @@ -595,7 +632,7 @@ }, { "Name": "PMU_BIG_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/limit_frequency", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2556000", "1852000" @@ -604,7 +641,7 @@ }, { "Name": "PMU_BIG_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold", "Values": [ "5", "3" @@ -613,7 +650,7 @@ }, { "Name": "PMU_BIG_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ "69", "50" @@ -1553,19 +1590,37 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1164000" + "Value": "2049000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1328000" + "Value": "1836000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1328000" + "Value": "1704000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -1595,7 +1650,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDCpuset", "Duration": 0, - "Value": "4-7" + "Value": "0-7" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -1609,6 +1664,30 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_LIMIT_FREQ", + "Duration": 0, + "Value": "1328000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "30" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "NPITaskPacking", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 3d8003d..938d237 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -92,6 +92,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "5000" + ], + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -120,6 +129,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "20000" + ], + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", @@ -148,6 +166,15 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "2000", + "20000" + ], + "ResetOnInit": true + }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -557,9 +584,18 @@ ], "DefaultIndex": 0 }, + { + "Name": "PMU_LIT_LIMIT_FREQ", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency", + "Values": [ + "1328000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "PMU_LIT_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold", "Values": [ "2", "0" @@ -568,16 +604,17 @@ }, { "Name": "PMU_LIT_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "30", "0" ], "DefaultIndex": 0 }, { "Name": "PMU_MID_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold", "Values": [ "6", "3" @@ -586,7 +623,7 @@ }, { "Name": "PMU_MID_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ "65", "50" @@ -595,7 +632,7 @@ }, { "Name": "PMU_BIG_LIMIT_FREQ", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/limit_frequency", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2556000", "1852000" @@ -604,7 +641,7 @@ }, { "Name": "PMU_BIG_LCPI_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/lcpi_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold", "Values": [ "5", "3" @@ -613,7 +650,7 @@ }, { "Name": "PMU_BIG_SPC_THRESHOLD", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/spc_threshold", + "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ "69", "50" @@ -1553,19 +1590,37 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1164000" + "Value": "2049000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1328000" + "Value": "1836000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1328000" + "Value": "1704000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "2000" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -1595,7 +1650,7 @@ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDCpuset", "Duration": 0, - "Value": "4-7" + "Value": "0-7" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", @@ -1609,6 +1664,30 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_LIMIT_FREQ", + "Duration": 0, + "Value": "1328000" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_LCPI_THRESHOLD", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PMU_LIT_SPC_THRESHOLD", + "Duration": 0, + "Value": "30" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "NPITaskPacking",