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

Merge "powerstats: update specific data provider configurations" into tm-qpr-dev am: cba0e9f07b

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/20195189

Change-Id: I85e5f7074ac0dcaf63568a1f90e57a317f1a8375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-10-19 07:06:48 +00:00 • committed by Automerger Merge Worker
commit 591f1bfb47
2 changed files with 53 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
powerstats/felix/Android.bp
View file

@ -16,6 +16,7 @@ soong_namespace {
imports: [ imports: [
"hardware/google/pixel", "hardware/google/pixel",
"device/google/gs201/powerstats", "device/google/gs201/powerstats",
"device/google/gs-common/powerstats",
] ]
} }
@ -40,5 +41,6 @@ cc_binary {
shared_libs: [ shared_libs: [
"android.hardware.power.stats-impl.gs201", "android.hardware.power.stats-impl.gs201",
"android.hardware.power.stats-impl.gs-common",
], ],
} }

53
powerstats/felix/service.cpp
View file

@ -19,6 +19,7 @@
#include <dataproviders/DisplayStateResidencyDataProvider.h> #include <dataproviders/DisplayStateResidencyDataProvider.h>
#include <dataproviders/GenericStateResidencyDataProvider.h> #include <dataproviders/GenericStateResidencyDataProvider.h>
#include <dataproviders/PowerStatsEnergyConsumer.h> #include <dataproviders/PowerStatsEnergyConsumer.h>
#include <DevfreqStateResidencyDataProvider.h>
#include <Gs201CommonDataProviders.h> #include <Gs201CommonDataProviders.h>
#include <PowerStatsAidl.h> #include <PowerStatsAidl.h>
@ -28,6 +29,7 @@
#include <android/binder_process.h> #include <android/binder_process.h>
#include <log/log.h> #include <log/log.h>
using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider;
@ -105,6 +107,39 @@ void addUwb(std::shared_ptr<PowerStats> p) {
"/sys/devices/platform/10db0000.spi/spi_master/spi16/spi16.0/uwb/power_stats", cfgs)); "/sys/devices/platform/10db0000.spi/spi_master/spi16/spi16.0/uwb/power_stats", cfgs));
} }
void addGPUGs202(std::shared_ptr<PowerStats> p) {
std::map<std::string, int32_t> stateCoeffs;
// Add GPU state residency
p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
"GPU",
"/sys/devices/platform/28000000.mali"));
// Add GPU energy consumer
stateCoeffs = {
{"202000", 890},
{"251000", 1102},
{"302000", 1308},
{"351000", 1522},
{"400000", 1772},
{"434000", 1931},
{"471000", 2105},
{"510000", 2292},
{"572000", 2528},
{"633000", 2811},
{"701000", 3127},
{"762000", 3452},
{"848000", 4044}};
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(
p,
EnergyConsumerType::OTHER,
"GPU",
{"S2S_VDD_G3D", "S8S_VDD_G3D_L2"},
{{UID_TIME_IN_STATE, "/sys/devices/platform/28000000.mali/uid_time_in_state"}},
stateCoeffs));
}
int main() { int main() {
LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting.";
@ -113,10 +148,24 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addGs201CommonDataProviders(p); setEnergyMeter(p);
addAoC(p);
addPixelStateResidencyDataProvider(p);
addCPUclusters(p);
addDisplay(p); addDisplay(p);
addUwb(p); addSoC(p);
addGNSS(p);
addMobileRadio(p);
addPCIe(p);
addWifi(p);
addTPU(p);
addUfs(p);
addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
addUwb(p);
addPowerDomains(p);
addDevfreq(p);
addGPUGs202(p);
addDvfsStats(p);
const std::string instance = std::string() + PowerStats::descriptor + "/default"; const std::string instance = std::string() + PowerStats::descriptor + "/default";
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());