Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerstats: set time limit as timeout for AoC

Browse source 
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I725c00745890350f4227fc9408d926abc783ea66
Signed-off-by: Darren Hsu <darrenhsu@google.com>
This commit is contained in:
Darren Hsu 2022-04-19 08:55:10 +08:00 • committed by Aaron Ding
parent 7444ee1555
commit e630cfaaa9
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
powerstats/ZumaCommonDataProviders.cpp
View file

@ -102,6 +102,7 @@ void addPlaceholderEnergyConsumers(std::shared_ptr<PowerStats> p) {
} }
void addAoC(std::shared_ptr<PowerStats> p) { void addAoC(std::shared_ptr<PowerStats> p) {
static const uint64_t TIMEOUT_MILLIS = 120;
std::string prefix = "/sys/devices/platform/19000000.aoc/control/"; std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
// Add AoC cores (a32, ff1, hf0, and hf1) // Add AoC cores (a32, ff1, hf0, and hf1)
@ -114,7 +115,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
std::vector<std::pair<std::string, std::string>> coreStates = { std::vector<std::pair<std::string, std::string>> coreStates = {
{"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}}; {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds, p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds,
coreStates)); coreStates, TIMEOUT_MILLIS));
// Add AoC voltage stats // Add AoC voltage stats
std::vector<std::pair<std::string, std::string>> voltageIds = { std::vector<std::pair<std::string, std::string>> voltageIds = {
@ -125,7 +126,8 @@ void addAoC(std::shared_ptr<PowerStats> p) {
{"UUD", "ultra_underdrive"}, {"UUD", "ultra_underdrive"},
{"UD", "underdrive"}}; {"UD", "underdrive"}};
p->addStateResidencyDataProvider( p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates)); std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates,
TIMEOUT_MILLIS));
// Add AoC monitor mode // Add AoC monitor mode
std::vector<std::pair<std::string, std::string>> monitorIds = { std::vector<std::pair<std::string, std::string>> monitorIds = {
@ -135,7 +137,8 @@ void addAoC(std::shared_ptr<PowerStats> p) {
{"MON", "mode"}, {"MON", "mode"},
}; };
p->addStateResidencyDataProvider( p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates)); std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates,
TIMEOUT_MILLIS));
// Add AoC restart count // Add AoC restart count
const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {