From 334bd6d2ecd87e9203c89a8ff92b8eac807c8f11 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Tue, 19 Apr 2022 08:57:42 +0800
Subject: [PATCH 1/2] powerstats: set time limit as timeout for AoC

Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I5b290a53dcd5325aa55fd95a42c1af95066f550c
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/Gs101CommonDataProviders.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp
index 13e6b71f..124177ca 100644
--- a/powerstats/Gs101CommonDataProviders.cpp
+++ b/powerstats/Gs101CommonDataProviders.cpp
@@ -45,6 +45,7 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 constexpr char kBootHwSoCRev[] = "ro.boot.hw.soc.rev";
 
 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)
@@ -57,7 +58,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));
+            coreStates, TIMEOUT_MILLIS));
 
     // Add AoC voltage stats
     std::vector<std::pair<std::string, std::string>> voltageIds = {
@@ -68,7 +69,8 @@ void addAoC(std::shared_ptr<PowerStats> p) {
                                                                       {"UUD", "ultra_underdrive"},
                                                                       {"UD", "underdrive"}};
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates));
+            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates,
+                    TIMEOUT_MILLIS));
 
     // Add AoC monitor mode
     std::vector<std::pair<std::string, std::string>> monitorIds = {
@@ -78,7 +80,8 @@ void addAoC(std::shared_ptr<PowerStats> p) {
             {"MON", "mode"},
     };
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
+            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates,
+                    TIMEOUT_MILLIS));
 
     // Add AoC restart count
     const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {

From b3a98db2471de660c79d142dee0e002db89d6fe5 Mon Sep 17 00:00:00 2001
From: chungkai <chungkai@google.com>
Date: Wed, 20 Apr 2022 04:07:36 +0000
Subject: [PATCH 2/2] powerhal: update new boost uclamp value

update new boost uclamp value since we update
cpu capacity

Test: PTS UIBench has no obvious difference
Bug: 224649226
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: Ie2fd9950a98f9786b03ef4e364fd9d584dcc438d
---
 conf/init.gs101.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index d45b31a2..ba804bf7 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -783,9 +783,9 @@ on property:sys.boot_completed=1
     write /proc/vendor_sched/pmu_poll_enable 0
 
     # Setup groups for SF (RT used for SF RE, SF used for SF main)
-    write /proc/vendor_sched/rt_uclamp_min 125
+    write /proc/vendor_sched/rt_uclamp_min 160
     write /proc/vendor_sched/rt_prefer_idle 1
-    write /proc/vendor_sched/sf_uclamp_min 30
+    write /proc/vendor_sched/sf_uclamp_min 39
     write /proc/vendor_sched/sf_prefer_idle 1
 
     # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%)