From 507675bc2c7738f067b5b410cfeb5c7c9ad1dade Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:56:25 -0700 Subject: [PATCH 1/8] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: Ibb66f97523545a2228c443aa8a08d1d853ed0ccd --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 69a1bcdd..5728c90b 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,4 @@ - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.boot IBootControl/default From e739e3b25408b6ea1823321ef1efc54cd9427a25 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 29 Aug 2024 14:32:33 +0000 Subject: [PATCH 2/8] Restore preferred_idle_mask to the default setting The preferred_idle_mask is changed during boot time, but it does not restore to the default setitng as in powerhint, so some node may keep the wrong value when framework restarts. Bug: 248621289 Test: build pass Flag: NONE init rc file change does not support flags Change-Id: I892b99b79ff2dd9c02cc874026b43b06bded6f59 --- conf/init.zuma.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index 8bc0b76d..a5005e94 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -742,9 +742,9 @@ on property:sys.boot_completed=1 write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1 # Restore prefer idle - write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x1ff - write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x1ff - write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x1ff + write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff + write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0xff + write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0xff write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0x1ff write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0x1ff write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0x1ff From 7d3cb7808cdb3ce8caac7d583626396fc809bcbe Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Tue, 27 Aug 2024 19:06:28 +0800 Subject: [PATCH 3/8] Control GoogleDialer built from zuma/proprietary/GoogleDialer For PDK build, the "vendor/unbundled_google" path doesn't exist. "GoogleDialer" will be built from vendor/google_devices/zuma/proprietary/GoogleDialer. Flag: EXEMPT bugfix Bug: 358012156 Test: export USES_GOOGLE_DIALER_CARRIER_SETTINGS=true; m GoogleDialer Change-Id: If2aab058f23cebc5a25862c69deda508f5f9c37e --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index 2e3f7712..a5b161c4 100644 --- a/device.mk +++ b/device.mk @@ -241,6 +241,8 @@ $(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true) ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) USE_GOOGLE_DIALER := true USE_GOOGLE_CARRIER_SETTINGS := true +# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true" +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zuma/proprietary/GoogleDialer endif ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) From 75edad5f451a33015483bafd747fa9f12cc327dc Mon Sep 17 00:00:00 2001 From: kellyhung Date: Fri, 23 Aug 2024 13:07:30 +0800 Subject: [PATCH 4/8] Add soong config use_google_qns in device/google/zuma/device.mk Bug: 360757079 Test: lunch r11-trunk_staging-userdebug; m grilservice Flag: EXEMPT bugfix Change-Id: Id783f65e12bc93d7db308d15b8440e6ea5007906 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 2e3f7712..71a9da30 100644 --- a/device.mk +++ b/device.mk @@ -232,6 +232,7 @@ USE_LASSEN_OEMHOOK := true ifneq ($(BOARD_WITHOUT_RADIO),true) $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril + $(call soong_config_set,grilservice,use_google_qns,true) endif # Use for GRIL From 6aabc9bd28d12250d38cdc2ee6d7695d34a659a5 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Mon, 19 Aug 2024 16:19:20 +0800 Subject: [PATCH 5/8] Control the "init_dpm.sh" to be built in zuma devices Flag: EXEMPT bugfix Bug: 360757643 Test: lunch husky-trunk_staging-eng && m init_dpm.sh Change-Id: Ie9822ca65d875c120bc38707aee54353aac5a8b5 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 71a9da30..c8fb9766 100644 --- a/device.mk +++ b/device.mk @@ -80,6 +80,7 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/zuma \ device/google/zuma/powerstats \ vendor/google_devices/common/chre/host/hal \ + vendor/google_devices/zuma/proprietary/debugpolicy \ vendor/google/whitechapel/tools \ vendor/google/interfaces \ vendor/google_nos/host/android \ From 20b924373fa7ed0540e8a5a48d27ed6495b44a4e Mon Sep 17 00:00:00 2001 From: Charlie Yang Date: Wed, 4 Sep 2024 11:02:52 +0000 Subject: [PATCH 6/8] Revert "Add soong config use_google_qns in device/google/zuma/de..." Revert submission 28947244-grilservice Reason for revert: b/363911795 Reverted changes: /q/submissionid:28947244-grilservice Change-Id: Iec8b16c4322a6e1a245c4bca22802ab29fe042a5 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 71a9da30..2e3f7712 100644 --- a/device.mk +++ b/device.mk @@ -232,7 +232,6 @@ USE_LASSEN_OEMHOOK := true ifneq ($(BOARD_WITHOUT_RADIO),true) $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril - $(call soong_config_set,grilservice,use_google_qns,true) endif # Use for GRIL From 5c936367086f55cd8a31d4c6584ef283283d9334 Mon Sep 17 00:00:00 2001 From: carmenyip Date: Tue, 27 Aug 2024 08:18:41 +0000 Subject: [PATCH 7/8] extended_log: update directory permissions for zuma Bug: 336638376 Test: $ cd data/vendor/radio $ ls -la Flag: NONE changing directory permissions only Change-Id: I89d003f286868fa2a593aa627e8d89a721395d79 --- conf/init.zuma.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index a5005e94..55f764e3 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -394,7 +394,7 @@ on post-fs-data mkdir /data/vendor/radio/logs/always-on 777 system radio # Modem extended log folder - mkdir /data/vendor/radio/extended_logs 0770 radio system + mkdir /data/vendor/radio/extended_logs 0771 radio system # Log Mask Library Mask storage paths mkdir /data/vendor/radio/log_masks 777 system system From 87bf601c9cd6c55b45a1c00f0b61aab37e1de077 Mon Sep 17 00:00:00 2001 From: Ocean Chen Date: Wed, 4 Sep 2024 16:00:25 +0800 Subject: [PATCH 8/8] Switch from the BFQ to the mq-deadline I/O scheduler The mq-deadline I/O scheduler is more stable than BFQ. Additionally, the boot time is shorter with the mq-deadline I/O scheduler. It only changes the scheduler on new kernel. Bug: 186902601 Test: forrest build Change-Id: I51605b32afb4340d416fe4923570bb3f4af24ab8 Signed-off-by: Ocean Chen --- conf/init.zuma.rc | 5 +---- device.mk | 8 ++++++++ storage/5.15/init.zuma.storage.rc | 3 +++ storage/6.1/init.zuma.storage.rc | 2 ++ 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 storage/5.15/init.zuma.storage.rc create mode 100644 storage/6.1/init.zuma.storage.rc diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index f0cbf01c..dfa42b3e 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -1,3 +1,4 @@ +import /vendor/etc/init/hw/init.zuma.storage.rc import /vendor/etc/init/hw/init.zuma.usb.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc @@ -15,10 +16,6 @@ on init # Disable util-awareness for mids and bigs write /proc/vendor_sched/teo_util_threshold "2 1024 1024" - # Boot time fs tuning - write /sys/block/sda/queue/scheduler bfq - write /sys/block/sda/queue/iosched/slice_idle 0 - chown system system /proc/vendor_sched/groups/bg/set_task_group chown system system /proc/vendor_sched/groups/cam/set_task_group chown system system /proc/vendor_sched/groups/fg/set_task_group diff --git a/device.mk b/device.mk index 542fdc9e..e31c0d39 100644 --- a/device.mk +++ b/device.mk @@ -380,6 +380,14 @@ PRODUCT_COPY_FILES += \ device/google/zuma/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc endif +ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION))) +PRODUCT_COPY_FILES += \ + device/google/zuma/storage/5.15/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc +else +PRODUCT_COPY_FILES += \ + device/google/zuma/storage/6.1/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc +endif + # Recovery files PRODUCT_COPY_FILES += \ device/google/zuma/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc diff --git a/storage/5.15/init.zuma.storage.rc b/storage/5.15/init.zuma.storage.rc new file mode 100644 index 00000000..7df260de --- /dev/null +++ b/storage/5.15/init.zuma.storage.rc @@ -0,0 +1,3 @@ +on init + write /sys/block/sda/queue/scheduler bfq + write /sys/block/sda/queue/iosched/slice_idle 0 \ No newline at end of file diff --git a/storage/6.1/init.zuma.storage.rc b/storage/6.1/init.zuma.storage.rc new file mode 100644 index 00000000..3d88bb69 --- /dev/null +++ b/storage/6.1/init.zuma.storage.rc @@ -0,0 +1,2 @@ +on init + write /sys/block/sda/queue/scheduler mq-deadline \ No newline at end of file