From 1e5ee80f88bef37d64713e45cb5a6e2f24ebb3ac Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 17 Oct 2022 12:07:26 +0800 Subject: [PATCH 1/4] powerstats: update specific data provider configurations Bug: 253951732 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: Idf73f9e65ddd0f47146b1bfac5ac6b101103c5ca Merged-In: Idf73f9e65ddd0f47146b1bfac5ac6b101103c5ca Signed-off-by: Darren Hsu --- powerstats/felix/Android.bp | 2 ++ powerstats/felix/service.cpp | 53 ++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/powerstats/felix/Android.bp b/powerstats/felix/Android.bp index b7c146f..6a46051 100644 --- a/powerstats/felix/Android.bp +++ b/powerstats/felix/Android.bp @@ -16,6 +16,7 @@ soong_namespace { imports: [ "hardware/google/pixel", "device/google/gs201/powerstats", + "device/google/gs-common/powerstats", ] } @@ -40,5 +41,6 @@ cc_binary { shared_libs: [ "android.hardware.power.stats-impl.gs201", + "android.hardware.power.stats-impl.gs-common", ], } diff --git a/powerstats/felix/service.cpp b/powerstats/felix/service.cpp index d20effd..92dd056 100644 --- a/powerstats/felix/service.cpp +++ b/powerstats/felix/service.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -28,6 +29,7 @@ #include #include +using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider; using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; @@ -105,6 +107,39 @@ void addUwb(std::shared_ptr p) { "/sys/devices/platform/10db0000.spi/spi_master/spi16/spi16.0/uwb/power_stats", cfgs)); } +void addGPUGs202(std::shared_ptr p) { + std::map stateCoeffs; + + // Add GPU state residency + p->addStateResidencyDataProvider(std::make_unique( + "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() { LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; @@ -113,10 +148,24 @@ int main() { std::shared_ptr p = ndk::SharedRefBase::make(); - addGs201CommonDataProviders(p); + setEnergyMeter(p); + addAoC(p); + addPixelStateResidencyDataProvider(p); + addCPUclusters(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"); + addUwb(p); + addPowerDomains(p); + addDevfreq(p); + addGPUGs202(p); + addDvfsStats(p); const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); From 1d4794d076a4aeb67841c8212b965c9a9ec01127 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Tue, 18 Oct 2022 16:12:43 +0800 Subject: [PATCH 2/4] Add hci_inject in userdebug build Bug: 254203740 Test: make Merged-In: I2bb5109f0fbf48bfd6b07afcc6a7a4f8bb503fb7 Change-Id: I2bb5109f0fbf48bfd6b07afcc6a7a4f8bb503fb7 --- device-felix.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index f832d3f..dbcf250 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -203,6 +203,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test +# Bluetooth hci_inject test tool +PRODUCT_PACKAGES_DEBUG += \ + hci_inject + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true From 70fc2c82481de2a83b3e86c4ab9cd96ab8c44c3e Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Tue, 18 Oct 2022 16:36:28 +0800 Subject: [PATCH 3/4] [DO NOT MERGE]Add ewp and ext hal Bug: 254206297 Test: build Change-Id: I2265fb7169653ae159e76d41febc24ba3aa89eb1 --- bluetooth/manifest_bluetooth.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml index 2d055f4..64238c7 100644 --- a/bluetooth/manifest_bluetooth.xml +++ b/bluetooth/manifest_bluetooth.xml @@ -26,6 +26,15 @@ default + + hardware.google.bluetooth.ext + hwbinder + 1.0 + + IBluetoothExt + default + + hardware.google.bluetooth.ccc hwbinder @@ -35,4 +44,13 @@ default + + hardware.google.bluetooth.ewp + hwbinder + 1.0 + + IBluetoothEwp + default + + From 458ead019f96f4f4485751bf5ca628661b95882b Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 18 Oct 2022 17:31:01 +0800 Subject: [PATCH 4/4] audio: Merge telephony tuning tables Change List : Fortemedia_table Handset Fine-tune Handset performance based on EVT device. Handsfree Fine-tune Handsfree performance based on EVT device. Mixer_paths Handsfree Add fast_switch command. Audio_platform Add the CCA control Modify VoIP downlink channel for SS Files from the latest attachment on b/253202312 Bug: 253202312 Test: verified by huangsean@ Change-id: I5db1b31315a8d5235014b8c59f7add5f9cd62e04 --- .../config/audio_platform_configuration.xml | 3 +- audio/felix/config/mixer_paths.xml | 18 +- audio/felix/cs35l41/fw/fast_switch1.txt | 1 + audio/felix/cs35l41/fw/fast_switch2.txt | 1 + audio/felix/cs35l41/fw/fast_switch3.txt | 1 + audio/felix/cs35l41/fw/fast_switch4.txt | 1 + audio/felix/tuning/fortemedia/HANDSET.dat | Bin 255674 -> 255674 bytes audio/felix/tuning/fortemedia/HANDSET.mods | 59626 ++++++++-------- audio/felix/tuning/fortemedia/HANDSFREE.dat | Bin 117198 -> 117198 bytes audio/felix/tuning/fortemedia/HANDSFREE.mods | 20494 +++--- 10 files changed, 40083 insertions(+), 40062 deletions(-) create mode 100644 audio/felix/cs35l41/fw/fast_switch1.txt create mode 100644 audio/felix/cs35l41/fw/fast_switch2.txt create mode 100644 audio/felix/cs35l41/fw/fast_switch3.txt create mode 100644 audio/felix/cs35l41/fw/fast_switch4.txt diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml index 36c5c39..be9013c 100644 --- a/audio/felix/config/audio_platform_configuration.xml +++ b/audio/felix/config/audio_platform_configuration.xml @@ -295,7 +295,8 @@ - + + diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml index 7a54043..d804dc1 100644 --- a/audio/felix/config/mixer_paths.xml +++ b/audio/felix/config/mixer_paths.xml @@ -119,6 +119,12 @@ + + + + + + @@ -652,19 +658,29 @@ + + + + - + + + + + + + diff --git a/audio/felix/cs35l41/fw/fast_switch1.txt b/audio/felix/cs35l41/fw/fast_switch1.txt new file mode 100644 index 0000000..010960b --- /dev/null +++ b/audio/felix/cs35l41/fw/fast_switch1.txt @@ -0,0 +1 @@ +11,4,768,1236,419376,69632,2229542,1,7,0,1995017964 \ No newline at end of file diff --git a/audio/felix/cs35l41/fw/fast_switch2.txt b/audio/felix/cs35l41/fw/fast_switch2.txt new file mode 100644 index 0000000..7dd3cfa --- /dev/null +++ b/audio/felix/cs35l41/fw/fast_switch2.txt @@ -0,0 +1 @@ +11,4,768,1236,419376,65536,2229542,1,7,0,1705752038 \ No newline at end of file diff --git a/audio/felix/cs35l41/fw/fast_switch3.txt b/audio/felix/cs35l41/fw/fast_switch3.txt new file mode 100644 index 0000000..cd93f34 --- /dev/null +++ b/audio/felix/cs35l41/fw/fast_switch3.txt @@ -0,0 +1 @@ +11,4,768,1236,419376,69632,2229542,1,7,4194304,-2037333527 \ No newline at end of file diff --git a/audio/felix/cs35l41/fw/fast_switch4.txt b/audio/felix/cs35l41/fw/fast_switch4.txt new file mode 100644 index 0000000..1783c89 --- /dev/null +++ b/audio/felix/cs35l41/fw/fast_switch4.txt @@ -0,0 +1 @@ +11,4,768,1236,419376,65536,2229542,1,7,4194304,-1781335325 \ No newline at end of file diff --git a/audio/felix/tuning/fortemedia/HANDSET.dat b/audio/felix/tuning/fortemedia/HANDSET.dat index 101f669753b5a15e94bff6a09a25dd3a8f330335..391a57a9abe5f1c5c18653406ad5acb8c017d621 100644 GIT binary patch delta 8447 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