From 3413a13921b942a9300f13d065dfa87bf1f1fec7 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 21 Mar 2022 15:19:17 +0800 Subject: [PATCH 1/4] powerstats: update TPU-DVFS frequencies Bug: 225290987 Test: dump power stats and see frequencies updated Change-Id: If516f115e1a3f3c06c04deadcea56b97f5a24ccd Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 76600e63..77cedf14 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -221,15 +221,10 @@ void addDvfsStats(std::shared_ptr p) { cfgs.push_back({"TPU", { std::make_pair("1066MHz", "1066000"), std::make_pair("845MHz", "845000"), - std::make_pair("625MHz", "625000"), - std::make_pair("227MHz", "227000"), - std::make_pair("RET_SLOW", "6"), - std::make_pair("S_OFF", "5"), - std::make_pair("S_SLOW", "4"), - std::make_pair("DS_FAST", "3"), - std::make_pair("DS_SLOW", "2"), - std::make_pair("DS_OFF", "1"), - std::make_pair("OFF", "0"), + std::make_pair("627MHz", "627000"), + std::make_pair("401MHz", "401000"), + std::make_pair("226MHz", "226000"), + std::make_pair("0MHz", "0"), }}); p->addStateResidencyDataProvider(std::make_unique( @@ -598,8 +593,8 @@ void addTPU(std::shared_ptr p) { stateCoeffs = { // TODO (b/197721618): Measuring the TPU power numbers - {"227000", 10}, - {"625000", 20}, + {"226000", 10}, + {"627000", 20}, {"845000", 30}, {"1066000", 40}}; From 058774bc73607b7b674d9fe26c583a2465b95c61 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 18 Mar 2022 16:57:58 +0000 Subject: [PATCH 2/4] By default, face-auth is non-bypass Test: manual Fixes: 225374807 Change-Id: I082de931940e9a6803e7bcc49a1a663f1e28a8f3 --- overlay/frameworks/base/core/res/res/values/config.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 65fdf501..b0e99b42 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -18,6 +18,8 @@ --> + + false false From e138cd41be75adbcdf5ee3a34b50f6ce0724bdff Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Mon, 21 Mar 2022 10:27:30 +0800 Subject: [PATCH 3/4] dumpstate: dump cooling device user_vote Bug: 221180075 Test: check dumpstate from bugreport Change-Id: I68e1d5d3561770714f13ab2560a0533d2cbec243 --- dumpstate/DumpstateDevice.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 4f60ded1..cbc1651e 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -499,14 +499,20 @@ void DumpstateDevice::dumpThermalSection(int fd) { "for f in /sys/class/thermal/cooling* ; do " "type=`cat $f/type` ; temp=`cat $f/cur_state` ; echo \"$type: $temp\" ; " "done"}); + RunCommandToFd(fd, "Cooling Device User Vote State", {"/vendor/bin/sh", "-c", + "for f in /sys/class/thermal/cooling* ; do " + "if [ ! -f $f/user_vote ]; then continue; fi; " + "type=`cat $f/type` ; temp=`cat $f/user_vote` ; echo \"$type: $temp\" ; " + "done"}); RunCommandToFd(fd, "Cooling Device Time in State", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; " "do type=`cat $f/type` ; temp=`cat $f/stats/time_in_state_ms` ; echo \"$type:\n$temp\" ; done"}); RunCommandToFd(fd, "Cooling Device Trans Table", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; " "do type=`cat $f/type` ; temp=`cat $f/stats/trans_table` ; echo \"$type:\n$temp\" ; done"}); RunCommandToFd(fd, "Cooling Device State2Power Table", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; do " - "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; " - "done"}); + "if [ ! -f $f/state2power_table ]; then continue; fi; " + "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; " + "done"}); DumpFileToFd(fd, "TMU state:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_state"); DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_current_temp"); DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs_thermal/parameters/tmu_top_reg_dump_rise_thres"); From e5125cb214528577143d1a4e76a245305978164b Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Thu, 17 Mar 2022 16:45:45 +0800 Subject: [PATCH 4/4] Move 90hz denylist to vendor Bug: 224646131 Change-Id: I66c9dc9b047aaa833f88a3e6162095e6022a92a4 --- overlay/frameworks/base/core/res/res/values/config.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index b0e99b42..7ef7556f 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -253,16 +253,6 @@ true - - - com.nianticlabs.pokemongo - com.google.android.documentsui - com.activision.callofduty.shooter - jp.konami.epjCastlevania2 - - -