From b4922950d49d6873f062e46d3078444b4382fc43 Mon Sep 17 00:00:00 2001 From: Boon Jun Date: Thu, 13 Apr 2023 06:21:01 +0000 Subject: [PATCH 1/8] Use tof sensor codename Bug: 272224875 Test: Run CameraCTS/PTS/unittests Change-Id: I229f3eb0c1f5bd9ae64fba8c7b3344f1a47afa80 --- conf/init.zuma.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index 6c3e2aea..a95d2705 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -404,8 +404,8 @@ on post-fs-data restorecon /sys/kernel/debug/tracing/trace_marker # ranging sensor - chown system system /dev/stmvl53l1_ranging - chmod 0660 /dev/stmvl53l1_ranging + chown system system /dev/ispolin_ranging + chmod 0660 /dev/ispolin_ranging # Factory calibration files chmod 0771 /mnt/vendor/persist/camera From fbaad56876b7a0b1ea2f962e4b3e1216065b76b1 Mon Sep 17 00:00:00 2001 From: Hiroshi Akiyama Date: Fri, 21 Apr 2023 18:24:19 +0000 Subject: [PATCH 2/8] pixelstats: Add BCL IRQ duration stats sysfs node for zuma Eldar ID: 317131386 Bug: 275129173 Test: cmd stats print-logs, then adb logcat | grep Change-Id: Ifb8df1d17bc2e7b299acbfab8db95de06c55c6c2 Signed-off-by: Hiroshi Akiyama --- pixelstats/service.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index cd09dc1b..783b80d0 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -44,6 +44,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { .CodecPath = "/sys/devices/platform/audiometrics/codec_state", .EEPROMPath = "/dev/battery_history", .MitigationPath = "/sys/devices/virtual/pmic/mitigation", + .MitigationDurationPath = "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt", .BrownoutReasonProp = "vendor.brownout_reason", .BrownoutLogPath = "/data/vendor/mitigation/lastmeal.txt", .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp", From dad4c28d12a2df3268a5cb64a1ad765e12c861b5 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Wed, 26 Apr 2023 16:01:42 +0800 Subject: [PATCH 3/8] audio: set CCA to be enable by default Bug: 279697074 Test: build pass Change-Id: I121e5f1ff54780d69653bea7b54acf5a001baa5a Signed-off-by: Carter Hsu --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index d36b2fd6..5586f8d1 100644 --- a/device.mk +++ b/device.mk @@ -995,7 +995,7 @@ $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) ## Audio properties ##Audio Vendor property PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.cca.enabled=false \ + persist.vendor.audio.cca.enabled=true \ persist.vendor.audio.cca.unsupported=false PRODUCT_PROPERTY_OVERRIDES += \ From df90f6f80125b416ba3d5d2d0cb3df10c1f51360 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 6 Apr 2023 15:18:28 +0000 Subject: [PATCH 4/8] Define mali configuration path explicitly This avoids mali trying to read `/data/data/com.mali.testjava` for its debug config. Bug: 205779871 Bug: 264489188 Test: manual - reboot device and check the absence of AVC denials (cherry picked from commit 7038bae086b572038ddb3d7b203b34b9519dd0fe) Merged-In: I42051ae2c10c6d4fa7c1f9d5f485ff5471e6a287 Change-Id: I42051ae2c10c6d4fa7c1f9d5f485ff5471e6a287 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index d36b2fd6..c4107d42 100644 --- a/device.mk +++ b/device.mk @@ -251,6 +251,8 @@ endif # Mali Configuration Properties # b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2 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_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From 56a3c0faa5f014e5d528f12de5d14a1d66404046 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 27 Apr 2023 10:40:18 +0800 Subject: [PATCH 5/8] odpm: Replace MMWAVE rail with AUR rail for SUB6 only sku Bug: 269218895 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: Ib47c6d383a70984e863abae04ee98d254a120581 Signed-off-by: Darren Hsu --- conf/init.zuma.rc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index a5a4301a..57b5e364 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -918,9 +918,22 @@ on post-fs-data mkdir /data/vendor/bluetooth 0770 bluetooth system # ODPM -on fs - chown system system /sys/devices/platform/acpm_mfd_bus@18100000/i2c-7/i2c-s2mpg12mfd/s2mpg12-meter/s2mpg12-odpm/iio\:device0/enabled_rails - chown system system /sys/devices/platform/acpm_mfd_bus@18110000/i2c-8/i2c-s2mpg13mfd/s2mpg13-meter/s2mpg13-odpm/iio\:device1/enabled_rails +on early-boot && property:ro.boot.hardware.sku=GC3VE + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=GZPF0 + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=GPJ41 + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=G9BQD + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=GKV4X + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=G6GPR + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=G576D + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" +on early-boot && property:ro.boot.hardware.sku=GGH2X + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" on post-fs-data mkdir /data/vendor/powerstats 0771 system system From 5a18a1b381e75880fc8adc6d92fcab98e8323ff3 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 27 Apr 2023 15:31:53 +0000 Subject: [PATCH 6/8] Set bg group throttle to 30 percent of cpu capacity Also remove old settings. Bug: 201260585 Test: value set as expected Change-Id: Icbdd5e18b128f1c8a9e88a5c147353ef7a55ef48 --- conf/init.zuma.rc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index 0b98cce2..a9e0a799 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -741,19 +741,9 @@ on property:sys.boot_completed=1 write /proc/vendor_sched/ta_uclamp_min 1 write /proc/vendor_sched/fg_uclamp_min 0 write /proc/vendor_sched/sys_prefer_idle 0 - # cfs_rq clamp is using tg->uclamp setting - # align it with the vendor_group setting - write /proc/vendor_sched/bg_uclamp_max 512 - write /dev/cpuctl/background/cpu.uclamp.max 50 - write /proc/vendor_sched/bg_group_throttle 512 - write /proc/vendor_sched/sysbg_uclamp_max 512 - write /dev/cpuctl/system-background/cpu.uclamp.max 50 - write /proc/vendor_sched/sysbg_group_throttle 512 - write /proc/vendor_sched/dex2oat_uclamp_max 615 - write /dev/cpuctl/dex2oat/cpu.uclamp.max 60 - write /proc/vendor_sched/dex2oat_group_throttle 615 - write /proc/vendor_sched/ota_uclamp_max 410 - write /proc/vendor_sched/ota_group_throttle 410 + + # Set bg group throttle + write /proc/vendor_sched/vug_bg_group_throttle 308 # Set PMU freq limit parameters write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2 From a2c60a3ec9438acf04a4be469d4a5f9aa3cac903 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 27 Apr 2023 15:34:02 +0000 Subject: [PATCH 7/8] Relax cpuset for OTA With vendor group throttling, we could relax the ota cpuset. Bug: 201260585 Test: cpuset changed as expected Change-Id: I4d719edf898ff0bfe8a2ba776ccd55f9ce423dfa --- task_profiles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task_profiles.json b/task_profiles.json index 4bcfe412..961857de 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -287,7 +287,7 @@ }, { "Name": "OtaProfiles", - "Profiles": [ "OtaPerformance", "ServiceCapacityLow", "LowIoPriority", "TimerSlackHigh" ] + "Profiles": [ "OtaPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ] } ] } From 3ac7a5285b03dd69ce147bc335598bcc0e7f548e Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Fri, 21 Apr 2023 17:39:28 +0000 Subject: [PATCH 8/8] Move Widevine drm to gs-common Bug: 277764729 Change-Id: Ibab8fdac0be251ef53d84d2c5cf90f57b9b64235 (cherry picked from commit 471630b25b1c9c7786c6af0c8c4c961f003b8d49) --- device.mk | 1 + widevine/device.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/device.mk b/device.mk index a26522e6..09894dfd 100644 --- a/device.mk +++ b/device.mk @@ -34,6 +34,7 @@ include device/google/gs-common/camera/dump.mk include device/google/gs-common/radio/dump.mk include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/umfw_stat/umfw_stat.mk +include device/google/gs-common/widevine/widevine.mk include device/google/zuma/dumpstate/item.mk diff --git a/widevine/device.mk b/widevine/device.mk index f91de716..90181bc2 100644 --- a/widevine/device.mk +++ b/widevine/device.mk @@ -1,6 +1 @@ -PRODUCT_PACKAGES += \ - android.hardware.drm-service.clearkey - --include vendor/widevine/libwvdrmengine/apex/device/device.mk - BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/widevine