Merge "power_profile: Correct CPU topology and power number" into rvc-dev am: e3ca4fcc9a

Change-Id: Ic9317e448bfe7a3866dcd9812d1e9162c0b6c749

1 files changed, 53 insertions, 109 deletions

diff --git a/bramble/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/bramble/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 852f753..4107146 100644
--- a/bramble/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/bramble/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -22,8 +22,8 @@
 
     <!-- Number of cores each CPU cluster contains -->
     <array name="cpu.clusters.cores">
-      <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
-      <value>3</value> <!-- Cluster 1 has 3 cores (cpu4, cpu5, cpu6) -->
+      <value>6</value> <!-- Cluster 0 has 6 cores (cpu0, cpu1, cpu2, cpu3, cpu4, cpu5) -->
+      <value>1</value> <!-- Cluster 1 has 1 cores (cpu6) -->
       <value>1</value> <!-- Cluster 2 has 1 cores (cpu7) -->
     </array>
 
@@ -50,136 +50,80 @@
          /sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
     <array name="cpu.core_speeds.cluster0">
       <value>300000</value> <!-- 300 MHz CPU speed -->
-      <value>403200</value> <!-- 403 MHz CPU speed -->
-      <value>499200</value> <!-- 499 MHz CPU speed -->
       <value>576000</value> <!-- 576 MHz CPU speed -->
-      <value>672000</value> <!-- 672 MHz CPU speed -->
-      <value>768000</value> <!-- 768 MHz CPU speed -->
-      <value>844800</value> <!-- 844 MHz CPU speed -->
-      <value>940800</value> <!-- 940 MHz CPU speed -->
-      <value>1036800</value> <!-- 1036 MHz CPU speed -->
-      <value>1113600</value> <!-- 1113 MHz CPU speed -->
-      <value>1209600</value> <!-- 1209 MHz CPU speed -->
-      <value>1305600</value> <!-- 1305 MHz CPU speed -->
-      <value>1382400</value> <!-- 1382 MHz CPU speed -->
-      <value>1478400</value> <!-- 1478 MHz CPU speed -->
-      <value>1555200</value> <!-- 1555 MHz CPU speed -->
-      <value>1632000</value> <!-- 1632 MHz CPU speed -->
-      <value>1708800</value> <!-- 1708 MHz CPU speed -->
-      <value>1785600</value> <!-- 1785 MHz CPU speed -->
+      <value>614400</value> <!-- 614 MHz CPU speed -->
+      <value>864000</value> <!-- 864 MHz CPU speed -->
+      <value>1075200</value> <!-- 1075 MHz CPU speed -->
+      <value>1363200</value> <!-- 1363 MHz CPU speed -->
+      <value>1516800</value> <!-- 1516 MHz CPU speed -->
+      <value>1651200</value> <!-- 1651 MHz CPU speed -->
+      <value>1804800</value> <!-- 1804 MHz CPU speed -->
     </array>
+
     <!-- Different CPU speeds as reported in
-         /sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
+         /sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
     <array name="cpu.core_speeds.cluster1">
-      <value>710400</value> <!-- 710 MHz CPU speed -->
-      <value>825600</value> <!-- 825 MHz CPU speed -->
+      <value>652800</value> <!-- 652 MHz CPU speed -->
       <value>940800</value> <!-- 940 MHz CPU speed -->
-      <value>1056000</value> <!-- 1056 MHz CPU speed -->
-      <value>1171200</value> <!-- 1171 MHz CPU speed -->
-      <value>1286400</value> <!-- 1286 MHz CPU speed -->
-      <value>1401600</value> <!-- 1401 MHz CPU speed -->
-      <value>1497600</value> <!-- 1497 MHz CPU speed -->
-      <value>1612800</value> <!-- 1612 MHz CPU speed -->
-      <value>1708800</value> <!-- 1708 MHz CPU speed -->
-      <value>1804800</value> <!-- 1804 MHz CPU speed -->
-      <value>1920000</value> <!-- 1920 MHz CPU speed -->
-      <value>2016000</value> <!-- 2016 MHz CPU speed -->
-      <value>2131200</value> <!-- 2131 MHz CPU speed -->
-      <value>2227200</value> <!-- 2227 MHz CPU speed -->
-      <value>2323200</value> <!-- 2323 MHz CPU speed -->
-      <value>2419200</value> <!-- 2419 MHz CPU speed -->
+      <value>1152000</value> <!-- 1152 MHz CPU speed -->
+      <value>1478400</value> <!-- 1478 MHz CPU speed -->
+      <value>1728000</value> <!-- 1728 MHz CPU speed -->
+      <value>1900800</value> <!-- 1900 MHz CPU speed -->
+      <value>2092800</value> <!-- 2092 MHz CPU speed -->
+      <value>2208000</value> <!-- 2208 MHz CPU speed -->
     </array>
+
     <!-- Different CPU speeds as reported in
          /sys/devices/system/cpu/cpufreq/ploicy7/scaling_available_frequencies -->
     <array name="cpu.core_speeds.cluster2">
-      <value>825600</value> <!-- 825 MHz CPU speed -->
-      <value>940800</value> <!-- 940 MHz CPU speed -->
-      <value>1056000</value> <!-- 1056 MHz CPU speed -->
-      <value>1171200</value> <!-- 1171 MHz CPU speed -->
-      <value>1286400</value> <!-- 1286 MHz CPU speed -->
+      <value>806400</value> <!-- 806 MHz CPU speed -->
+      <value>1094400</value> <!-- 1094 MHz CPU speed -->
       <value>1401600</value> <!-- 1401 MHz CPU speed -->
-      <value>1497600</value> <!-- 1497 MHz CPU speed -->
-      <value>1612800</value> <!-- 1612 MHz CPU speed -->
-      <value>1708800</value> <!-- 1708 MHz CPU speed -->
-      <value>1804800</value> <!-- 1804 MHz CPU speed -->
-      <value>1920000</value> <!-- 1920 MHz CPU speed -->
-      <value>2016000</value> <!-- 2016 MHz CPU speed -->
-      <value>2131200</value> <!-- 2131 MHz CPU speed -->
-      <value>2227200</value> <!-- 2227 MHz CPU speed -->
-      <value>2323200</value> <!-- 2323 MHz CPU speed -->
-      <value>2419200</value> <!-- 2419 MHz CPU speed -->
-      <value>2534400</value> <!-- 2534 MHz CPU speed -->
-      <value>2649600</value> <!-- 2649 MHz CPU speed -->
-      <value>2745600</value> <!-- 2745 MHz CPU speed -->
-      <value>2841600</value> <!-- 2814 MHz CPU speed -->
+      <value>1766400</value> <!-- 1766 MHz CPU speed -->
+      <value>1996800</value> <!-- 1996 MHz CPU speed -->
+      <value>2188800</value> <!-- 2188 MHz CPU speed -->
+      <value>2304000</value> <!-- 2304 MHz CPU speed -->
+      <value>2400000</value> <!-- 2400 MHz CPU speed -->
     </array>
 
     <!-- Additional power used by a CPU core from cluster 0 when running at
          different speeds, excluding cluster and active cost -->
     <array name="cpu.core_power.cluster0">
-      <value>39.44</value> <!-- 300 MHz CPU speed -->
-      <value>41.34</value> <!-- 403 MHz CPU speed -->
-      <value>43.57</value> <!-- 499 MHz CPU speed -->
-      <value>45.48</value> <!-- 576 MHz CPU speed -->
-      <value>47.20</value> <!-- 672 MHz CPU speed -->
-      <value>49.64</value> <!-- 768 MHz CPU speed -->
-      <value>51.88</value> <!-- 844 MHz CPU speed -->
-      <value>53.34</value> <!-- 940 MHz CPU speed -->
-      <value>56.69</value> <!-- 1036 MHz CPU speed -->
-      <value>58.78</value> <!-- 1113 MHz CPU speed -->
-      <value>61.41</value> <!-- 1209 MHz CPU speed -->
-      <value>65.11</value> <!-- 1305 MHz CPU speed -->
-      <value>67.49</value> <!-- 1382 MHz CPU speed -->
-      <value>70.61</value> <!-- 1478 MHz CPU speed -->
-      <value>72.39</value> <!-- 1555 MHz CPU speed -->
-      <value>75.43</value> <!-- 1632 MHz CPU speed -->
-      <value>80.21</value> <!-- 1708 MHz CPU speed -->
-      <value>85.05</value> <!-- 1785 MHz CPU speed -->
+      <value>41.92</value> <!-- 300 MHz CPU speed -->
+      <value>59.59</value> <!-- 576 MHz CPU speed -->
+      <value>61.93</value> <!-- 614 MHz CPU speed -->
+      <value>79.86</value> <!-- 864 MHz CPU speed -->
+      <value>95.92</value> <!-- 1075 MHz CPU speed -->
+      <value>121.97</value> <!-- 1363 MHz CPU speed -->
+      <value>140.72</value> <!-- 1516 MHz CPU speed -->
+      <value>159.18</value> <!-- 1651 MHz CPU speed -->
+      <value>176.19</value> <!-- 1804 MHz CPU speed -->
     </array>
