From 9c1848090b7d2e600254dd4ff3039631a5486996 Mon Sep 17 00:00:00 2001 From: Achigo Liu Date: Wed, 17 Apr 2024 09:35:40 +0000 Subject: [PATCH 01/12] Revert "Move tasks from cpuset root group to system group" Revert submission 26931570-cpuset_system_group Reason for revert: b/335346990 suspend/resume ramdump or black screen Reverted changes: /q/submissionid:26931570-cpuset_system_group (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0a451d4f25b23fa1e12386c95e39de675e4dc66) Merged-In: I41b3eaeddba8725defa742c5bd4c5377ac3a33fe Change-Id: I41b3eaeddba8725defa742c5bd4c5377ac3a33fe --- conf/init.zumapro.soc.rc | 15 --------------- task_profiles.json | 13 ------------- 2 files changed, 28 deletions(-) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index b53139c..52205a8 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -1,16 +1,4 @@ on init - # Move cpuset root group to system group - mkdir /dev/cpuset/system - copy /dev/cpuset/cpus /dev/cpuset/system/cpus - copy /dev/cpuset/mems /dev/cpuset/system/mems - chown system system /dev/cpuset/system - chown system system /dev/cpuset/system/tasks - chown system system /dev/cpuset/system/cgroup.procs - chmod 0664 /dev/cpuset/system/tasks - chmod 0664 /dev/cpuset/system/cgroup.procs - - copy_per_line /dev/cpuset/tasks /dev/cpuset/system/tasks - chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency @@ -162,9 +150,6 @@ on property:init.svc.vendor.charger=running write /sys/devices/system/cpu/cpu6/online 0 on property:sys.boot_completed=1 - # Move remaining tasks - copy_per_line /dev/cpuset/tasks /dev/cpuset/system/tasks - # Set kswapd affinity write /sys/kernel/vendor_mm/kswapd_cpu_affinity 7f diff --git a/task_profiles.json b/task_profiles.json index a16c507..732ccd1 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -1,18 +1,5 @@ { "Profiles": [ - { - "Name": "ProcessCapacityNormal", - "Actions": [ - { - "Name": "JoinCgroup", - "Params": - { - "Controller": "cpuset", - "Path": "system" - } - } - ] - }, { "Name": "MaxPerformance", "Actions": [ From d2b04fb9352c85619daf5ccd76011336310bc811 Mon Sep 17 00:00:00 2001 From: liangjlee Date: Thu, 27 Jun 2024 02:03:46 +0800 Subject: [PATCH 02/12] zumapro: Include power/power.mk Bug: 331612600 Flag: EXEMPT (bug 337358613) Signed-off-by: liangjlee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b56737bc8bdcbb776185b452aab99ed54631fa00) Merged-In: I219168dd67835647fc4fc0a2f35484b634b94b8f Change-Id: I219168dd67835647fc4fc0a2f35484b634b94b8f --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 3389983..dc800c7 100644 --- a/device.mk +++ b/device.mk @@ -26,6 +26,7 @@ include device/google/gs-common/storage/storage.mk include device/google/gs-common/thermal/dump/thermal.mk include device/google/gs-common/thermal/thermal_hal/device.mk include device/google/gs-common/performance/perf.mk +include device/google/gs-common/power/power.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/soc/freq.mk include device/google/gs-common/gps/dump/log.mk From 274f916ac55f61da1f16922f92292bb77e366989 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Thu, 27 Jun 2024 07:47:05 +0000 Subject: [PATCH 03/12] zumapro: update AVC, mpeg4 SW decoder performance point for 24Q3 Flag: EXEMPT bugfix Bug: 349265046 Test: MctsMediaDecoderTestCases android.media.decoder.cts.VideoDecoderPerfTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34e36d4c11553f9bb9345ca80e046787636eccd3) Merged-In: Ib4afe631d4de39380d69cddeb652b3f7093ae577 Change-Id: Ib4afe631d4de39380d69cddeb652b3f7093ae577 --- media_codecs_performance_c2.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 8e397ed..d72a962 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -115,13 +115,13 @@ - + - + - + - + @@ -135,9 +135,9 @@ - - - + + + From c705d6b6944497be5457526fac3c6e7c8d77b4af Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Tue, 2 Jul 2024 06:13:40 +0000 Subject: [PATCH 04/12] Disable modemml-tflite-service The service is causing CTS test failure as it has Kotlin files which are not allowed for system services. It's safe to disable the service temporarily as we don't have any user depending on it for now. Bug: 349263931 Test: Manually flashed device with go/ab/P76995945, no errors observed Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:62e82d5678811a44b2803b1d8c1f132cea148335) Merged-In: I087a147d6b111c5ea1e89a3ea48961adef733c57 Change-Id: I087a147d6b111c5ea1e89a3ea48961adef733c57 --- device.mk | 23 ++++++++----------- .../base/core/res/res/values/config.xml | 5 ++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/device.mk b/device.mk index dc800c7..d0097dc 100644 --- a/device.mk +++ b/device.mk @@ -228,21 +228,18 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA # modem_ml_svc_sit daemon PRODUCT_PACKAGES += modem_ml_svc_sit -ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) -# Modem ML TFLite service. -PRODUCT_PACKAGES += modemml-tflite-service \ - libtensorflowlite_jni +# TODO: b/350624523 - Add back modem ML TFLite service after it is ready. +# ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) +# # Modem ML TFLite service. +# PRODUCT_PACKAGES += modemml-tflite-service \ +# libtensorflowlite_jni -# Allow TFLite service modules to be installed to the system partition -PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ - system/etc/vintf/manifest/modemml_tflite_service.xml \ - system/framework/modemml-tflite-service.jar \ - system/framework/oat/arm64/modemml-tflite-service.odex \ - system/framework/oat/arm64/modemml-tflite-service.vdex \ - system/lib64/libtensorflowlite_jni.so +# # Allow TFLite service modules to be installed to the system partition +# PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ +# system/lib64/libtensorflowlite_jni.so -PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service -endif +# PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service +# endif # modem ML models configs ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 1ed30fa..f6b7439 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -304,9 +304,10 @@ - + + 100% From 8458b558d72d3f72336242823217a4708f4a419f Mon Sep 17 00:00:00 2001 From: Tim Lin Date: Fri, 28 Jun 2024 15:53:38 +0000 Subject: [PATCH 05/12] Include ril.mk after DEVICE_MANIFEST_FILE is reset Bug: 348631842 Flag: EXEMPT bugfix Test: check carrier ID property is set correctly (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e116a1fba401aa5f9e367ebcaecbe56f38316510) Merged-In: I40160c14f65d5193962dd3f1e2862d129c8404b6 Change-Id: I40160c14f65d5193962dd3f1e2862d129c8404b6 --- device.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index d0097dc..04981c5 100644 --- a/device.mk +++ b/device.mk @@ -275,11 +275,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk -# RIL extension service -ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) -include device/google/gs-common/pixel_ril/ril.mk -endif - # Use Lassen specifc Shared Modem Platform SHARED_MODEM_PLATFORM_VENDOR := lassen @@ -1207,6 +1202,13 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk # UFS: the script is used to select the corresponding firmware to run FFU. PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh +ifneq ($(BOARD_WITHOUT_RADIO),true) +# RIL extension service +ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) +include device/google/gs-common/pixel_ril/ril.mk +endif +endif + SUPPORT_VENDOR_SATELLITE_SERVICE := true # Telephony satellite geofence data file From 25a7e49fc28afd8ce877737f9a1b934350556860 Mon Sep 17 00:00:00 2001 From: Steve Statia Date: Fri, 28 Jun 2024 17:55:11 +0000 Subject: [PATCH 06/12] Fix to hide Display over other apps permission setting for the Scone application. Flag: EXEMPT bugfix Bug: 349195999 Test: manually testing that the setting is removed from Adaptive Connectivity Services advanced settings page. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:236eb6a6d40d73f32f28cfe386ac24109cbafd2f) Merged-In: I87c284411e63225fac9138b5f4f0578a0acd7212 Change-Id: I87c284411e63225fac9138b5f4f0578a0acd7212 --- .../apps/Settings/res/values/arrays.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 overlay/packages/apps/Settings/res/values/arrays.xml diff --git a/overlay/packages/apps/Settings/res/values/arrays.xml b/overlay/packages/apps/Settings/res/values/arrays.xml new file mode 100644 index 0000000..de6fd5c --- /dev/null +++ b/overlay/packages/apps/Settings/res/values/arrays.xml @@ -0,0 +1,22 @@ + + + + + + + com.google.android.apps.scone + + \ No newline at end of file From 1f282b39001cd83501026e09c9c695ba17c560b1 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 24 Apr 2024 00:55:42 +0000 Subject: [PATCH 07/12] init.zumapro.soc.rc: Disable rampup for most groups except top-app and adpf When auto margins are enabled busy tasks will get more appropriate and coherent rampup time when they get busy. But for most groups, this can lead to unnecessary power consumption. Disable it except for top-app, sf and camera group. For ADPF, a faster rampup is desired as these tasks are usually sensitive to all sources of latencies. So try to give them more performance faster. Bug: 336169796 Test: PTE A/B test Signed-off-by: Qais Yousef (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c364c7aba08e3b5fc5aecf0c0e673d8d8544e92) Merged-In: Ieb6f3de811d30b62f06809e73dc7df83c87d45d0 Change-Id: Ieb6f3de811d30b62f06809e73dc7df83c87d45d0 --- conf/init.zumapro.soc.rc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 2c6d4d5..919d396 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -28,6 +28,20 @@ on init write /proc/vendor_sched/groups/sys/uclamp_min 190 write /proc/vendor_sched/groups/sys/prefer_idle 1 + write /proc/vendor_sched/groups/bg/rampup_multiplier 0 + write /proc/vendor_sched/groups/cam/rampup_multiplier 1 + write /proc/vendor_sched/groups/cam_power/rampup_multiplier 1 + write /proc/vendor_sched/groups/dex2oat/rampup_multiplier 0 + write /proc/vendor_sched/groups/fg/rampup_multiplier 0 + write /proc/vendor_sched/groups/nnapi/rampup_multiplier 0 + write /proc/vendor_sched/groups/ota/rampup_multiplier 0 + write /proc/vendor_sched/groups/rt/rampup_multiplier 0 + write /proc/vendor_sched/groups/sf/rampup_multiplier 1 + write /proc/vendor_sched/groups/sys/rampup_multiplier 0 + write /proc/vendor_sched/groups/sys_bg/rampup_multiplier 0 + write /proc/vendor_sched/groups/ta/rampup_multiplier 1 + write /proc/vendor_sched/adpf_rampup_multiplier 2 + # governor setting write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500 From 7798172e8f61146f9bbab05ae34fb041106cd2be Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Tue, 23 Apr 2024 23:11:34 +0000 Subject: [PATCH 08/12] init.zumapro.soc.rc: Match sched_pixel settings to powerhint's We now default to 500us down_rate_limit_us. Boot with these defaults too. powerhint can still modify these to whatever setting required by the specific hint. Only difference is that down_rate_limit_scale_pow for little is now the default 1 instead of 2. Bug: 336169796 Test: PTE A/B test Signed-off-by: Qais Yousef (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4336a77fe65de3becebbe06c91adf9a743a3e300) Merged-In: I4f0712faaad87afbb0fc7627c45a61081f91e1e6 Change-Id: I4f0712faaad87afbb0fc7627c45a61081f91e1e6 --- conf/init.zumapro.soc.rc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 919d396..ac9c316 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -45,14 +45,13 @@ on init # governor setting write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 5000 - write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_scale_pow 2 + write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 500 write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 20000 + write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 500 write /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/down_rate_limit_us 20000 + write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/down_rate_limit_us 500 # memlat cpuidle awareness setting # FIXME(b/301212469) these nodes missing on zuma pro From eba9ea1ebbb63f2d1802908c02f6b2a8a278b4a6 Mon Sep 17 00:00:00 2001 From: Jeremy DeHaan Date: Wed, 12 Jun 2024 16:32:16 -0700 Subject: [PATCH 09/12] zumapro: HWC access to panel frame_rate node Flag: EXEMPT bugfix Bug: 346461765 Signed-off-by: Jeremy DeHaan (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b2427428e58fbd59bd5cbb484be4badf62a3fa19) Merged-In: I2cdbd8126e5684891b6424d262aa505d2aa641b7 Change-Id: I2cdbd8126e5684891b6424d262aa505d2aa641b7 --- conf/init.zumapro.board.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 9923903..a0daa4f 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -408,6 +408,7 @@ on fs chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_rate_hz chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_option chown system system /sys/devices/platform/exynos-drm/primary-panel/power_state + chown system system /sys/devices/platform/exynos-drm/primary-panel/frame_rate chown system system /sys/module/drm/parameters/vblankoffdelay chown system system /sys/module/drm/parameters/debug chown system system /sys/class/dqe0/atc/ambient_light From 1f04d188365bdaba6da5e71e3229150f9a1c2134 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Thu, 18 Jul 2024 06:47:07 +0000 Subject: [PATCH 10/12] Revert "zumapro: HWC access to panel frame_rate node" This reverts commit eba9ea1ebbb63f2d1802908c02f6b2a8a278b4a6. Reason for revert: build break (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cee98f8a2aaa7708ba41bfdeae6e029c299fed60) Merged-In: Ia66bb6862384fc94901a19526249657a25414fda Change-Id: Ia66bb6862384fc94901a19526249657a25414fda --- conf/init.zumapro.board.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index a0daa4f..9923903 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -408,7 +408,6 @@ on fs chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_rate_hz chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_option chown system system /sys/devices/platform/exynos-drm/primary-panel/power_state - chown system system /sys/devices/platform/exynos-drm/primary-panel/frame_rate chown system system /sys/module/drm/parameters/vblankoffdelay chown system system /sys/module/drm/parameters/debug chown system system /sys/class/dqe0/atc/ambient_light From 9c87f41357037f532220377f8205a03a8da5a3be Mon Sep 17 00:00:00 2001 From: Jeremy DeHaan Date: Wed, 12 Jun 2024 16:32:16 -0700 Subject: [PATCH 11/12] zumapro: HWC access to panel frame_rate node Flag: EXEMPT bugfix Bug: 346461765 Signed-off-by: Jeremy DeHaan (cherry picked from commit b2427428e58fbd59bd5cbb484be4badf62a3fa19) (cherry picked from commit 3e8967723fb0f812aee791911cd1f0c181ee9e3d) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:85254d6dee1d216dde7b1a23fc76594c422fcecd) Merged-In: I2cdbd8126e5684891b6424d262aa505d2aa641b7 Change-Id: I2cdbd8126e5684891b6424d262aa505d2aa641b7 --- conf/init.zumapro.board.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 9923903..a0daa4f 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -408,6 +408,7 @@ on fs chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_rate_hz chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_option chown system system /sys/devices/platform/exynos-drm/primary-panel/power_state + chown system system /sys/devices/platform/exynos-drm/primary-panel/frame_rate chown system system /sys/module/drm/parameters/vblankoffdelay chown system system /sys/module/drm/parameters/debug chown system system /sys/class/dqe0/atc/ambient_light From ced94e11979ea9680d9fd5c8094a5163c644fcfd Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Mon, 29 Jul 2024 18:19:52 +0000 Subject: [PATCH 12/12] dump_power: add max77779sp dump path Bug: 347452474 Test: adb bugreport verify ok Flag: EXEMPT bugfix Change-Id: I69483cd7afd121c4d127d234685ff928bbf37b4c Signed-off-by: Spade Lee --- dumpstate/dump_power.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 0c54118..5030405 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -543,6 +543,15 @@ void dumpChgUserDebug() { } } +void dumpScratchpad() { + const char *title = "max77779sp registers dump"; + const char *file = "/sys/devices/platform/108d0000.hsi2c/i2c-6/6-0060/registers_dump"; + + if (isValidFile(file)) { + dumpFileContent(title, file); + } +} + void dumpBatteryEeprom() { const char *title = "Battery EEPROM"; const char *files[] { @@ -1102,6 +1111,7 @@ int main() { dumpBatteryDefend(); dumpChg(); dumpChgUserDebug(); + dumpScratchpad(); dumpBatteryEeprom(); dumpChargerStats(); dumpWlcLogs();