ARM: dts: msm: replace capacity with frequency in sched-energy for sdm845
Energy model now takes CPU's frequency steps in lieu of capacities to
support various speednbins. Replace capacities with CPU frequency
table.
Also add frequency steps and corresponding power cost for speedbin 1
and 2.
Change-Id: I7cd7c2d56a4a173dac014df5feca1c64736c3c1f
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 6284361..24d7f34 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -337,25 +337,31 @@
};
energy-costs {
+ compatible = "sched-energy";
+
CPU_COST_0: core-cost0 {
busy-cost-data = <
- 92 34 /* 300000 */
- 129 40 /* 422400 */
- 153 43 /* 499200 */
- 177 48 /* 576000 */
- 200 52 /* 652800 */
- 230 58 /* 748800 */
- 253 64 /* 825600 */
- 277 70 /* 902400 */
- 301 76 /* 979200 */
- 324 83 /* 1056000 */
- 348 90 /* 1132800 */
- 371 98 /* 1209600 */
- 395 105 /* 1286400 */
- 419 114 /* 1363200 */
- 442 123 /* 1440000 */
- 466 135 /* 1516800 */
- 490 152 /* 1593600 */
+ 300000 31
+ 422400 38
+ 499200 42
+ 576000 46
+ 652800 51
+ 748800 58
+ 825600 64
+ 902400 70
+ 979200 76
+ 1056000 83
+ 1132800 90
+ 1209600 97
+ 1286400 105
+ 1363200 114
+ 1440000 124
+ 1516800 136
+ 1593600 152
+ 1651200 167 /* speedbin 0,1 */
+ 1670400 173 /* speedbin 2 */
+ 1708800 186 /* speedbin 0,1 */
+ 1747200 201 /* speedbin 2 */
>;
idle-cost-data = <
22 18 14 12
@@ -363,28 +369,32 @@
};
CPU_COST_1: core-cost1 {
busy-cost-data = <
- 156 240 /* 300000 */
- 220 247 /* 422400 */
- 261 252 /* 499200 */
- 301 257 /* 576000 */
- 341 264 /* 652800 */
- 381 272 /* 729600 */
- 421 281 /* 806400 */
- 461 292 /* 883200 */
- 501 306 /* 960000 */
- 542 324 /* 1036800 */
- 582 346 /* 1113600 */
- 622 373 /* 1190400 */
- 662 407 /* 1267200 */
- 702 450 /* 1344000 */
- 742 504 /* 1420800 */
- 783 570 /* 1497600 */
- 823 649 /* 1574400 */
- 863 743 /* 1651200 */
- 903 849 /* 1728000 */
- 943 960 /* 1804800 */
- 983 1062 /* 1881600 */
- 1024 1131 /* 1958400 */
+ 300000 258
+ 422400 260
+ 499200 261
+ 576000 263
+ 652800 267
+ 729600 272
+ 806400 280
+ 883200 291
+ 960000 305
+ 1036800 324
+ 1113600 348
+ 1190400 378
+ 1267200 415
+ 1344000 460
+ 1420800 513
+ 1497600 576
+ 1574400 649
+ 1651200 732
+ 1728000 824
+ 1804800 923
+ 1881600 1027
+ 1958400 1131
+ 2035000 1228 /* speedbin 1,2 */
+ 2092000 1290 /* speedbin 1 */
+ 2112000 1308 /* speedbin 2 */
+ 2208000 1363 /* speedbin 2 */
>;
idle-cost-data = <
100 80 60 40
@@ -392,23 +402,27 @@
};
CLUSTER_COST_0: cluster-cost0 {
busy-cost-data = <
- 92 3 /* 300000 */
- 129 4 /* 422400 */
- 153 4 /* 499200 */
- 177 4 /* 576000 */
- 200 5 /* 652800 */
- 230 5 /* 748800 */
- 253 6 /* 825600 */
- 277 7 /* 902400 */
- 301 7 /* 979200 */
- 324 8 /* 1056000 */
- 348 9 /* 1132800 */
- 371 9 /* 1209600 */
- 395 10 /* 1286400 */
- 419 11 /* 1363200 */
- 442 12 /* 1440000 */
- 466 13 /* 1516800 */
- 490 15 /* 1593600 */
+ 300000 3
+ 422400 4
+ 499200 4
+ 576000 4
+ 652800 5
+ 748800 5
+ 825600 6
+ 902400 7
+ 979200 7
+ 1056000 8
+ 1132800 9
+ 1209600 9
+ 1286400 10
+ 1363200 11
+ 1440000 12
+ 1516800 13
+ 1593600 15
+ 1651200 17 /* speedbin 0,1 */
+ 1670400 19 /* speedbin 2 */
+ 1708800 21 /* speedbin 0,1 */
+ 1747200 23 /* speedbin 2 */
>;
idle-cost-data = <
4 3 2 1
@@ -416,28 +430,32 @@
};
CLUSTER_COST_1: cluster-cost1 {
busy-cost-data = <
- 156 24 /* 300000 */
- 220 24 /* 422400 */
- 261 25 /* 499200 */
- 301 25 /* 576000 */
- 341 26 /* 652800 */
- 381 27 /* 729600 */
- 421 28 /* 806400 */
- 461 29 /* 883200 */
- 501 30 /* 960000 */
- 542 32 /* 1036800 */
- 582 34 /* 1113600 */
- 622 37 /* 1190400 */
- 662 40 /* 1267200 */
- 702 45 /* 1344000 */
- 742 50 /* 1420800 */
- 783 57 /* 1497600 */
- 823 64 /* 1574400 */
- 863 74 /* 1651200 */
- 903 84 /* 1728000 */
- 943 96 /* 1804800 */
- 983 106 /* 1881600 */
- 1024 113 /* 1958400 */
+ 300000 24
+ 422400 24
+ 499200 25
+ 576000 25
+ 652800 26
+ 729600 27
+ 806400 28
+ 883200 29
+ 960000 30
+ 1036800 32
+ 1113600 34
+ 1190400 37
+ 1267200 40
+ 1344000 45
+ 1420800 50
+ 1497600 57
+ 1574400 64
+ 1651200 74
+ 1728000 84
+ 1804800 96
+ 1881600 106
+ 1958400 113
+ 2035000 120 /* speedbin 1,2 */
+ 2092000 125 /* speedbin 1 */
+ 2112000 127 /* speedbin 2 */
+ 2208000 130 /* speedbin 2 */
>;
idle-cost-data = <
4 3 2 1
