diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp index 862173a5..cd841d2c 100644 --- a/powerstats/ZumaCommonDataProviders.cpp +++ b/powerstats/ZumaCommonDataProviders.cpp @@ -166,24 +166,17 @@ void addDvfsStats(std::shared_ptr p) { const int NS_TO_MS = 1000000; std::string path = "/sys/devices/platform/acpm_stats/fvp_stats"; + std::vector> adpCfgs = { + std::make_pair("CL0", "/sys/devices/system/cpu/cpufreq/policy0/stats"), + std::make_pair("CL1", "/sys/devices/system/cpu/cpufreq/policy4/stats"), + std::make_pair("CL2", "/sys/devices/system/cpu/cpufreq/policy8/stats"), + std::make_pair("MIF", + "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif")}; + + p->addStateResidencyDataProvider(std::make_unique( + path, NS_TO_MS, adpCfgs)); + std::vector cfgs; - - cfgs.push_back({"MIF", { - std::make_pair("3744MHz", "3744000"), - std::make_pair("3172MHz", "3172000"), - std::make_pair("2730MHz", "2730000"), - std::make_pair("2288MHz", "2288000"), - std::make_pair("2028MHz", "2028000"), - std::make_pair("1716MHz", "1716000"), - std::make_pair("1539MHz", "1539000"), - std::make_pair("1352MHz", "1352000"), - std::make_pair("1014MHz", "1014000"), - std::make_pair("845MHz", "845000"), - std::make_pair("676MHz", "676000"), - std::make_pair("546MHz", "546000"), - std::make_pair("421MHz", "421000"), - }}); - cfgs.push_back({"TPU", { std::make_pair("1119MHz", "1119000"), std::make_pair("1066MHz", "1066000"), @@ -205,15 +198,6 @@ void addDvfsStats(std::shared_ptr p) { std::make_pair("178MHz", "178000"), }}); - p->addStateResidencyDataProvider(std::make_unique( - path, NS_TO_MS, "CL0", "/sys/devices/system/cpu/cpufreq/policy0/stats/time_in_state")); - - p->addStateResidencyDataProvider(std::make_unique( - path, NS_TO_MS, "CL1", "/sys/devices/system/cpu/cpufreq/policy4/stats/time_in_state")); - - p->addStateResidencyDataProvider(std::make_unique( - path, NS_TO_MS, "CL2", "/sys/devices/system/cpu/cpufreq/policy8/stats/time_in_state")); - p->addStateResidencyDataProvider(std::make_unique( path, NS_TO_MS, cfgs)); }