From ef4447e2814d9ba2af2a9be5306ca06342ddbe0f Mon Sep 17 00:00:00 2001 From: Elie Kheirallah Date: Tue, 18 Oct 2022 22:22:07 +0000 Subject: [PATCH 1/4] Revert "Enable radio on aosp_lynx" DroidMonitor: Potential culprit for Bug 254323087 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. This reverts commit b9cb6d340b945f0a4c190f99b99a1e01de398fce. Reason for revert: Multiple test failures on multiple targets. Change-Id: Icf83fcb9a56349adf78638509ac755db7440c660 --- aosp_lynx.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/aosp_lynx.mk b/aosp_lynx.mk index 1850584..792acf5 100644 --- a/aosp_lynx.mk +++ b/aosp_lynx.mk @@ -19,6 +19,7 @@ TARGET_LINUX_KERNEL_VERSION := 5.10 DEVICE_USES_NO_TRUSTY := true USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true +BOARD_WITHOUT_RADIO := true $(call inherit-product, device/google/gs201/aosp_common.mk) $(call inherit-product, device/google/lynx/device-lynx.mk) From 2abdd7f706615bfb0299819af3cb62e8097f0b98 Mon Sep 17 00:00:00 2001 From: Cyan Hsieh Date: Wed, 19 Oct 2022 02:57:10 +0000 Subject: [PATCH 2/4] Revert "Revert "Enable radio on aosp_lynx"" This reverts commit ef4447e2814d9ba2af2a9be5306ca06342ddbe0f. Reason for revert: change only affects aosp_lynx-userdebug, test pass with the broken test: FrameworksServicesTests:com.android.server.pm.PackageManagerTests#testSigSameAfterUpgrade Bug: 253288064 Change-Id: I7285439a6138723bdda037ae5238105c2dd7a1a3 --- aosp_lynx.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/aosp_lynx.mk b/aosp_lynx.mk index 792acf5..1850584 100644 --- a/aosp_lynx.mk +++ b/aosp_lynx.mk @@ -19,7 +19,6 @@ TARGET_LINUX_KERNEL_VERSION := 5.10 DEVICE_USES_NO_TRUSTY := true USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true -BOARD_WITHOUT_RADIO := true $(call inherit-product, device/google/gs201/aosp_common.mk) $(call inherit-product, device/google/lynx/device-lynx.mk) From b36ec31c040497e63727dd0b7fefc1d50233df8a Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 17 Oct 2022 11:59:24 +0800 Subject: [PATCH 3/4] powerstats: update specific data provider configurations Bug: 253951732 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I25002aa32cca636f12615c67555c957036ab2d24 Merged-In: Ie81082c4c2df6620f361a9ad6d2bc725749e0e00 Signed-off-by: Darren Hsu --- powerstats/Android.bp | 2 ++ powerstats/service.cpp | 50 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/powerstats/Android.bp b/powerstats/Android.bp index 2a38f9f..55a934c 100644 --- a/powerstats/Android.bp +++ b/powerstats/Android.bp @@ -16,6 +16,7 @@ soong_namespace { imports: [ "hardware/google/pixel", "device/google/gs201/powerstats", + "device/google/gs-common/powerstats", ] } @@ -38,5 +39,6 @@ cc_binary { shared_libs: [ "android.hardware.power.stats-impl.gs201", + "android.hardware.power.stats-impl.gs-common", ], } diff --git a/powerstats/service.cpp b/powerstats/service.cpp index ef07d0e..d8856cc 100644 --- a/powerstats/service.cpp +++ b/powerstats/service.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -27,6 +28,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::PowerStatsEnergyConsumer; @@ -53,6 +55,39 @@ void addDisplay(std::shared_ptr p) { {"On: 1080x2400@90", 3}})); } +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."; @@ -61,9 +96,22 @@ int main() { std::shared_ptr p = ndk::SharedRefBase::make(); - addGs201CommonDataProvidersQc(p); + setEnergyMeter(p); + addAoC(p); + addCPUclusters(p); addDisplay(p); + addSoC(p); + addGNSS(p); + addMobileRadio(p); + addPCIe(p); + addWlan(p); + addTPU(p); + addUfs(p); addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + 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 d6450a63a936c8c3b453618c6b5264f0a649468c Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Wed, 19 Oct 2022 12:14:53 +0800 Subject: [PATCH 4/4] audio: Phase in Waves mps file in L10 I put L10 EVT tuning files in the attached file. 1. Refine tuning to fix AQTI and dogfood issue. 2. Modify below 20th volume step timbre. Let it clear. 3. Portrait mode and Landscape mode volume curve the same. Use Waves Linklaw to modify Landscape volume curve. 4. Include 1.8A BAACL tuning in this mps Files from the latest attachment on b/254376925 Bug: 244273219 Bug: 244273447 Bug: 244509076 Bug: 254376925 Test: verified by supery@ Change-Id: I3cfca6cb8e2d2b963347c4832674f438a929f268 --- audio/lynx/tuning/waves/waves_preset.mps | Bin 128782 -> 130918 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/lynx/tuning/waves/waves_preset.mps b/audio/lynx/tuning/waves/waves_preset.mps index b9654e34f461d37ee5b7b959f7f604b037fe5586..d121befe06989d8c00b23140ac5392da545882af 100644 GIT binary patch delta 5658 zcmdT{ZERCj7(S<4+pQF{0U4WX_95F~VT^UvLZY;Hv>QgJo1_Ac$+qCeM|1^DG-JWl zsDP-zye8KTqa*%a#9c@iW7x%zpk{Mm;t!2Kn9;>(gaIxj1UKJv-gDdADzdIj^d>KR z&f&c8J?A|4Ip^u&OV;rzt7UC{)ni+xyDeXrE+K@Z6xKQ`nyNPhoaGfwYpbe!wN2|= zpKWb))>rt?bjy; zbET=s|B$k`zx#|9t5YiqO=|n6r6wz8Ovo>9m~==T(pwbru1`;Y(9`qn&|%hC&#PGE zX4lUd-+w3_XMJt_86Q&W%rskW>}-&ajHOv!{J9oBZ>CF3>P>eCRnMMnO;3NZ$Yx@% z*{22zpH6bxkEG7|jNdVE0Zpe=U=v4 zuvgB%?9t)-Yio4)QM9+*x7sl>Z1=KgYb)^%=2d&g_6EEJin6-$g@cvyb8U9>(?1iUp}Vt`H;HWQ>v)L?Xp{3u=6VWdlpj?g9A zI$a_`rz;KH?-r^1wr82GH>an)E?16vyri3kCvs_T>g~@AlzWcx%qZ8-468|(mun#pcm=fe(1rj)ghUYd3jwp|3%CU9 zT8tPf$1Gr%(vnHD9sKp|wHj2_wBDXCG(EdfUg^tM8XlmIg80KAdLUqNI1oHmgt1>2 zE6)xDzOp`e1&gB)>_A|LftYBXn|kzJpV&k_V$!uFcG4a4iEWFE`JQQ8dDW5O+94Kf z3wnEcB1>3=hMcQHqfRsl!5%`xFU$-FOrE(WDjQ6s!SlM8>y4i}fwgVf-AJBn;6Z1g_0 z@~fsK7dI!qcQ)(#J9m6~Cq2D0C*E#hFSlC)GP@-pvs(h*+HQ#fy4}KNtZHxTjztY- zw?ux_ZefSfZi&$myCvGX-4Y49-4YegsRyq5!r4>7jw2ILYT18u@RV3)N+OWO7h^DAr z+ZX+7mwjjM9{l}{Kd-Yi{`(t$#E*wFm(uHYQ=c%`!2uE+uyY3x9H0Q116bF^;j3`w z81K(`Z#|D6VepU9Ta$ahL)Qxr4gMMYASFBCDvtHg@DpF-u8G@d0+X9OPDDAFF(c*RP*9H7!q=UkaKt>h6Bd{|VZ^gh4rV5!98qCzl!L{SQVy0t VCyW@Rqkn?j2xD(J&_F+V?@y?@!EgWo delta 3044 zcmchYUuYCp6vpqF(cR6~XcH5YXu2CiS}d5bo2Z21&PM43D`~gTP@yQ1K%)F=gjciJKx@U5*(Qi2KK(a=gq*vXMr1ADj8$u#*TQb%YL^r-W2Or zhZ5lZ7exOUbZ$A&_BUf8cJs?)iSU8CwkK+VpBOJY^8+-686i z53S(lTMgM5d)0W3C)jDq+UlXTGJp6N)A+*_QURsv646^H&*DSKaq+ zAx}MU>pJ=D>8R+dh9gkMu#WDSlk@hz6_DL; z@JQxEITbqv&q4PRi1ByeW%={(yGlH|3kg_A^l7>z6?P<@g{F&o5xO*0 z(M9Q_OGA8gsanycO-+|fqnp;s$m7o;H&6#>*ZkWH6!%`BpdoL6vCDsk zdqsZ=die(@N{xI{zBFo<8kbByFw`DQO|sPFsSYt+2~mD-C?p0BK{PN4%H$pQw8z^% zi3C#GQ#5z*`ESadMpbiAG*&r{BiRzs*aaKw+~c}$_BDN63rCjv4|hQl$NQL`b55(e z)QQD9ZjD=XOP)XN$ufKQi#16W7bfN&OB^i{>xF6ALv@l8PtEVxD9wo+K4dl8PtFZ43;N z?S@xm?PT{#0^mQ$^$iCb!ln~etj|ezV4FqR$50{1Z`l9Wb38NMH!yI%I)6y2{6UHN zL$=BvvX{sos?hm^+V|V~)19WO{6Xo<9~$DzAF5XQLz_B($aeE5jO$!InDS41MO;@e z;BTFWTj!@WV3G^mpC