From a528a2c7f9c7b13c791a9c9eae6c1b87ed015106 Mon Sep 17 00:00:00 2001 From: George Lee Date: Tue, 5 Mar 2024 00:36:35 +0000 Subject: [PATCH 01/14] bcl: Adjust GPU LIGHT clk divider ratio Set GPU LIGHT clk divider ratios to /2. Bug: 327700285 Test: Confirm no prints like: "28000000.mali: Ctx 8349_23 Group 0 CSG 3 CSI: 3" while running GFXBench under LIGHT MITIGATION Signed-off-by: George Lee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43d42739b57713f7e41df147e6372d1ccce6243f) Merged-In: I4b62b33c0b72e5a053f477943379727d58f7298e Change-Id: I4b62b33c0b72e5a053f477943379727d58f7298e --- conf/init.gs201.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index abc18c58..09898cbd 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -897,7 +897,7 @@ on property:vendor.brownout.mitigation.ready=1 write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0x80041c3 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c0 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0 #DFS - write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c1 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff041c3 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c3 #OCP write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385 #OCP write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1 #OCP From 3954e3a89a32f1290981e51a26814a04784f216c Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 20:06:04 -0800 Subject: [PATCH 02/14] Adding android.software.contextualsearch to gs-201 devices. Bug: 326143814 Test: Built and tested on device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e9e4f853a6847a55f2bedc8fc37c17f44c1fa743) Merged-In: Iad8cd8a859299a5a60e0bdc569f7da4756bb95eb Change-Id: Iad8cd8a859299a5a60e0bdc569f7da4756bb95eb --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 04585d5b..0aa5bd6c 100644 --- a/device.mk +++ b/device.mk @@ -259,6 +259,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ + frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml ifeq ($(USE_SWIFTSHADER),true) From 49634ee89567439488fcc2dac6bd9bca5d3f85d7 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 03/14] Revert "Add betterbug mk to gs201" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3f5c12abada31befa0d9f869bf6628d06ee05aa4) Merged-In: Id77188dd9f6f5acaed1506a9489f5d6f9874dde9 Change-Id: Id77188dd9f6f5acaed1506a9489f5d6f9874dde9 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 0aa5bd6c..42b007a1 100644 --- a/device.mk +++ b/device.mk @@ -37,7 +37,6 @@ include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk -include device/google/gs-common/betterbug/betterbug.mk ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 32333e15c9a2bf1b61636cef3c11743af628472b Mon Sep 17 00:00:00 2001 From: Vinay Kalia Date: Fri, 8 Mar 2024 20:30:40 +0000 Subject: [PATCH 04/14] gs201: bigocean: Enable width-height swap bug: 328331219 Test: android.mediav2.cts.CodecInfoTest#testResolutionSupport [29_video/av01_c2.google.av1.decoder] Signed-off-by: Vinay Kalia (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dbec97c34f276661a30dad532fd08114bb219b54) Merged-In: Ib57dbaf32c2198e755e123cd894514bce5fb212e Change-Id: Ib57dbaf32c2198e755e123cd894514bce5fb212e --- media_codecs_bo_c2.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml index 3a397263..187df342 100644 --- a/media_codecs_bo_c2.xml +++ b/media_codecs_bo_c2.xml @@ -30,6 +30,7 @@ + @@ -45,6 +46,7 @@ + From 8ba12e3caab5832d24ceed13fd559711148e0a09 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Sat, 25 May 2024 00:37:46 +0000 Subject: [PATCH 05/14] explicit 'user root' Bug: 340953047 Test: N/A Change-Id: I3cfa4844916973c12ed9cff54361070cc091551f --- conf/init.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 4c6da6df..f36b8662 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -889,6 +889,7 @@ service init_display /vendor/bin/init.display.sh # bugreport is triggered by holding down volume down, volume up and power service bugreport /system/bin/dumpstate -d -p -z class main + user root disabled oneshot keycodes 114 115 116 From 10cd38d16ea564aad6e936b594d1ad8eab21ea5e Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Wed, 5 Jun 2024 11:58:34 +0800 Subject: [PATCH 06/14] Make SUPPORT_MULTI_SIM recognizable in bp This commit establishes a soong config variable `sim_count` for easier converting Android.mk to Android.bp when dealing with multiple SIMs. Bug: 343823190 Test: presubmit Change-Id: Idbd52236b95e8d69516226a71a848d591f181d94 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index c11e291f..58396790 100644 --- a/device.mk +++ b/device.mk @@ -927,6 +927,7 @@ endif # Exynos RIL and telephony # Multi SIM(DSDS) SIM_COUNT := 2 +$(call soong_config_set,sim,sim_count,$(SIM_COUNT)) SUPPORT_MULTI_SIM := true # Support NR SUPPORT_NR := true From 0a14f4d4aabdf5ca09ce0c243d67b594dac0a2cd Mon Sep 17 00:00:00 2001 From: Utku Utkan Date: Wed, 5 Jun 2024 04:50:48 +0000 Subject: [PATCH 07/14] Remove ACCESS_FINE_LOCATION permission pregrant for PCS on G2 FLAG: EXEMPT Cleanup of obsolete permission pregrant Bug: 345021501 Test: m && flashall Change-Id: I856f2d84eedf70bfa007a66c141b09c1f3c2930a --- default-permissions.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/default-permissions.xml b/default-permissions.xml index a6476338..ecdbaf01 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -50,7 +50,6 @@ - From cab0d60115b3dd372749b213be4dee6a7dc2c25b Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Fri, 7 Jun 2024 13:06:05 +0000 Subject: [PATCH 08/14] switch over to use new storage read api instead of server_configurable_flags, this new read api lib will be needed for new codegened aconfig flag lib. Bug: 321077378 Test m and avd Change-Id: I908ccf51b59ef4f475d8680003cb4aec61bdd12c --- usb/usb/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 609af179..6b24cb57 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -56,6 +56,7 @@ cc_binary { "libbinder_ndk", "libprotobuf-cpp-lite", "server_configurable_flags", + "libaconfig_storage_read_api_cc", ], static_libs: [ "libpixelusb-aidl", From f3985dc52fa6bc7c41ac518231aadb5fa437fbda Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Thu, 23 May 2024 06:38:01 +0000 Subject: [PATCH 09/14] Update IDisplay to V12 Test: trigger test build Bug: 309897479 Change-Id: I86b6117e10249165b6c2b8c534b86cd7f3549fb0 Signed-off-by: Leo Chen --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 12755762..772c5e5a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -78,7 +78,7 @@ com.google.hardware.pixel.display - 11-12 + 12 IDisplay default From c3eec0f7de6f186af28773b64aa3a277a1c3548b Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 10 Jun 2024 17:25:22 +0000 Subject: [PATCH 10/14] gs201: build fingerprint dump Bug: 346450599 Test: adb bugreport Change-Id: I988649841bf915b9af12a1b628930dc0ee80f186 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 637d49ac..8508d894 100644 --- a/device.mk +++ b/device.mk @@ -41,6 +41,7 @@ include device/google/gs-common/betterbug/betterbug.mk ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif +include device/google/gs-common/fingerprint/fingerprint.mk TARGET_BOARD_PLATFORM := gs201 From 724b28eebf7c11bddcf9af0ea5689cdc8b177b63 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Wed, 12 Jun 2024 05:32:06 +0000 Subject: [PATCH 11/14] gs201: update c2.android.vp8.decoder performance point Align performance point with the Pixel family of devices. Bug: 343004271 Test: run cts -m MctsMediaDecoderTestCases -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: I06abe0d6d2387792a1492a4fd551549ca3bdfa49 Change-Id: Ib98ea9116e7280cd420502a2f1968e46faa26066 --- media_codecs_performance_c2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index f84e518a..78345dc1 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -145,7 +145,7 @@ - + From 76de5fed8dbf841c9c04abed461dce17c985568e Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Tue, 16 Apr 2024 12:56:12 +0100 Subject: [PATCH 12/14] Reapply "Enable Secretkeeper HAL service on gs201" (This reverts commit 9922a0fc1260, ag/26704327.) This requires that prebuilts on `main` have been updated to include the April updates to the Secretkeeper TA (which includes fixes needed to cope with larger and more realistic DICE chains). Relevant devices: - pantah - felix - lynx - tangorpro Bug: 291228655 Bug: 306364873 Bug: 341708664 Test: VtsSecretkeeperTargetTest on cheetah Flag: build.RELEASE_AVF_ENABLE_LLPVM_CHANGES Change-Id: I251a14221915fa8b2aaf3f1611c8c9f698596552 --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 8508d894..38add23a 100644 --- a/device.mk +++ b/device.mk @@ -83,6 +83,11 @@ PRODUCT_SOONG_NAMESPACES += \ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 +ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) + # Set the environment variable to enable the Secretkeeper HAL service. + SECRETKEEPER_ENABLED := true +endif + # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -256,7 +261,7 @@ PRODUCT_PACKAGES += \ PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.platform.config=/vendor/etc/mali/platform.config \ vendor.mali.debug.config=/vendor/etc/mali/debug.config \ - vendor.mali.base_protected_max_core_count=1 \ + vendor.mali.base_protected_max_core_count=1 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From d8fffffda43d6c6098a9f3ac84cf80670dabcbfe Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Wed, 12 Jun 2024 17:14:02 +0800 Subject: [PATCH 13/14] usb: Add retry on role switch Bug: 341996696 Change-Id: I8caa65288af1588d24fea4aa6c5768d45d69bbd5 Signed-off-by: Kyle Tso (cherry picked from commit ef5856a4474002cc35a51377adffddd4cb239796) --- usb/usb/Usb.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index cff00bda..da7eb423 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -602,6 +602,10 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role fp = fopen(filename.c_str(), "w"); if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); + if (ret == EAGAIN) { + std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ret = fputs(convertRoletoString(in_role).c_str(), fp); + } fclose(fp); if ((ret != EOF) && ReadFileToString(filename, &written)) { written = Trim(written); From cb51a640f4bf6dc36e263a89b3e5b6a16f0643cc Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Thu, 13 Jun 2024 16:54:37 +0800 Subject: [PATCH 14/14] usb: Log for retry on role switch Add a log for the retry. Also define the sleep time in the header file. Bug: 341996696 Change-Id: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78 Signed-off-by: Kyle Tso (cherry picked from commit d17fdff5f81cff76adaa75d50f26318be8048123) --- usb/usb/Usb.cpp | 3 ++- usb/usb/Usb.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index da7eb423..2c42b116 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -603,7 +603,8 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); if (ret == EAGAIN) { - std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS); + std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS)); ret = fputs(convertRoletoString(in_role).c_str(), fp); } fclose(fp); diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h index 779e7254..d6ed72e9 100644 --- a/usb/usb/Usb.h +++ b/usb/usb/Usb.h @@ -56,6 +56,8 @@ constexpr char kGadgetName[] = "11210000.dwc3"; #define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess" #define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled" +#define ROLE_SWAP_RETRY_MS 700 + struct Usb : public BnUsb { Usb();