From ef68e9b578e27a07f57b5df1890cf949bbc20eec Mon Sep 17 00:00:00 2001 From: Dmitry Skiba Date: Tue, 28 May 2024 23:50:44 +0000 Subject: [PATCH 1/6] Restrict kcompactd thread to middle/little cores. Bug: 340872453 Test: Confirmed kcompactd affinity with taskset -p Change-Id: I1cc92927dfc22d878819010aa2e9f01b5a3b8851 Signed-off-by: Dmitry Skiba --- conf/init.zuma.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index f98001b3..e7c5cb0b 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -740,6 +740,9 @@ on property:sys.boot_completed=1 # Set kswapd affinity write /sys/kernel/vendor_mm/kswapd_cpu_affinity ff + # Set kcompactd affinity + write /sys/kernel/vendor_mm/kcompactd_cpu_affinity ff + # Adjust watermark level write /proc/sys/vm/watermark_scale_factor 200 From 86e9f51a588348c58a1d08cf41b0e15ce47e4c6d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 29 May 2024 10:00:58 +0000 Subject: [PATCH 2/6] Switch makefile owners to MK_OWNERS Bug: 278167548 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:621df82f7af10ff85fa290af75c729f734cb2938) Merged-In: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e Change-Id: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 4bdbb973..e6ce5d01 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,2 @@ # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS From ed630d88aae6c8376bb6d7e0ddff2eda03033b97 Mon Sep 17 00:00:00 2001 From: jiangzining Date: Thu, 30 May 2024 15:20:22 +0800 Subject: [PATCH 3/6] [Scone] add BLUETOOTH_CONNECT to SCONE default permission MBA Approval: b/330640278 Bug: b/343608940 Test: Build and Flash Change-Id: I93c68928990985244993b0d66edcfc4e05a669be --- default-permissions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index fd29d6bc..5061ea46 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -75,6 +75,8 @@ + + From 721a8358c65e1c884364ac2a8b3d8cca84a82c18 Mon Sep 17 00:00:00 2001 From: Dmitry Skiba Date: Thu, 30 May 2024 00:50:32 +0000 Subject: [PATCH 4/6] Revert "Restrict kcompactd thread to middle/little cores." This reverts commit ef68e9b578e27a07f57b5df1890cf949bbc20eec. Reason for revert: avoid 24Q3 (will reland later) Bug: 340872453 Change-Id: Ia217c0e0f03035267a5b53e3dadaffc4e8febfd3 --- conf/init.zuma.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index e7c5cb0b..f98001b3 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -740,9 +740,6 @@ on property:sys.boot_completed=1 # Set kswapd affinity write /sys/kernel/vendor_mm/kswapd_cpu_affinity ff - # Set kcompactd affinity - write /sys/kernel/vendor_mm/kcompactd_cpu_affinity ff - # Adjust watermark level write /proc/sys/vm/watermark_scale_factor 200 From 5cdbd02063942c547921c3853c7e73e87671ae1a Mon Sep 17 00:00:00 2001 From: Madhav Iyengar Date: Thu, 9 May 2024 22:45:16 +0000 Subject: [PATCH 5/6] Add BT offload AOC services for Zuma Bug: 342415506 Test: Works with other CLs in topic. Change-Id: Iadf8bc7baedf0b798de673735a6925f60b992646 --- conf/ueventd.zuma.rc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc index 8564d994..e69f4672 100644 --- a/conf/ueventd.zuma.rc +++ b/conf/ueventd.zuma.rc @@ -159,6 +159,11 @@ /dev/acd-com.google.bt 0660 system system /dev/acd-com.google.bt.non_wake_up 0660 system system +# AoC Bluetooth Offload +/dev/acd-chre_bt_offload_ctl 0660 bluetooth bluetooth +/dev/acd-chre_bt_offload_data_tx 0220 bluetooth bluetooth +/dev/acd-chre_bt_offload_data_rx 0440 bluetooth bluetooth + # LWIS /dev/lwis* 0660 system system @@ -245,4 +250,4 @@ /sys/bus/aoc/devices/control udfps_get_disp_freq 0440 system system # USB Alt Modes -/sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025/typec/port0/port0-partner/port0-partner.* mode1/active 0664 system system \ No newline at end of file +/sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025/typec/port0/port0-partner/port0-partner.* mode1/active 0664 system system From 5978809ae71815193b8c0a7395f4e103ec269461 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Wed, 29 May 2024 11:05:39 -0700 Subject: [PATCH 6/6] Only copy EFS files if /data is on ext4 This reduces the amount of computation needed on critical boot path for F2FS devices. Boot time is expected to improve with this patch. Bug: 341216848 Test: boot device with ext4 and f2fs Change-Id: I7311a22a7bf9773d3909656d98cc578a43cb9477 --- conf/init.efs.16k.rc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc index cfe1e2aa..9e891680 100644 --- a/conf/init.efs.16k.rc +++ b/conf/init.efs.16k.rc @@ -6,7 +6,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data oneshot disabled -on post-fs-data && property:ro.boot.flash.locked=0 +on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4 mkdir /data/vendor/copied 0775 radio system restorecon_recursive /data/vendor/copied restorecon_recursive /mnt/vendor @@ -23,6 +23,11 @@ on post-fs-data && property:ro.boot.flash.locked=0 restorecon_recursive /data/vendor/ss setprop ro.vendor.persist.status mounted +on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=f2fs + mount_all /vendor/etc/fstab.efs + mount_all /vendor/etc/fstab.persist + setprop ro.vendor.persist.status mounted + on post-fs-data && property:ro.boot.flash.locked=1 mount_all /vendor/etc/fstab.efs mount_all /vendor/etc/fstab.persist