From 3e96ca1dcfef6685071f6b2137202d71a4122013 Mon Sep 17 00:00:00 2001 From: liangjlee Date: Thu, 27 Jun 2024 02:01:10 +0800 Subject: [PATCH 1/3] zuma: 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:48c79683bcac4b697cfa08949dfa4c4c7daed683) Merged-In: I370cd115855b43d890dd488de65572593b238efb Change-Id: I370cd115855b43d890dd488de65572593b238efb --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 542fdc9e..7814d623 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 9d0f747603ba99c0b5e48147539a316082efb00c Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 18 Jun 2024 15:55:03 -0700 Subject: [PATCH 2/3] Only copy efs files to /data if device is 16K page size Test: Boot device, test dev options Bug: 341216848 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:763984677a0630a2100b150c057c3d128a8f6c3d) Merged-In: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8 Change-Id: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8 --- conf/init.efs.16k.rc | 9 ++------- conf/init.efs.4k.rc | 2 +- conf/init.persist.rc | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc index 72ae9894..89e2b57f 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 && property:ro.fstype.data=ext4 +on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384 mkdir /data/vendor/copied 0775 radio system restorecon_recursive /data/vendor/copied exec_start copy_efs_files_to_data @@ -15,12 +15,7 @@ on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ex 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 +on late-fs && property:ro.boot.hardware.cpu.pagesize=4096 mount_all /vendor/etc/fstab.efs mount_all /vendor/etc/fstab.persist setprop ro.vendor.persist.status mounted diff --git a/conf/init.efs.4k.rc b/conf/init.efs.4k.rc index 506c7220..60a07a9c 100644 --- a/conf/init.efs.4k.rc +++ b/conf/init.efs.4k.rc @@ -1,4 +1,4 @@ -on post-fs-data +on late-fs mount_all /vendor/etc/fstab.efs mount_all /vendor/etc/fstab.persist setprop ro.vendor.persist.status mounted diff --git a/conf/init.persist.rc b/conf/init.persist.rc index 7852c78e..4a4c3ff3 100644 --- a/conf/init.persist.rc +++ b/conf/init.persist.rc @@ -31,6 +31,7 @@ on property:ro.vendor.persist.status=mounted mkdir /mnt/vendor/persist/data/tz 0700 system system mkdir /mnt/vendor/persist/touch 0770 system system +on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted # Proxy for Secure Storage mkdir /data/vendor/rebootescrow 0770 hsm hsm mkdir /data/vendor/ss 0770 root system From 2d0a2541016b078db8dcf3da3080d647f1ccc047 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 20 Jun 2024 21:04:40 -0700 Subject: [PATCH 3/3] Mount persist partition in early-init The graphics hal might need to access /persist early in the boot process. So mount persist early for 4K devices. Test: boot 4K device Bug: 338504890 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:73a68dd6d3794ed8a4e791f2c86c4e55a61ea2aa) Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 Change-Id: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 --- conf/init.efs.16k.rc | 8 +++++--- conf/init.efs.4k.rc | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conf/init.efs.16k.rc b/conf/init.efs.16k.rc index 89e2b57f..e39ac23f 100644 --- a/conf/init.efs.16k.rc +++ b/conf/init.efs.16k.rc @@ -15,8 +15,10 @@ on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384 restorecon_recursive /data/vendor/ss setprop ro.vendor.persist.status mounted -on late-fs && property:ro.boot.hardware.cpu.pagesize=4096 - mount_all /vendor/etc/fstab.efs - mount_all /vendor/etc/fstab.persist +on early-init && property:ro.boot.hardware.cpu.pagesize=4096 + mount_all /vendor/etc/fstab.persist --early setprop ro.vendor.persist.status mounted +on late-fs && property:ro.boot.hardware.cpu.pagesize=4096 + mount_all /vendor/etc/fstab.efs --early + diff --git a/conf/init.efs.4k.rc b/conf/init.efs.4k.rc index 60a07a9c..8b48bdfb 100644 --- a/conf/init.efs.4k.rc +++ b/conf/init.efs.4k.rc @@ -1,4 +1,6 @@ -on late-fs - mount_all /vendor/etc/fstab.efs - mount_all /vendor/etc/fstab.persist +on early-init + mount_all /vendor/etc/fstab.persist --early setprop ro.vendor.persist.status mounted + +on late-fs + mount_all /vendor/etc/fstab.efs --early