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

Revert "powerstats: set time limit as timeout for AoC"

Browse source 
Revert "powerstats: timeout mechanism for AoC data provider"

Revert submission 17800080-power-stats-aoc-timeout

Reason for revert: Causing crashes due to improper thread sync
Reverted Changes:
I71a9e6817:powerstats: timeout mechanism for AoC data provide...
I725c00745:powerstats: set time limit as timeout for AoC
I5b290a53d:powerstats: set time limit as timeout for AoC

Change-Id: I84f5173aada0539d8c91d18d36a841bc9f3e3c9a
This commit is contained in:
Kelly Rossmoyer 2022-04-24 23:22:49 +00:00 • committed by TreeHugger Robot
parent ef25209b6b
commit f2fa5042d8
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
powerstats/Gs201CommonDataProviders.cpp
View file

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