commit 7dfafc70a0015903c46dce403e14b3411375a4b7
author Darren Hsu <darrenhsu@google.com> Fri Jun 17 20:30:18 2022 +0800
committer Darren Hsu <darrenhsu@google.com> Fri Jun 17 12:49:04 2022 +0000
tree 6789c9b1869cdae106e80ca2fac958dc73be922d
parent ab062f9fc3527f64fff0c533ad59488f7cabf1a9

powerstats: set AoC clock for timestamp calculations

Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I40c155c78331255ec5a7d9300798cec0a3d219f5
Merged-In: I40c155c78331255ec5a7d9300798cec0a3d219f5
Signed-off-by: Darren Hsu <darrenhsu@google.com>

powerstats/Gs101CommonDataProviders.cpp

diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp
index 13e6b71..035810b 100644
--- a/powerstats/Gs101CommonDataProviders.cpp
+++ b/powerstats/Gs101CommonDataProviders.cpp
@@ -45,6 +45,8 @@
 constexpr char kBootHwSoCRev[] = "ro.boot.hw.soc.rev";
 
 void addAoC(std::shared_ptr<PowerStats> p) {
+    // AoC clock is synced from "libaoc.c"
+    static const uint64_t AOC_CLOCK = 4096;
     std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
 
     // Add AoC cores (a32, ff1, hf0, and hf1)
@@ -57,7 +59,7 @@
     std::vector<std::pair<std::string, std::string>> coreStates = {
             {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
     p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds,
-            coreStates));
+            coreStates, AOC_CLOCK));
 
     // Add AoC voltage stats
     std::vector<std::pair<std::string, std::string>> voltageIds = {
@@ -68,7 +70,7 @@
                                                                       {"UUD", "ultra_underdrive"},
                                                                       {"UD", "underdrive"}};
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates));
+            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates, AOC_CLOCK));
 
     // Add AoC monitor mode
     std::vector<std::pair<std::string, std::string>> monitorIds = {
@@ -78,7 +80,7 @@
             {"MON", "mode"},
     };
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
+            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates, AOC_CLOCK));
 
     // Add AoC restart count
     const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {