Revert "Set max load balance to 4, reduce Downrate Limit for lit and mid cores"

This reverts commit d1274379ad.

Reason for revert:

git_main tokay-trunk_staging-userdebug boot failure (something about failing to parse /vendor/etc/powerhint.json).

https://android-build.corp.google.com/test_investigate/?invocationId=I81200010307251269&testResultId=TR31029411252209740&legacy=&tab=changes

Confirmed locally a revert results in a phone that boots.

Change-Id: I134fc0926170940f374a04362b71f5b9c28188d4
This commit is contained in:
Maciej Żenczykowski 2024-08-17 05:02:12 +00:00 committed by Android (Google) Code Review
parent d1274379ad
commit e00b219010
4 changed files with 18 additions and 135 deletions

View file

@ -56,7 +56,6 @@
"Values": [ "Values": [
"5000", "5000",
"2000", "2000",
"1000",
"500" "500"
], ],
"DefaultIndex": 0, "DefaultIndex": 0,
@ -95,7 +94,6 @@
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [ "Values": [
"20000", "20000",
"5000",
"3000", "3000",
"2000", "2000",
"500" "500"
@ -951,16 +949,6 @@
"200" "200"
], ],
"ResetOnInit": true "ResetOnInit": true
},
{
"Name": "MaxLoadBalanceInterval",
"Path": "/proc/vendor_sched/max_load_balance_interval",
"Values": [
"1",
"4"
],
"DefaultIndex": 0,
"ResetOnInit": true
} }
], ],
"Actions": [ "Actions": [
@ -2031,13 +2019,13 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -2123,12 +2111,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2211,13 +2193,13 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2321,12 +2303,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2415,13 +2391,13 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2501,12 +2477,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",

View file

@ -56,7 +56,6 @@
"Values": [ "Values": [
"5000", "5000",
"2000", "2000",
"1000",
"500" "500"
], ],
"DefaultIndex": 0, "DefaultIndex": 0,
@ -95,7 +94,6 @@
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [ "Values": [
"20000", "20000",
"5000",
"3000", "3000",
"2000", "2000",
"500" "500"
@ -951,16 +949,6 @@
"200" "200"
], ],
"ResetOnInit": true "ResetOnInit": true
},
{
"Name": "MaxLoadBalanceInterval",
"Path": "/proc/vendor_sched/max_load_balance_interval",
"Values": [
"1",
"4"
],
"DefaultIndex": 0,
"ResetOnInit": true
} }
], ],
"Actions": [ "Actions": [
@ -2031,13 +2019,13 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -2123,12 +2111,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2211,13 +2193,13 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2321,12 +2303,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2415,13 +2391,13 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2501,12 +2477,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",

View file

@ -875,16 +875,6 @@
"200" "200"
], ],
"ResetOnInit": true "ResetOnInit": true
},
{
"Name": "MaxLoadBalanceInterval",
"Path": "/proc/vendor_sched/max_load_balance_interval",
"Values": [
"1",
"4"
],
"DefaultIndex": 0,
"ResetOnInit": true
} }
], ],
"Actions": [ "Actions": [
@ -2005,12 +1995,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2167,12 +2151,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2311,12 +2289,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",

View file

@ -56,7 +56,6 @@
"Values": [ "Values": [
"5000", "5000",
"2000", "2000",
"1000",
"500" "500"
], ],
"DefaultIndex": 0, "DefaultIndex": 0,
@ -950,16 +949,6 @@
"200" "200"
], ],
"ResetOnInit": true "ResetOnInit": true
},
{
"Name": "MaxLoadBalanceInterval",
"Path": "/proc/vendor_sched/max_load_balance_interval",
"Values": [
"1",
"4"
],
"DefaultIndex": 0,
"ResetOnInit": true
} }
], ],
"Actions": [ "Actions": [
@ -2030,13 +2019,13 @@
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
@ -2122,12 +2111,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -2210,13 +2193,13 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2320,12 +2303,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2414,13 +2391,13 @@
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "1000" "Value": "5000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterDownRateLimitUs", "Node": "CPUMidClusterDownRateLimitUs",
"Duration": 0, "Duration": 0,
"Value": "5000" "Value": "20000"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
@ -2500,12 +2477,6 @@
"Duration": 0, "Duration": 0,
"Value": "0x80" "Value": "0x80"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MaxLoadBalanceInterval",
"Duration": 0,
"Value": "4"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",