+
     <!-- Additional power used by a CPU core from cluster 1 when running at
          different speeds, excluding cluster and active cost -->
     <array name="cpu.core_power.cluster1">
-      <value>50.35</value> <!-- 710 MHz CPU speed -->
-      <value>55.12</value> <!-- 825 MHz CPU speed -->
-      <value>61.45</value> <!-- 940 MHz CPU speed -->
-      <value>69.92</value> <!-- 1056 MHz CPU speed -->
-      <value>77.48</value> <!-- 1171 MHz CPU speed -->
-      <value>85.35</value> <!-- 1286 MHz CPU speed -->
-      <value>95.17</value> <!-- 1401 MHz CPU speed -->
-      <value>103.26</value> <!-- 1497 MHz CPU speed -->
-      <value>118.19</value> <!-- 1612 MHz CPU speed -->
-      <value>132.72</value> <!-- 1708 MHz CPU speed -->
-      <value>143.83</value> <!-- 1804 MHz CPU speed -->
-      <value>155.91</value> <!-- 1920 MHz CPU speed -->
-      <value>190.16</value> <!-- 2016 MHz CPU speed -->
-      <value>213.11</value> <!-- 2131 MHz CPU speed -->
-      <value>237.96</value> <!-- 2227 MHz CPU speed -->
-      <value>266.97</value> <!-- 2323 MHz CPU speed -->
-      <value>302.04</value> <!-- 2419 MHz CPU speed -->
+      <value>32.13</value> <!-- 652 MHz CPU speed -->
+      <value>35.98</value> <!-- 940 MHz CPU speed -->
+      <value>40.03</value> <!-- 1152 MHz CPU speed -->
+      <value>51.02</value> <!-- 1478 MHz CPU speed -->
+      <value>77.06</value> <!-- 1728 MHz CPU speed -->
+      <value>86.25</value> <!-- 1900 MHz CPU speed -->
+      <value>97.30</value> <!-- 2092 MHz CPU speed -->
+      <value>101.61</value> <!-- 2208 MHz CPU speed -->
     </array>
+
     <!-- Additional power used by a CPU core from cluster 2 when running at
          different speeds, excluding cluster and active cost -->
     <array name="cpu.core_power.cluster2">
-      <value>52.70</value> <!-- 825 MHz CPU speed -->
-      <value>55.90</value> <!-- 940 MHz CPU speed -->
-      <value>59.73</value> <!-- 1056 MHz CPU speed -->
-      <value>63.66</value> <!-- 1171 MHz CPU speed -->
-      <value>67.28</value> <!-- 1286 MHz CPU speed -->
-      <value>71.66</value> <!-- 1401 MHz CPU speed -->
-      <value>76.47</value> <!-- 1497 MHz CPU speed -->
-      <value>80.92</value> <!-- 1612 MHz CPU speed -->
-      <value>85.81</value> <!-- 1708 MHz CPU speed -->
-      <value>93.19</value> <!-- 1804 MHz CPU speed -->
-      <value>98.06</value> <!-- 1920 MHz CPU speed -->
-      <value>119.08</value> <!-- 2016 MHz CPU speed -->
-      <value>127.88</value> <!-- 2131 MHz CPU speed -->
-      <value>129.85</value> <!-- 2227 MHz CPU speed -->
-      <value>140.37</value> <!-- 2323 MHz CPU speed -->
-      <value>151.22</value> <!-- 2419 MHz CPU speed -->
-      <value>160.73</value> <!-- 2534 MHz CPU speed -->
-      <value>175.50</value> <!-- 2649 MHz CPU speed -->
-      <value>186.29</value> <!-- 2745 MHz CPU speed -->
-      <value>223.89</value> <!-- 2814 MHz CPU speed -->
+      <value>56.44</value> <!-- 806 MHz CPU speed -->
+      <value>65.72</value> <!-- 1094 MHz CPU speed -->
+      <value>77.01</value> <!-- 1401 MHz CPU speed -->
+      <value>104.91</value> <!-- 1766 MHz CPU speed -->
+      <value>112.35</value> <!-- 1996 MHz CPU speed -->
+      <value>118.53</value> <!-- 2188 MHz CPU speed -->
+      <value>122.34</value> <!-- 2304 MHz CPU speed -->
+      <value>135.00</value> <!-- 2400 MHz CPU speed -->
     </array>
 
     <!-- Additional power used when screen is ambient mode -->