From 06804cf82a584459124f2776e2e4c97c12af5de7 Mon Sep 17 00:00:00 2001 From: leonardian Date: Thu, 16 May 2024 07:34:33 +0000 Subject: [PATCH 001/117] conf: Enable access for braking time sysfs nodes Sysfs nodes: - braking_time_bank - braking_time_index - braking_time_ms Bug: 325121485 Test: Open sysfs nodes successfully during HAL init Change-Id: I15438c2cf2ebb4dbc0952f4c767904d5c73ffe02 Signed-off-by: leonardian --- conf/init.zumapro.board.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index dcee57a..2dcfd63 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -820,6 +820,9 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/9-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/9-0043/default/vibe_state chown system system /sys/bus/i2c/devices/9-0043/default/num_waves + chown system system /sys/bus/i2c/devices/9-0043/default/braking_time_bank + chown system system /sys/bus/i2c/devices/9-0043/default/braking_time_index + chown system system /sys/bus/i2c/devices/9-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/9-0043/default/f0_offset chown system system /sys/bus/i2c/devices/9-0043/default/owt_free_space chown system system /sys/bus/i2c/devices/9-0043/default/f0_comp_enable From 9c98f2c06ea2854e6c84bb826152517afa02cebe Mon Sep 17 00:00:00 2001 From: Wesley Lee Date: Fri, 19 Jan 2024 17:39:15 -0800 Subject: [PATCH 002/117] enable ZumaPro HDR editing Bug: 345301797 Change-Id: Ieb1684a9ad3426bc3240886b95adb0425c3c085d Signed-off-by: Wesley Lee --- media_codecs_bo_c2.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml index 443c27e..af97b43 100644 --- a/media_codecs_bo_c2.xml +++ b/media_codecs_bo_c2.xml @@ -65,6 +65,7 @@ + From f04b28dc410c819627a50522ba82563f87ce2097 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Wed, 12 Jun 2024 16:50:38 +0800 Subject: [PATCH 003/117] zumapro: video: change to use c2 "default" AIDL service Bug: 322920559 Change-Id: Ia2e6cac052bc0ee417e179f61804eada9ae87bf5 --- device.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 3389983..7037e12 100644 --- a/device.mk +++ b/device.mk @@ -399,6 +399,7 @@ PRODUCT_VENDOR_PROPERTIES += \ DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml +BOARD_USE_CODEC2_AIDL := V1 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ device/google/zumapro/manifest_media_aosp.xml @@ -874,12 +875,19 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \ PRODUCT_PROPERTY_OVERRIDES += \ - debug.stagefright.c2-poolmask=458752 \ debug.c2.use_dmabufheaps=1 \ media.c2.dmabuf.padding=512 \ debug.stagefright.ccodec_delayed_params=1 \ ro.vendor.gpu.dataspace=1 +ifneq ($(BOARD_USE_CODEC2_AIDL), ) +PRODUCT_PROPERTY_OVERRIDES += \ + debug.stagefright.c2-poolmask=1507328 +else +PRODUCT_PROPERTY_OVERRIDES += \ + debug.stagefright.c2-poolmask=458752 +endif + # Create input surface on the framework side PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.c2inputsurface=-1 \ From f1366bab96fd28170b77cc28dbca0448480ce605 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 17 May 2024 18:23:39 +0800 Subject: [PATCH 004/117] Move PRODUCT_SHIPPING_API_LEVEL to defined by device Bug: 312876454 Flag: EXEMPT refactor Change-Id: I872dbd5e262516a32a47397d8413dcfce18dd05a --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 3389983..f9a01c8 100644 --- a/device.mk +++ b/device.mk @@ -395,6 +395,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # GRAPHICS - GPU (end) # #################### +PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) + # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml @@ -419,8 +421,6 @@ DEVICE_MATRIX_FILE := \ DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay -PRODUCT_SHIPPING_API_LEVEL := 34 - # RKP VINTF -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk From 248f3538871a6602c6fc211b2c63915aebdce17d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 21 May 2024 18:20:12 +0800 Subject: [PATCH 005/117] Add manifest for VINTF target FCM level 202404 Target FCM level 202404 deprecated the following HALs: android.hardware.graphics.mapper Target FCM level 202404 requires the newer version of the following HALs: android.hardware.radio.config android.hardware.radio.data android.hardware.radio.messaging android.hardware.radio.modem android.hardware.radio.network android.hardware.radio.sim android.hardware.radio.voice Add the previous version of these HALs into the customized product FCM before ready to remove them from device manifest Bug: 312876454 Flag: EXEMPT NDK Change-Id: Ic9af791e7aa2027bf8d7ff9c39cf097323d7b68a --- device.mk | 16 +- device_framework_matrix_product_202404.xml | 264 +++++++++++++++++++++ manifest_202404.xml | 15 ++ 3 files changed, 290 insertions(+), 5 deletions(-) create mode 100644 device_framework_matrix_product_202404.xml create mode 100644 manifest_202404.xml diff --git a/device.mk b/device.mk index f9a01c8..ba19212 100644 --- a/device.mk +++ b/device.mk @@ -398,8 +398,19 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) # Device Manifest, Device Compatibility Matrix for Treble +# +# Install product specific framework compatibility matrix +# (TODO: b/169535506) This includes the FCM for system_ext and product partition. +# It must be split into the FCM of each partition. +ifeq ($(PRODUCT_SHIPPING_API_LEVEL),35) +DEVICE_MANIFEST_FILE := \ + device/google/zumapro/manifest_202404.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product_202404.xml +else DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml +endif ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ @@ -1186,11 +1197,6 @@ include hardware/google/pixel/wifi_ext/device.mk # Battery Stats Viewer PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer -# Install product specific framework compatibility matrix -# (TODO: b/169535506) This includes the FCM for system_ext and product partition. -# It must be split into the FCM of each partition. -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml - # Keymint configuration PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \ diff --git a/device_framework_matrix_product_202404.xml b/device_framework_matrix_product_202404.xml new file mode 100644 index 0000000..1dbfb17 --- /dev/null +++ b/device_framework_matrix_product_202404.xml @@ -0,0 +1,264 @@ + + + android.hardware.boot + IBootControl/default + + + android.hardware.graphics.composer3 + 2 + + IComposer + default + + + + android.hardware.graphics.mapper + 4.0 + + IMapper + default + + + + android.hardware.radio + 1.2 + + ISap + slot2 + + + + android.hardware.radio.config + 2 + + IRadioConfig + default + + + + android.hardware.radio.data + 2 + + IRadioData + slot1 + slot2 + slot3 + + + + android.hardware.radio.messaging + 2 + + IRadioMessaging + slot1 + slot2 + slot3 + + + + android.hardware.radio.modem + 2 + + IRadioModem + slot1 + slot2 + slot3 + + + + android.hardware.radio.network + 2 + + IRadioNetwork + slot1 + slot2 + slot3 + + + + android.hardware.radio.sim + 2 + + IRadioSim + slot1 + slot2 + slot3 + + + + android.hardware.radio.voice + 2 + + IRadioVoice + slot1 + slot2 + slot3 + + + + android.hardware.vibrator + 2 + + IVibrator + dual + + + + android.hardware.wifi.hostapd + 1 + + IHostapd + default + + + + android.vendor.samsung_slsi.telephony.hardware.radio + 1.1 + + IOemSamsungslsi + slot1 + slot2 + + + + com.fingerprints33.extension + 1.0 + + IFingerprintAuthenticator + default + + + IFingerprintCalibration + default + + + IFingerprintEngineering + default + + + IFingerprintNavigation + default + + + IFingerprintRecalibration + default + + + IFingerprintSenseTouch + default + + + IFingerprintSensorTest + default + + + + com.google.face.debug + 3-4 + + IDebugHost + default + + + IDebugManager + default + + + + com.google.edgetpu + 2 + + IEdgeTpuVendorService + default + + + + com.google.edgetpu.dba + 1 + + IDevice + default + + + + com.google.edgetpu.tachyon + 1 + + IComputeService + default + + + + com.google.hardware.pixel.display + 12 + + IDisplay + default + + + + hardware.qorvo.uwb + + IUwbVendor + default + + + + vendor.goodix.hardware.biometrics.fingerprint + 2.1 + + IGoodixFingerprintDaemon + default + + + + vendor.google.google_battery + 2-3 + + IGoogleBattery + default + + + + vendor.google.radioext + 1.7 + + IRadioExt + default + + + + vendor.google.wifi_ext + 2-3 + + IWifiExt + default + + + + vendor.samsung_slsi.telephony.hardware.oemservice + 1.0 + + IOemService + dm0 + dm1 + sced0 + + + + com.google.pixel.modem.logmasklibrary + 1 + + ILiboemserviceProxy + default + + + + vendor.samsung_slsi.telephony.hardware.radioExternal + 1.1 + + IOemSlsiRadioExternal + rilExternal + + + diff --git a/manifest_202404.xml b/manifest_202404.xml new file mode 100644 index 0000000..99dd18d --- /dev/null +++ b/manifest_202404.xml @@ -0,0 +1,15 @@ + + + android.hardware.graphics.mapper + passthrough + 4.0 + + IMapper + default + + + + android.hardware.boot + IBootControl/default + + From 77f2807cf9be9d42f8566d4d17045b8874eb6e34 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Tue, 18 Jun 2024 21:05:52 +0800 Subject: [PATCH 006/117] dump_power: add RT9470G dump into bugreport 1. power supply properties 2. registers Bug: 347914940 Test: adb bugreport Flag: EXEMPT bugfix Change-Id: Ie6f2de3acef515665727f3e3bc0e4373778ffe07 Signed-off-by: Jack Wu --- dumpstate/dump_power.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index a5b4253..a83506e 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -235,6 +235,21 @@ void dumpPowerSupplyDock() { } } +void dumpSecondCharge() { + const char* powerSupplyPropertySecChgTitle = "Power supply property rt9471"; + const char* powerSupplyPropertySecChgFile = "/sys/class/power_supply/rt9471/uevent"; + const char *secChgTitle = "RT9470G"; + const char *secChgFile = "/sys/devices/platform/10ca0000.hsi2c/i2c-10/10-005b/registers_dump"; + + if (isValidFile(powerSupplyPropertySecChgFile)) { + dumpFileContent(powerSupplyPropertySecChgTitle, powerSupplyPropertySecChgFile); + } + + if (isValidFile(secChgFile)) { + dumpFileContent(secChgTitle, secChgFile); + } +} + void dumpLogBufferTcpm() { const char* logbufferTcpmTitle = "Logbuffer TCPM"; const char* logbufferTcpmFile = "/dev/logbuffer_tcpm"; @@ -1069,6 +1084,7 @@ int main() { dumpPowerStatsTimes(); dumpAcpmStats(); dumpPowerSupplyStats(); + dumpSecondCharge(); dumpMaxFg(); dumpPowerSupplyDock(); dumpLogBufferTcpm(); From cdda43b5d039e6c08f01fb0c85da1e9729e19205 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Mon, 24 Jun 2024 16:31:25 +0000 Subject: [PATCH 007/117] Revert "Add manifest for VINTF target FCM level 202404" Revert submission 27975044-ship_api_35 Reason for revert: DroidMonitor: Potential culprit for b/349087711 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:27975044-ship_api_35 Change-Id: I16d0ec8d3fbafeb23936fa7099933787e9164932 --- device.mk | 16 +- device_framework_matrix_product_202404.xml | 264 --------------------- manifest_202404.xml | 15 -- 3 files changed, 5 insertions(+), 290 deletions(-) delete mode 100644 device_framework_matrix_product_202404.xml delete mode 100644 manifest_202404.xml diff --git a/device.mk b/device.mk index ba19212..f9a01c8 100644 --- a/device.mk +++ b/device.mk @@ -398,19 +398,8 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) # Device Manifest, Device Compatibility Matrix for Treble -# -# Install product specific framework compatibility matrix -# (TODO: b/169535506) This includes the FCM for system_ext and product partition. -# It must be split into the FCM of each partition. -ifeq ($(PRODUCT_SHIPPING_API_LEVEL),35) -DEVICE_MANIFEST_FILE := \ - device/google/zumapro/manifest_202404.xml -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product_202404.xml -else DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml -endif ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ @@ -1197,6 +1186,11 @@ include hardware/google/pixel/wifi_ext/device.mk # Battery Stats Viewer PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer +# Install product specific framework compatibility matrix +# (TODO: b/169535506) This includes the FCM for system_ext and product partition. +# It must be split into the FCM of each partition. +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml + # Keymint configuration PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \ diff --git a/device_framework_matrix_product_202404.xml b/device_framework_matrix_product_202404.xml deleted file mode 100644 index 1dbfb17..0000000 --- a/device_framework_matrix_product_202404.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - android.hardware.boot - IBootControl/default - - - android.hardware.graphics.composer3 - 2 - - IComposer - default - - - - android.hardware.graphics.mapper - 4.0 - - IMapper - default - - - - android.hardware.radio - 1.2 - - ISap - slot2 - - - - android.hardware.radio.config - 2 - - IRadioConfig - default - - - - android.hardware.radio.data - 2 - - IRadioData - slot1 - slot2 - slot3 - - - - android.hardware.radio.messaging - 2 - - IRadioMessaging - slot1 - slot2 - slot3 - - - - android.hardware.radio.modem - 2 - - IRadioModem - slot1 - slot2 - slot3 - - - - android.hardware.radio.network - 2 - - IRadioNetwork - slot1 - slot2 - slot3 - - - - android.hardware.radio.sim - 2 - - IRadioSim - slot1 - slot2 - slot3 - - - - android.hardware.radio.voice - 2 - - IRadioVoice - slot1 - slot2 - slot3 - - - - android.hardware.vibrator - 2 - - IVibrator - dual - - - - android.hardware.wifi.hostapd - 1 - - IHostapd - default - - - - android.vendor.samsung_slsi.telephony.hardware.radio - 1.1 - - IOemSamsungslsi - slot1 - slot2 - - - - com.fingerprints33.extension - 1.0 - - IFingerprintAuthenticator - default - - - IFingerprintCalibration - default - - - IFingerprintEngineering - default - - - IFingerprintNavigation - default - - - IFingerprintRecalibration - default - - - IFingerprintSenseTouch - default - - - IFingerprintSensorTest - default - - - - com.google.face.debug - 3-4 - - IDebugHost - default - - - IDebugManager - default - - - - com.google.edgetpu - 2 - - IEdgeTpuVendorService - default - - - - com.google.edgetpu.dba - 1 - - IDevice - default - - - - com.google.edgetpu.tachyon - 1 - - IComputeService - default - - - - com.google.hardware.pixel.display - 12 - - IDisplay - default - - - - hardware.qorvo.uwb - - IUwbVendor - default - - - - vendor.goodix.hardware.biometrics.fingerprint - 2.1 - - IGoodixFingerprintDaemon - default - - - - vendor.google.google_battery - 2-3 - - IGoogleBattery - default - - - - vendor.google.radioext - 1.7 - - IRadioExt - default - - - - vendor.google.wifi_ext - 2-3 - - IWifiExt - default - - - - vendor.samsung_slsi.telephony.hardware.oemservice - 1.0 - - IOemService - dm0 - dm1 - sced0 - - - - com.google.pixel.modem.logmasklibrary - 1 - - ILiboemserviceProxy - default - - - - vendor.samsung_slsi.telephony.hardware.radioExternal - 1.1 - - IOemSlsiRadioExternal - rilExternal - - - diff --git a/manifest_202404.xml b/manifest_202404.xml deleted file mode 100644 index 99dd18d..0000000 --- a/manifest_202404.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - - - android.hardware.boot - IBootControl/default - - From 5edb0b9446f2778ddee77933e88ed5c4a8eec1bc Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Mon, 24 Jun 2024 16:31:25 +0000 Subject: [PATCH 008/117] Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by device" Revert submission 27975044-ship_api_35 Reason for revert: DroidMonitor: Potential culprit for b/349087711 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:27975044-ship_api_35 Change-Id: Ibd6abb160c8e203505f4531173dca080b99ba5a8 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index f9a01c8..3389983 100644 --- a/device.mk +++ b/device.mk @@ -395,8 +395,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # GRAPHICS - GPU (end) # #################### -PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) - # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml @@ -421,6 +419,8 @@ DEVICE_MATRIX_FILE := \ DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay +PRODUCT_SHIPPING_API_LEVEL := 34 + # RKP VINTF -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk From e6afdd099c4509587b8400e498f41e40b097b11c Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 24 Apr 2024 00:55:42 +0000 Subject: [PATCH 009/117] 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: 339664411 Test: PTE A/B test Flag: NONE no behavior change Signed-off-by: Qais Yousef (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:909fadc268c0993e4313ff34a8415daf742c3c15) 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 eb5f51eb7a56abf26a0a48659713b8d8874ffee1 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Tue, 23 Apr 2024 23:11:34 +0000 Subject: [PATCH 010/117] 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: 339664411 Test: PTE A/B test Flag: NONE no behavior change Signed-off-by: Qais Yousef (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ea40e248c17899d5bb556dad95647db97e30dc4d) 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 07404c5fabb91739fe8a54db097c16df636f782d Mon Sep 17 00:00:00 2001 From: Sungwoo choi Date: Thu, 25 Apr 2024 14:34:30 +0900 Subject: [PATCH 011/117] FCM: IOemSlsiRadioExternal and IOemService Enable AIDL for V requirement Bug: 281968564 Test: telephony function test Flag: EXEMPT HAL interface change Change-Id: Ide9edfedbe9a904d6589084f7042fbc0d3a2da10 Signed-off-by: Sungwoo choi --- device_framework_matrix_product.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 59d5bf9..9ac01cd 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -185,4 +185,22 @@ rilExternal + + vendor.samsung_slsi.telephony.hardware.radioExternal + 1 + + IOemSlsiRadioExternal + default + + + + vendor.samsung_slsi.telephony.hardware.oemservice + 1 + + IOemService + dm0 + dm1 + sced0 + + From ef6c3c593d035bf111e534b29d029410b72209ec Mon Sep 17 00:00:00 2001 From: Rick Chen Date: Tue, 25 Jun 2024 17:44:49 +0800 Subject: [PATCH 012/117] Scale the flexibility for sensor features settings Flag: EXEMPT bugfix Bug: 345660192 Bug: 345662463 Test: adb shell pm list features Change-Id: I882d13f988b20628e6f6fe47d55f0ea6ad54e7ab Signed-off-by: Rick Chen --- device.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 3389983..d6402c5 100644 --- a/device.mk +++ b/device.mk @@ -563,15 +563,21 @@ PRODUCT_COPY_FILES += \ # Sensors PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ frameworks/native/data/etc/android.hardware.sensor.dynamic.head_tracker.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.dynamic.head_tracker.xml \ frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml\ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml +ifneq ($(DISABLE_SENSOR_BARO_HIFI),true) +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml +endif +ifneq ($(DISABLE_SENSOR_PROX),true) +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml +endif # Add sensor HAL AIDL product packages PRODUCT_PACKAGES += android.hardware.sensors-service.multihal From b56737bc8bdcbb776185b452aab99ed54631fa00 Mon Sep 17 00:00:00 2001 From: liangjlee Date: Thu, 27 Jun 2024 02:03:46 +0800 Subject: [PATCH 013/117] zumapro: Include power/power.mk Bug: 331612600 Flag: EXEMPT (bug 337358613) Change-Id: I219168dd67835647fc4fc0a2f35484b634b94b8f Signed-off-by: liangjlee --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index d6402c5..786c441 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 9236e194c0966e9b9bfb69ee7ad80426c21a1405 Mon Sep 17 00:00:00 2001 From: Roy Luo Date: Wed, 26 Jun 2024 22:55:52 +0000 Subject: [PATCH 014/117] Use absolute path for udc device Avoid search in /sys/class/udc directory Bug: 339241080 Test: tested on zumapro Flag: EXEMPT bugfix Change-Id: Iad74cae0d6ad6887d79d705dc8478f1b44532503 --- usb/gadget/UsbGadget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index 28a9a67..7f2d230 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -74,7 +74,7 @@ constexpr char kProcInterruptsPath[] = "/proc/interrupts"; constexpr char kProcIrqPath[] = "/proc/irq/"; constexpr char kSmpAffinityList[] = "/smp_affinity_list"; #ifndef UDC_PATH -#define UDC_PATH "/sys/class/udc/11210000.dwc3/" +#define UDC_PATH "/sys/devices/platform/11210000.usb/11210000.dwc3/udc/11210000.dwc3/" #endif static MonitorFfs monitorFfs(kGadgetName); From 9aa4809cf3fd5345f54ee3191d0441eac4c267aa Mon Sep 17 00:00:00 2001 From: liangjlee Date: Thu, 27 Jun 2024 02:03:46 +0800 Subject: [PATCH 015/117] zumapro: Include power/power.mk Bug: 331612600 Flag: EXEMPT (bug 337358613) Change-Id: I219168dd67835647fc4fc0a2f35484b634b94b8f Signed-off-by: liangjlee --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 7fe294e..a1180de 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 34e36d4c11553f9bb9345ca80e046787636eccd3 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Thu, 27 Jun 2024 07:47:05 +0000 Subject: [PATCH 016/117] zumapro: update AVC, mpeg4 SW decoder performance point for 24Q3 Flag: EXEMPT bugfix Bug: 349265046 Test: MctsMediaDecoderTestCases android.media.decoder.cts.VideoDecoderPerfTest 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 236eb6a6d40d73f32f28cfe386ac24109cbafd2f Mon Sep 17 00:00:00 2001 From: Steve Statia Date: Fri, 28 Jun 2024 17:55:11 +0000 Subject: [PATCH 017/117] 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. 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 e116a1fba401aa5f9e367ebcaecbe56f38316510 Mon Sep 17 00:00:00 2001 From: Tim Lin Date: Fri, 28 Jun 2024 15:53:38 +0000 Subject: [PATCH 018/117] Include ril.mk after DEVICE_MANIFEST_FILE is reset Bug: 348631842 Flag: EXEMPT bugfix Test: check carrier ID property is set correctly Change-Id: I40160c14f65d5193962dd3f1e2862d129c8404b6 --- device.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index 786c441..6eec466 100644 --- a/device.mk +++ b/device.mk @@ -278,11 +278,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 @@ -1216,6 +1211,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 baacfa3192b0a36e71cff3e066996e2af6481f20 Mon Sep 17 00:00:00 2001 From: Pechetty Sravani Date: Mon, 1 Jul 2024 06:10:59 +0000 Subject: [PATCH 019/117] Revert "FCM: IOemSlsiRadioExternal and IOemService" Revert submission 27917806-v_hal_migration_phase3 Reason for revert: Droidmonitor created revert due to b/350390759. Will be verifying through ABTD before submission. Reverted changes: /q/submissionid:27917806-v_hal_migration_phase3 Change-Id: Ib597565d200a42b05f7a666f75b19ace449f02d4 --- device_framework_matrix_product.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 9ac01cd..59d5bf9 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -185,22 +185,4 @@ rilExternal - - vendor.samsung_slsi.telephony.hardware.radioExternal - 1 - - IOemSlsiRadioExternal - default - - - - vendor.samsung_slsi.telephony.hardware.oemservice - 1 - - IOemService - dm0 - dm1 - sced0 - - From 342109994952699af9481ca81a82cd5df64e2810 Mon Sep 17 00:00:00 2001 From: Tim Lin Date: Mon, 1 Jul 2024 06:46:27 +0000 Subject: [PATCH 020/117] Revert^2 "FCM: IOemSlsiRadioExternal and IOemService" Enable AIDL for V requirement Forrest build result in go/v-ril-hal-migration Bug: 281968564 Test: telephony function test Flag: EXEMPT HAL interface change baacfa3192b0a36e71cff3e066996e2af6481f20 Change-Id: I3af92949f04c0f0e23782d65831dfe2409f6bea6 --- device_framework_matrix_product.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 59d5bf9..9ac01cd 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -185,4 +185,22 @@ rilExternal + + vendor.samsung_slsi.telephony.hardware.radioExternal + 1 + + IOemSlsiRadioExternal + default + + + + vendor.samsung_slsi.telephony.hardware.oemservice + 1 + + IOemService + dm0 + dm1 + sced0 + + From f6f6d414126f1138ccefd8a4a420db422d056836 Mon Sep 17 00:00:00 2001 From: Hyosun Kim Date: Thu, 27 Jun 2024 12:55:35 +0000 Subject: [PATCH 021/117] Supports Android APIs for the Carrier NB-Satellite Provisioning add device config Bug: 348573493 Test: atest SatelliteManagerTest, SatelliteManagerTestOnMockService Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn Change-Id: Id8c7699aae94c53a8c0b62fb6259f7b2fb94c731 --- overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 1ed30fa..661130b 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -517,4 +517,10 @@ com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE + + + com.google.android.apps.stargate + + + com.google.satellitegateway.ACTION_REGISTER From 25dc5e94e0bc2dc55c0d41762de795fcacb6105c Mon Sep 17 00:00:00 2001 From: Steve Statia Date: Fri, 28 Jun 2024 17:55:11 +0000 Subject: [PATCH 022/117] Fix to hide Display over other apps permission setting for the Scone application. Bug: 349195999 Test: manually testing that the setting is removed from Adaptive Connectivity Services advanced settings page. Change-Id: I87c284411e63225fac9138b5f4f0578a0acd7212 Merged-In: 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..ba67af0 --- /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 62e82d5678811a44b2803b1d8c1f132cea148335 Mon Sep 17 00:00:00 2001 From: Kah Xuan Lim Date: Tue, 2 Jul 2024 06:13:40 +0000 Subject: [PATCH 023/117] 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 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 6eec466..ab399d3 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 661130b..a752fd1 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 4ec8dfa1c71f01b7b6c80ddf273ab7f700bedd42 Mon Sep 17 00:00:00 2001 From: Mike McTernan Date: Thu, 4 Jul 2024 15:48:02 +0100 Subject: [PATCH 024/117] APC/TUI: remove support for APC Flag: EXEMPT build file change Bug: 351151445 Test: m && test on device Change-Id: I09ab55ed5e5e1cafc3cdc3ce7df8c75124d14281 --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index ab399d3..3a7085f 100644 --- a/device.mk +++ b/device.mk @@ -82,7 +82,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_devices/common/chre/host/hal \ vendor/google/whitechapel/tools \ vendor/google/interfaces \ - vendor/google_devices/common/proprietary/confirmatioui_hal \ vendor/google_nos/host/android \ vendor/google_nos/test/system-test-harness \ vendor/google/camera @@ -923,9 +922,6 @@ PRODUCT_PACKAGES_DEBUG += \ tipc-test \ trusty_stats_test \ -# Remove confirmation UI (b/316160738) -# include device/google/gs101/confirmationui/confirmationui.mk - # Trusty Metrics Daemon PRODUCT_SOONG_NAMESPACES += \ vendor/google/trusty/common From b2427428e58fbd59bd5cbb484be4badf62a3fa19 Mon Sep 17 00:00:00 2001 From: Jeremy DeHaan Date: Wed, 12 Jun 2024 16:32:16 -0700 Subject: [PATCH 025/117] zumapro: HWC access to panel frame_rate node Flag: EXEMPT bugfix Bug: 346461765 Change-Id: I2cdbd8126e5684891b6424d262aa505d2aa641b7 Signed-off-by: Jeremy DeHaan --- 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 1570ba2..9f1f6f0 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 bef0cb7c8d784a27cfdb073dfafaeb8469b0e03e Mon Sep 17 00:00:00 2001 From: Boon Jun Date: Fri, 5 Jul 2024 02:30:52 +0000 Subject: [PATCH 026/117] Allow camera configurations with no flash light Let clients determine the configuration of camera flash features. Copy the rule by conditions: - android.hardware.camera.autofocus.xml for devices with no flash - android.hardware.camera.flash-autofocus.xml for devices with flash Bug: 350371742 Test: adb shell pm list features Flag: EXEMPT build file change Change-Id: If4c9b73f2ca934374c4870db3954702f3522b9a0 --- device.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 786c441..2e3554f 100644 --- a/device.mk +++ b/device.mk @@ -753,12 +753,19 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \ frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\ +ifneq ($(DISABLE_CAMERA_FS),true) +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml +else +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml +endif + #PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ From 9b61db2e86f788138fff5d6fd453e9a5df34323d Mon Sep 17 00:00:00 2001 From: Jeremy Kemp Date: Wed, 22 May 2024 09:57:02 +0100 Subject: [PATCH 027/117] Add Mali OpenCL ICD to PRODUCT_PACKAGES Bug: 324057328 Test: clpeak Change-Id: I864331b449315d53f8da11a374f2816c599e4e6d --- device.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index ab399d3..0d86a41 100644 --- a/device.mk +++ b/device.mk @@ -334,9 +334,18 @@ PRODUCT_PACKAGES += \ csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \ libGLES_mali \ vulkan.mali \ - libOpenCL \ libgpudataproducer +# Install the OpenCL ICD Loader +PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader +PRODUCT_PACKAGES += \ + libOpenCL \ + mali_icd__customer_pixel_opencl-icd_ARM.icd +ifeq ($(DEVICE_IS_64BIT_ONLY),false) +PRODUCT_PACKAGES += \ + mali_icd__customer_pixel_opencl-icd_ARM32.icd +endif + ifeq ($(USE_SWIFTSHADER),true) $(warning USE_SWIFTSHADER set to current target) PRODUCT_PACKAGES += \ From fe92c2de444cd399e5ad90872c462c675793c484 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Mon, 8 Jul 2024 15:29:15 +0000 Subject: [PATCH 028/117] init.zumapro.board.rc: Improve max_load_balance_interval value This value is in jiffies, setting it to 4 doesn't mean it is 4ms, but it is 4 ticks or 16ms. Set it to the intended 1 TICK/4ms. Bug: 351817090 Flag: NONE, init scripts don't support flags Signed-off-by: Qais Yousef Change-Id: I23b8eacd13bd12cbab5272e7c72c38ab9ea44719 --- conf/init.zumapro.board.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 9923903..dc43cb4 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -506,7 +506,7 @@ on property:sys.boot_completed=1 # Setup scheduler parameters write /proc/vendor_sched/min_granularity_ns 1000000 write /proc/vendor_sched/latency_ns 8000000 - write /proc/vendor_sched/max_load_balance_interval 4 + write /proc/vendor_sched/max_load_balance_interval 1 write /proc/vendor_sched/enable_hrtick 1 # Setup final cpu.uclamp From e49f89d3a2d1a36179e7ab5399659bf753a52998 Mon Sep 17 00:00:00 2001 From: Dmitry Skiba Date: Fri, 28 Jun 2024 21:14:43 +0000 Subject: [PATCH 029/117] Reland "Restrict kcompactd thread to middle/little cores." This reverts commit e252dc733cedc0c9d2a01160f24b86d210b439f5. Reason for revert: 24Q3 has been cut, relanding the original commit 9743ceeba300ab3374a93760c55ef2385bc60c4c. Change-Id: I6bcd2c7277c689201c8bf17ea9d6211b4ee35c8f Bug: 347272991 --- conf/init.zumapro.soc.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index ac9c316..7c8efa0 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -163,6 +163,7 @@ on property:sys.boot_completed=1 # Set kswapd affinity write /sys/kernel/vendor_mm/kswapd_cpu_affinity 7f write /sys/kernel/vendor_mm/pa_kill/cpu_affinity 7f + write /sys/kernel/vendor_mm/kcompactd_cpu_affinity 7f # Restore prefer idle write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff From b78cf2c65ffcf8e71d90216592ef87f47e330303 Mon Sep 17 00:00:00 2001 From: Hyosun Kim Date: Tue, 9 Jul 2024 17:56:00 +0000 Subject: [PATCH 030/117] remove device config for supporting Android APIs for the Carrier NB-Satellite Provisioning Bug: 348573493 Test: atest SatelliteManagerTest, SatelliteManagerTestOnMockService Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn Change-Id: Ic8f84f9879f5b59d14c6f835efaea495eecdb8b5 --- overlay/frameworks/base/core/res/res/values/config.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index a752fd1..f6b7439 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -518,10 +518,4 @@ com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE - - - com.google.android.apps.stargate - - - com.google.satellitegateway.ACTION_REGISTER From 3e8967723fb0f812aee791911cd1f0c181ee9e3d Mon Sep 17 00:00:00 2001 From: Jeremy DeHaan Date: Wed, 12 Jun 2024 16:32:16 -0700 Subject: [PATCH 031/117] zumapro: HWC access to panel frame_rate node Flag: EXEMPT bugfix Bug: 346461765 Change-Id: I2cdbd8126e5684891b6424d262aa505d2aa641b7 Signed-off-by: Jeremy DeHaan (cherry picked from commit b2427428e58fbd59bd5cbb484be4badf62a3fa19) --- 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 42a1d55..82f6414 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -414,6 +414,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 cae96e4e503faaf690da9690dd51b29215d2b5e7 Mon Sep 17 00:00:00 2001 From: Vishvam Mazumdar Date: Tue, 4 Jun 2024 18:02:35 +0000 Subject: [PATCH 032/117] Add CPU Idle Histogram Stats to dumpstate board file. This change is to allow the CPU Idle Histogram Stats to be dumped in bugreports so that there is more insight into the idle behavior of devices in the field. Test: Build/Flash Test: adb bugreport Bug: 344908619 Flag: EXEMPT bugfix Change-Id: I3b7b0d573bfd5f7e5e9f05c333b5a38940f3d8d6 Signed-off-by: Vishvam Mazumdar --- dumpstate/dump_power.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index e8989f0..b77e386 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -1028,9 +1028,21 @@ void dumpEvtCounter() { } } +void dumpCpuIdleHistogramStats() { + const char* cpuIdleHistogramTitle = "CPU Idle Histogram"; + const char* cpuIdleHistogramFile = "/sys/kernel/metrics/cpuidle_histogram/" + "cpuidle_histogram"; + const char* cpuClusterHistogramTitle = "CPU Cluster Histogram"; + const char* cpuClusterHistogramFile = "/sys/kernel/metrics/" + "cpuidle_histogram/cpucluster_histogram"; + dumpFileContent(cpuIdleHistogramTitle, cpuIdleHistogramFile); + dumpFileContent(cpuClusterHistogramTitle, cpuClusterHistogramFile); +} + int main() { dumpPowerStatsTimes(); dumpAcpmStats(); + dumpCpuIdleHistogramStats(); dumpPowerSupplyStats(); dumpMaxFg(); dumpPowerSupplyDock(); From 1f009ad2ba91f404cbe87c47c80d17ca8a487a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Wed, 10 Jul 2024 22:13:09 +0000 Subject: [PATCH 033/117] Delete PDX sockets for legacy VR services. Remove irrelevant copy and paste content. None of the zumapro devices ever included these services and these sockets are not doing anything. Bug: 234559097 Test: presubmit Flag: EXEMPT dead code removal Change-Id: I27fc7563f244b96ec75aac3ef929163257975933 --- conf/init.zumapro.board.rc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index dfb5198..9c4b87f 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -118,16 +118,6 @@ on init write /sys/class/net/rmnet6/queues/rx-0/rps_cpus fe write /sys/class/net/rmnet7/queues/rx-0/rps_cpus fe - # Create UDS structure for base VR services. - mkdir /dev/socket/pdx 0775 system system - mkdir /dev/socket/pdx/system 0775 system system - mkdir /dev/socket/pdx/system/buffer_hub 0775 system system - mkdir /dev/socket/pdx/system/performance 0775 system system - mkdir /dev/socket/pdx/system/vr 0775 system system - mkdir /dev/socket/pdx/system/vr/display 0775 system system - mkdir /dev/socket/pdx/system/vr/pose 0775 system system - mkdir /dev/socket/pdx/system/vr/sensors 0775 system system - # RT uclamp setting write /proc/sys/kernel/sched_util_clamp_min_rt_default 0 From 4618cbe15c617009e334fae33e789484df555e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Wagner?= Date: Wed, 10 Jul 2024 13:18:27 +0000 Subject: [PATCH 034/117] Increase the max core index for protected TLS allocations to 4 Pixel has removed unnecessary allocation padding, and we now pass dEQP with a maximum physical core index setting of 4, which allows the driver to utilize 2 GPU cores (1001b) in the extreme tests. Bug: 221255664 Test: atest CtsDeqpTestCases -- --module-arg 'CtsDeqpTestCases:include-filter:dEQP-VK.protected_memory.*' Flag: EXEMPT bugfix Change-Id: Ie4f0b6427bc3cfbb6ab1e8b11910c88dab76eb9a --- device.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 3a7085f..194dbf2 100644 --- a/device.mk +++ b/device.mk @@ -357,11 +357,10 @@ endif PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1 # 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_max_core_count=4 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 From 95dc4cb9ed5f38b6aeb3c23ed97d8fc186464c29 Mon Sep 17 00:00:00 2001 From: Vishvam Mazumdar Date: Mon, 17 Jun 2024 20:06:47 +0000 Subject: [PATCH 035/117] Defaultly enable cpu idle histogram stats collection for dumpstate. This change is to allow the CPU Idle Histogram Stats to be dumped in bugreports so that there is more insight into the idle behavior of devices in the field. Test: Build/Flash Test: Collect histogram log Bug: 344908619 Flag: EXEMPT bugfix Change-Id: I3a670060048b620c9d20f1a4dedbd4d992e925ca Signed-off-by: Vishvam Mazumdar --- conf/init.zumapro.board.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index dcee57a..eab4b41 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -183,6 +183,9 @@ on init chown root system /sys/devices/platform/16490000.gsa-ns/log_main chown root system /sys/devices/platform/16490000.gsa-ns/log_intermediate + # Enable CPU Idle histograms + write /sys/kernel/metrics/cpuidle_histogram/enable 1 + on post-fs # Ensure device is ready and start storageproxyd wait /dev/sg1 From 9b2b5a8cb03fbb53e6ec28a1433e588d6d03dead Mon Sep 17 00:00:00 2001 From: Aaron Tsai Date: Tue, 2 Jul 2024 06:56:28 +0000 Subject: [PATCH 036/117] Remove USE_WHI_GRIL_RECOVERY flag - move to gril.mk Bug: 343012301 Test: build pass Flag: EXEMPT bugfix Change-Id: I6882625c5bfde2d496eb844f7f08566cad89874c --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 5557fa2..7427383 100644 --- a/device.mk +++ b/device.mk @@ -289,7 +289,6 @@ include device/google/gs-common/modem/shared_modem_platform/shared_modem_platfor # Use for GRIL USES_LASSEN_MODEM := true -USE_WHI_GRIL_RECOVERY := true ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) USE_GOOGLE_DIALER := true From e9fcb35a2cb9fc67349b092f5d6c861554e973e5 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Mon, 15 Jul 2024 04:49:10 +0000 Subject: [PATCH 037/117] zumapro: update c2.exynos.hevc.encoder based on BD4A.240715.001 Flag: EXEMPT bugfix Bug: 344508143 Test: run cts -m CtsVideoTestCases -t android.video.cts.VideoEncoderDecoderTest Change-Id: If9ad3c718a77fb846057a43054ae94d18f1e6bea --- media_codecs_performance_c2.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index d72a962..67ca505 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -190,7 +190,8 @@ - + + From 9ada8fb5e4552826d70c0540fc9df71da1409069 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Tue, 16 Jul 2024 14:18:58 +0800 Subject: [PATCH 038/117] Add soong config variable for PowerAnomalySitril Set the variable is true when USE_LASSEN_OEMHOOK is true and BOARD_WITHOUT_RADIO is not true. Flag: EXEMPT bugfix Bug: 325857852 Test: m ConnectivityMonitor Change-Id: I3526c27ea9f48455891c2839fb37bf9a95bd78e0 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 7427383..8bd0e3e 100644 --- a/device.mk +++ b/device.mk @@ -221,6 +221,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril +$(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) From 807ab9bc7e5176cec9fd8a9fd7d8123bb042d17c Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Tue, 16 Jul 2024 14:38:35 +0800 Subject: [PATCH 039/117] powerstats: correct TPU clock for ZP Bug: 335900447 Bug: 353411106 Test: dumpsys android.hardware.power.stats.IPowerStats/default Flag: EXEMPT bugfix Change-Id: I585dd4256dd68f3af35222095a10d833c328f372 Signed-off-by: Darren Hsu --- powerstats/ZumaProCommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/ZumaProCommonDataProviders.cpp b/powerstats/ZumaProCommonDataProviders.cpp index 4bd3559..79bcbc8 100644 --- a/powerstats/ZumaProCommonDataProviders.cpp +++ b/powerstats/ZumaProCommonDataProviders.cpp @@ -196,7 +196,7 @@ void addDvfsStats(std::shared_ptr p) { path, NS_TO_MS, cfgs)); // TPU DVFS - const int TICK_TO_MS = 100; + const int TICK_TO_MS = 1000; std::vector freqs = { "1119000", "1066000", From 3d7e868fb4b823c39ca18df5f6a8fb6f560399ef Mon Sep 17 00:00:00 2001 From: Robert Luo Date: Mon, 29 Apr 2024 14:24:10 +0800 Subject: [PATCH 040/117] [Pixel RR] Apply reviewed default permissions Pregrantting below permissions: READ_CONTACTS WRITE_CONTACTS READ_CALL_LOG Flag: EXEMPT add pregranted permission in b/337725984, b/337802920 Bug: 337725984, 337802920 Test: presubmit Change-Id: I76042e951ddba89914c5b347497d44ef0a7faf2e --- default-permissions.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index 2d04542..2f6f13f 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -68,6 +68,13 @@ + + + + + + + From 077ec5e4da144e9d57a619c94ff42a4357a5c568 Mon Sep 17 00:00:00 2001 From: Mike McTernan Date: Fri, 12 Jul 2024 20:39:45 +0100 Subject: [PATCH 041/117] strorageproxyd: restart on checkpoint completion Flag: EXEMPT rc file change Bug: 350362101 Test: ABDT Change-Id: I8c6250155b65c773c657ff09f2a9644e57282f5f --- conf/init.zumapro.board.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 1570ba2..e0f5bd2 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -644,6 +644,9 @@ on post-fs-data restart storageproxyd +on post-fs-data-checkpointed + restart storageproxyd + service storageproxyd /vendor/bin/storageproxyd \ -d /dev/trusty-ipc-dev0 \ -r /dev/sg1 \ From ecfc3d45411d45054ede46cdc7f56cb38bb1e1ac Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 23 Jul 2024 10:45:40 -0700 Subject: [PATCH 042/117] 16kb: Set compression algorithm based on the kernel page size The zram compression algorithm will be set based on the page size. - 4kb kernels will use lz77eh - 16kb kernels will use lzo-rle due Emerald Hill does not support 16kb page sizes. Bug: 354960718 Test: # 4kb kernel zumapro:/ # getconf PAGE_SIZE 4096 zumapro:/ # cat /sys/block/zram0/comp_algorithm [lz77eh] zstd lz4 lzo-rle lzo # 16kb kernel zumapro:/ # getconf PAGE_SIZE 16384 zumapro:/ # cat /sys/block/zram0/comp_algorithm lz77eh zstd lz4 [lzo-rle] lzo Flag: EXEMPT bugfix Change-Id: I9630c6323860621a48ca9620fcf416372ccdf7f6 --- conf/init.zumapro.board.rc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 8d5e081..1c887e8 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -81,7 +81,6 @@ on init start vendor.keymaster-4-0 # ZRAM setup - write /sys/block/zram0/comp_algorithm lz77eh write /proc/sys/vm/page-cluster 0 # Some user code relies on ro.boot.hardware.revision @@ -176,6 +175,14 @@ on init # Enable CPU Idle histograms write /sys/kernel/metrics/cpuidle_histogram/enable 1 +# ZRAM setup: use EH in 4kb kernels. +on init && property:ro.boot.hardware.cpu.pagesize=4096 + write /sys/block/zram0/comp_algorithm lz77eh + +# ZRAM setup: do not use EH in 16kb kernels. +on init && property:ro.boot.hardware.cpu.pagesize=16384 + write /sys/block/zram0/comp_algorithm lzo-rle + on post-fs # Ensure device is ready and start storageproxyd wait /dev/sg1 From 580df2f54eb4a67a3aee6c314bd1a6866ac8a330 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 9 Jul 2024 00:29:01 +0000 Subject: [PATCH 043/117] DisplayPort: add DisplayPort Max Resolution and FEC/DSC stats paths for zumapro devices Bug: 343602691 Flag: EXEMPT bugfix Test: Built Android Change-Id: Iaef6594798eef79cfec1148cea798b45c474f343 --- pixelstats/service.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index e76a4d6..c7f3ca4 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -117,6 +117,23 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/sink_count_invalid_failures", "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_unstable_failures", }, + .DisplayPortDSCStatsPaths = { + "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/fec_dsc_supported", + "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/fec_dsc_not_supported", + }, + .DisplayPortMaxResolutionStatsPaths = { + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_other", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1366_768", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1440_900", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1600_900", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_1920_1080", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_2560_1080", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_2560_1440", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_3440_1440", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_3840_2160", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_5120_2880", + "/sys/devices/platform/exynos-drm/drm-displayport-stats/max_res_7680_4320", + }, .HDCPStatsPaths = { "/sys/devices/platform/hdcp/hdcp2_success_count", "/sys/devices/platform/hdcp/hdcp2_fallback_count", From e96ffb356a0335734786d63e0a1b9f10dca9cb5b Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Wed, 24 Jul 2024 20:17:20 +0000 Subject: [PATCH 044/117] Revert "strorageproxyd: restart on checkpoint completion" Revert submission 28318041-rw_storage Reason for revert: Droidfood blocking bug b/355163562 Reverted changes: /q/submissionid:28318041-rw_storage Change-Id: Ia03a829d93d45047af844a9c7b4c4b5a14fa5f92 --- conf/init.zumapro.board.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index e0f5bd2..1570ba2 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -644,9 +644,6 @@ on post-fs-data restart storageproxyd -on post-fs-data-checkpointed - restart storageproxyd - service storageproxyd /vendor/bin/storageproxyd \ -d /dev/trusty-ipc-dev0 \ -r /dev/sg1 \ From c160c4f6db7cd040461f6f552857395cb69ca4cb Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Wed, 24 Jul 2024 20:17:20 +0000 Subject: [PATCH 045/117] Revert "strorageproxyd: restart on checkpoint completion" Revert submission 28318041-rw_storage Reason for revert: Droidfood blocking bug b/355163562 Reverted changes: /q/submissionid:28318041-rw_storage (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e96ffb356a0335734786d63e0a1b9f10dca9cb5b) Merged-In: Ia03a829d93d45047af844a9c7b4c4b5a14fa5f92 Change-Id: Ia03a829d93d45047af844a9c7b4c4b5a14fa5f92 --- conf/init.zumapro.board.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 1c887e8..035271b 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -645,9 +645,6 @@ on post-fs-data restart storageproxyd -on post-fs-data-checkpointed - restart storageproxyd - service storageproxyd /vendor/bin/storageproxyd \ -d /dev/trusty-ipc-dev0 \ -r /dev/sg1 \ From 3ca63066d46c508947146d34558c5aa3ad68cec0 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Wed, 24 Jul 2024 20:17:20 +0000 Subject: [PATCH 046/117] Revert "strorageproxyd: restart on checkpoint completion" Revert submission 28318041-rw_storage Reason for revert: Droidfood blocking bug b/355163562 Reverted changes: /q/submissionid:28318041-rw_storage (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e96ffb356a0335734786d63e0a1b9f10dca9cb5b) Merged-In: Ia03a829d93d45047af844a9c7b4c4b5a14fa5f92 Change-Id: Ia03a829d93d45047af844a9c7b4c4b5a14fa5f92 --- conf/init.zumapro.board.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 1c887e8..035271b 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -645,9 +645,6 @@ on post-fs-data restart storageproxyd -on post-fs-data-checkpointed - restart storageproxyd - service storageproxyd /vendor/bin/storageproxyd \ -d /dev/trusty-ipc-dev0 \ -r /dev/sg1 \ From f2e81aefe0b17c3d4087a124d4ecf55162bd2c53 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 30 Jul 2024 15:05:50 -0700 Subject: [PATCH 047/117] 16kb: Split fstab.zumapro.in to have f2fs partitions in one file fstab.zumapro.in is splitted in 2 files: - One file will contain all the partitions that do not use f2fs fs. - One file will contain all the partitions that use f2fs fs. This will allow in the future to configure /data and /metadata with ext4 fs. Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I6923fdefadf9299df44e2ba550d5af10446e8a20 --- conf/Android.bp | 32 ++++++++++++++----- ...{fstab.zumapro.in => fstab.zumapro.common} | 5 --- conf/fstab.zumapro.f2fs | 8 +++++ 3 files changed, 32 insertions(+), 13 deletions(-) rename conf/{fstab.zumapro.in => fstab.zumapro.common} (70%) create mode 100644 conf/fstab.zumapro.f2fs diff --git a/conf/Android.bp b/conf/Android.bp index ef95c54..12f6a14 100644 --- a/conf/Android.bp +++ b/conf/Android.bp @@ -35,7 +35,9 @@ package { genrule { name: "gen_fstab.zuma-hw-encrypt", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + " -e s/@inlinecrypt@/inlinecrypt/ " + @@ -44,7 +46,9 @@ genrule { genrule { name: "gen_fstab.zumapro-hw-encrypt", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zumapro"], cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + " -e s/@inlinecrypt@/inlinecrypt/ " + @@ -53,7 +57,9 @@ genrule { genrule { name: "gen_fstab.zuma-sw-encrypt", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + " -e s/@inlinecrypt@// " + @@ -62,7 +68,9 @@ genrule { genrule { name: "gen_fstab.zumapro-sw-encrypt", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zumapro"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + " -e s/@inlinecrypt@// " + @@ -71,7 +79,9 @@ genrule { genrule { name: "gen_fstab.zuma-no-encrypt", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@//" + " -e s/@inlinecrypt@// " + @@ -80,7 +90,9 @@ genrule { genrule { name: "gen_fstab.zumapro-no-encrypt", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zumapro"], cmd: "sed -e s/@fileencryption@//" + " -e s/@inlinecrypt@// " + @@ -89,7 +101,9 @@ genrule { genrule { name: "gen_fstab.zuma-fips", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zuma-fips"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + " -e s/@inlinecrypt@/inlinecrypt/ " + @@ -98,7 +112,9 @@ genrule { genrule { name: "gen_fstab.zumapro-fips", - srcs: ["fstab.zumapro.in"], + srcs: ["fstab.zumapro.common", + "fstab.zumapro.f2fs", + ], out: ["fstab.zumapro-fips"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + " -e s/@inlinecrypt@/inlinecrypt/ " + diff --git a/conf/fstab.zumapro.in b/conf/fstab.zumapro.common similarity index 70% rename from conf/fstab.zumapro.in rename to conf/fstab.zumapro.common index 779b259..a5521b7 100644 --- a/conf/fstab.zumapro.in +++ b/conf/fstab.zumapro.common @@ -14,12 +14,7 @@ vendor /vendor vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait -/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device /dev/block/platform/13200000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount /devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto diff --git a/conf/fstab.zumapro.f2fs b/conf/fstab.zumapro.f2fs new file mode 100644 index 0000000..35cd6a1 --- /dev/null +++ b/conf/fstab.zumapro.f2fs @@ -0,0 +1,8 @@ +# Android fstab file for block devices that contain f2fs file systems. +# +# +/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device From 8011433e1ca3cf977eed5bb3f47314261fdc6e07 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 30 Jan 2024 15:04:49 +0800 Subject: [PATCH 048/117] audio: set flag of speaker post-processing prebuilt Flag: EXEMPT refactor Bug: 352461861 Test: build pass Change-Id: I85a2d2cfa58921d0c89cf31ead9dae82edb7a08f Signed-off-by: Jasmine Cha --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index be59805..d4c1c3d 100644 --- a/device.mk +++ b/device.mk @@ -1056,6 +1056,9 @@ PRODUCT_PACKAGES += \ android.hardware.health-service.zumapro_recovery \ # Audio +# Audio Vendor Prebuilt +$(call soong_config_set,aoc_spk_post_processing,prebuilts_dir,$(RELEASE_GOOGLE_SPKPOSTPROCESSING_ZUMAPRO_DIR)) + # Audio HAL Server & Default Implementations ifeq ($(USE_AUDIO_HAL_AIDL),true) include device/google/gs-common/audio/aidl.mk From afdbb7715701ac8e240ac2f9cacf3abe8ae4eda0 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 31 Jul 2024 00:40:46 +0000 Subject: [PATCH 049/117] init.zumapro.board.rc: Disable util awareness completely Bug: 355085234 Flag: EXEMPT boot time init script configuration Signed-off-by: Qais Yousef Change-Id: I1d5d72a53c079e0f87626e46badf0250a92abbc5 --- conf/init.zumapro.board.rc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 035271b..506d282 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -14,8 +14,7 @@ on init # Set teo as cpu idle governor write /sys/devices/system/cpu/cpuidle/current_governor teo - # Disable util-awareness for mids and bigs - write /proc/vendor_sched/teo_util_threshold "2 1024 1024" + write /proc/vendor_sched/teo_util_threshold "1024 1024 1024" # Boot time fs tuning write /sys/block/sda/queue/scheduler mq-deadline From 41a4342d7c95ad12bd23b61fa85ab1f185111c04 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 31 Jul 2024 17:04:30 +0000 Subject: [PATCH 050/117] Revert "16kb: Split fstab.zumapro.in to have f2fs partitions in one file" This reverts commit f2e81aefe0b17c3d4087a124d4ecf55162bd2c53. Reason for revert: Need approval from Pixel team Bug: 356425337 Change-Id: I39958c586a114370354559780d7784d32aaa6901 --- conf/Android.bp | 32 +++++-------------- conf/fstab.zumapro.f2fs | 8 ----- ...{fstab.zumapro.common => fstab.zumapro.in} | 5 +++ 3 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 conf/fstab.zumapro.f2fs rename conf/{fstab.zumapro.common => fstab.zumapro.in} (70%) diff --git a/conf/Android.bp b/conf/Android.bp index 12f6a14..ef95c54 100644 --- a/conf/Android.bp +++ b/conf/Android.bp @@ -35,9 +35,7 @@ package { genrule { name: "gen_fstab.zuma-hw-encrypt", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + " -e s/@inlinecrypt@/inlinecrypt/ " + @@ -46,9 +44,7 @@ genrule { genrule { name: "gen_fstab.zumapro-hw-encrypt", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zumapro"], cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + " -e s/@inlinecrypt@/inlinecrypt/ " + @@ -57,9 +53,7 @@ genrule { genrule { name: "gen_fstab.zuma-sw-encrypt", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + " -e s/@inlinecrypt@// " + @@ -68,9 +62,7 @@ genrule { genrule { name: "gen_fstab.zumapro-sw-encrypt", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zumapro"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + " -e s/@inlinecrypt@// " + @@ -79,9 +71,7 @@ genrule { genrule { name: "gen_fstab.zuma-no-encrypt", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@//" + " -e s/@inlinecrypt@// " + @@ -90,9 +80,7 @@ genrule { genrule { name: "gen_fstab.zumapro-no-encrypt", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zumapro"], cmd: "sed -e s/@fileencryption@//" + " -e s/@inlinecrypt@// " + @@ -101,9 +89,7 @@ genrule { genrule { name: "gen_fstab.zuma-fips", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zuma-fips"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + " -e s/@inlinecrypt@/inlinecrypt/ " + @@ -112,9 +98,7 @@ genrule { genrule { name: "gen_fstab.zumapro-fips", - srcs: ["fstab.zumapro.common", - "fstab.zumapro.f2fs", - ], + srcs: ["fstab.zumapro.in"], out: ["fstab.zumapro-fips"], cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + " -e s/@inlinecrypt@/inlinecrypt/ " + diff --git a/conf/fstab.zumapro.f2fs b/conf/fstab.zumapro.f2fs deleted file mode 100644 index 35cd6a1..0000000 --- a/conf/fstab.zumapro.f2fs +++ /dev/null @@ -1,8 +0,0 @@ -# Android fstab file for block devices that contain f2fs file systems. -# -# -/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device diff --git a/conf/fstab.zumapro.common b/conf/fstab.zumapro.in similarity index 70% rename from conf/fstab.zumapro.common rename to conf/fstab.zumapro.in index a5521b7..779b259 100644 --- a/conf/fstab.zumapro.common +++ b/conf/fstab.zumapro.in @@ -14,7 +14,12 @@ vendor /vendor vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait +/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device /dev/block/platform/13200000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount /devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto From c9e1a342600434779a8f256c4bda8f2f881440da Mon Sep 17 00:00:00 2001 From: Wei-Hong Hsu Date: Thu, 1 Aug 2024 06:00:28 +0000 Subject: [PATCH 051/117] [NFC] Add permission for the st33spi add permission for the st33spi Bug: 326345756 Test: build pass Flag: NONE Change-Id: Ie3f3e6300c7d3551c641e0d1d3985f355ec1ab76 --- conf/ueventd.zumapro.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/ueventd.zumapro.rc b/conf/ueventd.zumapro.rc index 15ca216..809b596 100644 --- a/conf/ueventd.zumapro.rc +++ b/conf/ueventd.zumapro.rc @@ -173,6 +173,7 @@ # SecureElement /dev/st54spi 0660 secure_element secure_element +/dev/st33spi 0660 secure_element secure_element #bigwave /dev/bigwave 0660 mediacodec mediadrm From 84b13d5e27bea824c7f76f1d5db506948effe885 Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Fri, 12 Jan 2024 09:02:31 +0000 Subject: [PATCH 052/117] Update display dim configuration To extend battery life, modify the display dim configuration to enter the dimming state more aggressively. The screen should dim at minimum(20 seconds, timeout * 0.33) before the screen actually timing out. Screen timeout (secs) | Dim duration before | Dim duration After 15 3 4.95 30 6 9.9 60 7 19.8 120 7 20 300 7 20 600 7 20 Bug: 315246849 Flag: EXEMPT resource only update Test: Build & Verify the dim duration with each setting. Change-Id: I424ec169893f8ef42f3dd601f5f122eb160cc42c --- overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index f6b7439..2678633 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -518,4 +518,11 @@ com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE + + + 20000 + + + 33% From 80a5a81d072d82c3a5e6af74028fc6ac09fc302a Mon Sep 17 00:00:00 2001 From: Gary Jian Date: Thu, 1 Aug 2024 13:02:23 +0000 Subject: [PATCH 053/117] Use new format of sit_net_radio_access_specifier Bug: 353545247 Test: manual Flag: NONE, Vendor change does not support flags Change-Id: I50c5aad2f414d2cef9cb0ead9fd7374bd7639705 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index 44c52ca..07d6a90 100644 --- a/device.mk +++ b/device.mk @@ -1040,6 +1040,8 @@ SUPPORT_NR_DS := true USE_RADIO_HAL_2_1 := true # Using Early Send Device Info USE_EARLY_SEND_DEVICE_INFO := true +# Using New Radio Access Format to modem +USE_NEW_RADIO_ACCESS_SPECIFIER_FORMAT := true #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) #$(call inherit-product, vendor/google_devices/zumapro/proprietary/device-vendor.mk) From a17b16ccbda6c94e55bb1859c85c4253ce798b10 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Thu, 1 Aug 2024 08:04:16 -0700 Subject: [PATCH 054/117] 16kb: Move efs rw partitions to its own fstab file The efs read/write partitions will be part of the fstab.rw.efs file and will have their own RC file to mount them. This change allows us to identify the different partitions and their types. It will also make easier to select different RC files depending on the page size. Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I3eb877ecc3ccf435110ee0da4a949b44729b3bdb --- conf/fstab.rw.efs | 6 ++++++ conf/fstab.zumapro.in | 3 --- conf/init.efs.rc | 5 +++++ conf/init.zumapro.board.rc | 2 +- device.mk | 6 ++++-- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 conf/fstab.rw.efs create mode 100644 conf/init.efs.rc diff --git a/conf/fstab.rw.efs b/conf/fstab.rw.efs new file mode 100644 index 0000000..1047887 --- /dev/null +++ b/conf/fstab.rw.efs @@ -0,0 +1,6 @@ +# Android fstab file for efs partitions +# +# +/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable diff --git a/conf/fstab.zumapro.in b/conf/fstab.zumapro.in index 779b259..bcb0c2f 100644 --- a/conf/fstab.zumapro.in +++ b/conf/fstab.zumapro.in @@ -14,9 +14,6 @@ vendor /vendor vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait /dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount diff --git a/conf/init.efs.rc b/conf/init.efs.rc new file mode 100644 index 0000000..434feb9 --- /dev/null +++ b/conf/init.efs.rc @@ -0,0 +1,5 @@ +on early-init + mount_all /vendor/etc/fstab.persist --early + +on late-fs + mount_all /vendor/etc/fstab.efs --early diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 506d282..6f24fc1 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -1,10 +1,10 @@ import /vendor/etc/init/hw/init.zumapro.usb.rc +import /vendor/etc/init/hw/init.efs.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.soc.rc on early-init - mount_all /vendor/etc/fstab.persist --early write /proc/sys/kernel/sched_pelt_multiplier 1 write /sys/kernel/mm/lru_gen/enabled n diff --git a/device.mk b/device.mk index 44c52ca..425b888 100644 --- a/device.mk +++ b/device.mk @@ -438,7 +438,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.zumapro.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.soc.rc \ device/google/zumapro/conf/init.zuma.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.soc.rc \ - device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc + device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc \ + device/google/zumapro/conf/init.efs.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -465,7 +466,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ - device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.rw.efs:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs # Shell scripts PRODUCT_PACKAGES += \ From 82e7a82825ccf2c9ab89ca89695d98eb389b226d Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Thu, 1 Aug 2024 10:35:05 -0700 Subject: [PATCH 055/117] 16kb: Config rw filesystem based on TARGET_RW_FILE_SYSTEM_TYPE The TARGET_RW_FILE_SYSTEM_TYPE will contain the rw filesystem to use. The rw filesystem for the devices can be f2fs or ext4. If TARGET_RW_FILE_SYSTEM_TYPE is not defined, the default fs will be f2fs. Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: Ib087a06a98525ca449253dffce9df470a05432d3 --- conf/Android.bp | 110 +----------- conf/ext4/Android.bp | 164 ++++++++++++++++++ conf/ext4/fstab.rw.zumapro.ext4 | 5 + conf/f2fs/Android.bp | 164 ++++++++++++++++++ conf/f2fs/fstab.rw.zumapro.f2fs | 5 + ...{fstab.zumapro.in => fstab.zumapro.common} | 2 - device.mk | 8 + 7 files changed, 349 insertions(+), 109 deletions(-) create mode 100644 conf/ext4/Android.bp create mode 100644 conf/ext4/fstab.rw.zumapro.ext4 create mode 100644 conf/f2fs/Android.bp create mode 100644 conf/f2fs/fstab.rw.zumapro.f2fs rename conf/{fstab.zumapro.in => fstab.zumapro.common} (78%) diff --git a/conf/Android.bp b/conf/Android.bp index ef95c54..0185c98 100644 --- a/conf/Android.bp +++ b/conf/Android.bp @@ -14,16 +14,6 @@ * limitations under the License. */ -// By default this device uses hardware-wrapped keys for storage encryption, -// which is intended to offer increased security over the traditional method -// (software keys). However, hardware-wrapped keys aren't compatible with -// FIPS-140 certification of the encryption hardware, and hence we have to -// disable the use of them in FIPS mode. This requires having two fstab files: -// one for the default mode, and one for FIPS mode selectable via -// androidboot.fstab_suffix on the kernel command line. These fstabs should be -// identical with the exception of the encryption settings, so to keep them in -// sync the rules below generate them from a template file. - package { // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import @@ -33,102 +23,8 @@ package { default_applicable_licenses: ["device_google_zumapro_license"], } -genrule { - name: "gen_fstab.zuma-hw-encrypt", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zuma"], - cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + - " -e s/@inlinecrypt@/inlinecrypt/ " + - " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +filegroup { + name: "fstab.zumapro.common", + srcs: ["fstab.zumapro.common"], } -genrule { - name: "gen_fstab.zumapro-hw-encrypt", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zumapro"], - cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + - " -e s/@inlinecrypt@/inlinecrypt/ " + - " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", -} - -genrule { - name: "gen_fstab.zuma-sw-encrypt", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zuma"], - cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + - " -e s/@inlinecrypt@// " + - " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", -} - -genrule { - name: "gen_fstab.zumapro-sw-encrypt", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zumapro"], - cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + - " -e s/@inlinecrypt@// " + - " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", -} - -genrule { - name: "gen_fstab.zuma-no-encrypt", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zuma"], - cmd: "sed -e s/@fileencryption@//" + - " -e s/@inlinecrypt@// " + - " -e s/@metadata_encryption@// $(in) > $(out)", -} - -genrule { - name: "gen_fstab.zumapro-no-encrypt", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zumapro"], - cmd: "sed -e s/@fileencryption@//" + - " -e s/@inlinecrypt@// " + - " -e s/@metadata_encryption@// $(in) > $(out)", -} - -genrule { - name: "gen_fstab.zuma-fips", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zuma-fips"], - cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + - " -e s/@inlinecrypt@/inlinecrypt/ " + - " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", -} - -genrule { - name: "gen_fstab.zumapro-fips", - srcs: ["fstab.zumapro.in"], - out: ["fstab.zumapro-fips"], - cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + - " -e s/@inlinecrypt@/inlinecrypt/ " + - " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", -} - -prebuilt_etc { - name: "fstab.zuma", - src: ":gen_fstab.zuma-hw-encrypt", - vendor: true, - vendor_ramdisk_available: true, -} - -prebuilt_etc { - name: "fstab.zumapro", - src: ":gen_fstab.zumapro-hw-encrypt", - vendor: true, - vendor_ramdisk_available: true, -} - -prebuilt_etc { - name: "fstab.zuma-fips", - src: ":gen_fstab.zuma-fips", - vendor: true, - vendor_ramdisk_available: true, -} - -prebuilt_etc { - name: "fstab.zumapro-fips", - src: ":gen_fstab.zumapro-fips", - vendor: true, - vendor_ramdisk_available: true, -} diff --git a/conf/ext4/Android.bp b/conf/ext4/Android.bp new file mode 100644 index 0000000..0a2cc96 --- /dev/null +++ b/conf/ext4/Android.bp @@ -0,0 +1,164 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// By default this device uses hardware-wrapped keys for storage encryption, +// which is intended to offer increased security over the traditional method +// (software keys). However, hardware-wrapped keys aren't compatible with +// FIPS-140 certification of the encryption hardware, and hence we have to +// disable the use of them in FIPS mode. This requires having two fstab files: +// one for the default mode, and one for FIPS mode selectable via +// androidboot.fstab_suffix on the kernel command line. These fstabs should be +// identical with the exception of the encryption settings, so to keep them in +// sync the rules below generate them from a template file. + +soong_namespace { + imports: [ + "device/google/zumapro", + ], +} + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_zumapro_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_zumapro_license"], +} + +genrule { + name: "gen_fstab.zuma-hw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-hw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-sw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-sw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-no-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@//" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@// $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-no-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@//" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@// $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-fips", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zuma-fips"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-fips", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.ext4", + ], + out: ["fstab.zumapro-fips"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", +} + +prebuilt_etc { + name: "fstab.zuma", + src: ":gen_fstab.zuma-hw-encrypt", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zumapro", + src: ":gen_fstab.zumapro-hw-encrypt", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zuma-fips", + src: ":gen_fstab.zuma-fips", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zumapro-fips", + src: ":gen_fstab.zumapro-fips", + vendor: true, + vendor_ramdisk_available: true, +} diff --git a/conf/ext4/fstab.rw.zumapro.ext4 b/conf/ext4/fstab.rw.zumapro.ext4 new file mode 100644 index 0000000..b548c13 --- /dev/null +++ b/conf/ext4/fstab.rw.zumapro.ext4 @@ -0,0 +1,5 @@ +# Android fstab file for /data and /metadata partitions. +# +# +/dev/block/platform/13200000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/userdata /data ext4 noatime,nosuid,nodev latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,reservedsize=128M,readahead_size_kb=128 diff --git a/conf/f2fs/Android.bp b/conf/f2fs/Android.bp new file mode 100644 index 0000000..bcaf11d --- /dev/null +++ b/conf/f2fs/Android.bp @@ -0,0 +1,164 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// By default this device uses hardware-wrapped keys for storage encryption, +// which is intended to offer increased security over the traditional method +// (software keys). However, hardware-wrapped keys aren't compatible with +// FIPS-140 certification of the encryption hardware, and hence we have to +// disable the use of them in FIPS mode. This requires having two fstab files: +// one for the default mode, and one for FIPS mode selectable via +// androidboot.fstab_suffix on the kernel command line. These fstabs should be +// identical with the exception of the encryption settings, so to keep them in +// sync the rules below generate them from a template file. + +soong_namespace { + imports: [ + "device/google/zumapro", + ], +} + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_zumapro_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_zumapro_license"], +} + +genrule { + name: "gen_fstab.zuma-hw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-hw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-sw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-sw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-no-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@//" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@// $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-no-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@//" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@// $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-fips", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zuma-fips"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-fips", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.f2fs", + ], + out: ["fstab.zumapro-fips"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", +} + +prebuilt_etc { + name: "fstab.zuma", + src: ":gen_fstab.zuma-hw-encrypt", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zumapro", + src: ":gen_fstab.zumapro-hw-encrypt", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zuma-fips", + src: ":gen_fstab.zuma-fips", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zumapro-fips", + src: ":gen_fstab.zumapro-fips", + vendor: true, + vendor_ramdisk_available: true, +} diff --git a/conf/f2fs/fstab.rw.zumapro.f2fs b/conf/f2fs/fstab.rw.zumapro.f2fs new file mode 100644 index 0000000..77ec4d5 --- /dev/null +++ b/conf/f2fs/fstab.rw.zumapro.f2fs @@ -0,0 +1,5 @@ +# Android fstab file for /data and /metadata partitions. +# +# +/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device diff --git a/conf/fstab.zumapro.in b/conf/fstab.zumapro.common similarity index 78% rename from conf/fstab.zumapro.in rename to conf/fstab.zumapro.common index bcb0c2f..a5521b7 100644 --- a/conf/fstab.zumapro.in +++ b/conf/fstab.zumapro.common @@ -15,8 +15,6 @@ vendor_dlkm /vendor_dlkm /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait -/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device /dev/block/platform/13200000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount /devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto diff --git a/device.mk b/device.mk index 425b888..cc9fa53 100644 --- a/device.mk +++ b/device.mk @@ -454,6 +454,14 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc # Fstab files +ifeq (ext4,$(TARGET_RW_FILE_SYSTEM_TYPE)) +PRODUCT_SOONG_NAMESPACES += \ + device/google/zumapro/conf/ext4 +else +PRODUCT_SOONG_NAMESPACES += \ + device/google/zumapro/conf/f2fs +endif + PRODUCT_PACKAGES += \ fstab.zuma \ fstab.zumapro \ From 3bce0452020346c66e949bae6e2486c62d6fc515 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 18 Jul 2024 09:11:26 +0000 Subject: [PATCH 056/117] Upgrade IDisplay to V13 Bug: 315496839 Flag: EXEMPT bugfix Test: build pass Change-Id: I253d4754e2321b888a92ed68a061fb2c7da33f13 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 9ac01cd..d935d9a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -114,7 +114,7 @@ com.google.hardware.pixel.display - 12 + 13 IDisplay default From c0e32b0beab7f08c968fe4fa04a3f015899c3d48 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Mon, 5 Aug 2024 18:41:26 +0800 Subject: [PATCH 057/117] dumpstate: Modify dumpTcpc path and content Ported from I248fb250b94cbd4078e7f3c44da83f62002b53fb with some modifications. Bug: 357543284 Test: checked the content in dumpstate Flag: EXEMPT bugfix Change-Id: I35502167baedb96b58f214cb6842fb1ea4dee3e0 Signed-off-by: Kyle Tso --- dumpstate/dump_power.cpp | 64 ++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 95d2b72..79cf28a 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -268,48 +268,42 @@ void dumpLogBufferTcpm() { } void dumpTcpc() { - int ret; - const char* max77759TcpcHead = "TCPC"; - const char* i2cSubDirMatch = "i2c-"; - const char* directory = "/sys/devices/platform/10d60000.hsi2c/"; - const char* max77759Tcpc [][2] { - {"registers:", "/i2c-max77759tcpc/registers"}, - {"frs:", "/i2c-max77759tcpc/frs"}, - {"auto_discharge:", "/i2c-max77759tcpc/auto_discharge"}, - {"bcl2_enabled:", "/i2c-max77759tcpc/bcl2_enabled"}, - {"cc_toggle_enable:", "/i2c-max77759tcpc/cc_toggle_enable"}, - {"containment_detection:", "/i2c-max77759tcpc/containment_detection"}, - {"containment_detection_status:", "/i2c-max77759tcpc/containment_detection_status"}, + const char* max77759TcpcHead = "TCPC Device Attributes"; + const char* directory = "/sys/class/typec/port0/device"; + const char* max77759Tcpc [] { + "auto_discharge", + "bc12_enabled", + "cc_toggle_enable", + "contaminant_detection", + "contaminant_detection_status", + "frs", + "irq_hpd_count", + "non_compliant_reasons", + "sbu_pullup", + "update_sdp_enum_timeout", + "usb_limit_accessory_current", + "usb_limit_accessory_enable", + "usb_limit_sink_current", + "usb_limit_sink_enable", + "usb_limit_source_enable", }; - std::vector files; std::string content; + std::string tcpcRegistersPath(std::string(directory) + "/registers"); + + dumpFileContent("TCPC Registers", tcpcRegistersPath.c_str()); printTitle(max77759TcpcHead); - ret = getFilesInDir(directory, &files); - if (ret < 0) { - for (auto &tcpcVal : max77759Tcpc) - printf("%s\n", tcpcVal[0]); - return; - } - - for (auto &file : files) { - for (auto &tcpcVal : max77759Tcpc) { - printf("%s ", tcpcVal[0]); - if (std::string::npos == std::string(file).find(i2cSubDirMatch)) { - continue; - } - - std::string fileName = directory + file + "/" + std::string(tcpcVal[1]); - - if (!android::base::ReadFileToString(fileName, &content)) { - continue; - } - - printf("%s\n", content.c_str()); - } + for (auto& tcpcVal : max77759Tcpc) { + std::string filename = std::string(directory) + "/" + std::string(tcpcVal); + printf("%s: ", tcpcVal); + android::base::ReadFileToString(filename, &content); + if (!content.empty() && (content.back() == '\n' || content.back() == '\r')) + content.pop_back(); + printf("%s\n", content.c_str()); } + printf("\n"); } void dumpPdEngine() { From b616d05cca35308d596176bdeaccf80e8c5e56d5 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Mon, 5 Aug 2024 19:22:26 +0800 Subject: [PATCH 058/117] dumpstate: Dump manual_disable_vbus in TCPC Bug: 335368150 Bug: 344686002 Bug: 352490157 Flag: EXEMPT bugfix Change-Id: I1f6cc8bc830d4e23e86b0fc93fa49f2944835cda Signed-off-by: Kyle Tso --- dumpstate/dump_power.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 79cf28a..0c54118 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -270,6 +270,7 @@ void dumpLogBufferTcpm() { void dumpTcpc() { const char* max77759TcpcHead = "TCPC Device Attributes"; const char* directory = "/sys/class/typec/port0/device"; + // alphabetic order const char* max77759Tcpc [] { "auto_discharge", "bc12_enabled", @@ -278,6 +279,7 @@ void dumpTcpc() { "contaminant_detection_status", "frs", "irq_hpd_count", + "manual_disable_vbus", "non_compliant_reasons", "sbu_pullup", "update_sdp_enum_timeout", From 02180ccbb41471cec83181aad7874d20d2a657dd Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Mon, 5 Aug 2024 13:04:56 +0000 Subject: [PATCH 059/117] Revert "init.zumapro.board.rc: Disable util awareness completely" Revert submission 28549770-disable-teo-util-threshold Reason for revert: Causes increase in Late Present frames Reverted changes: /q/submissionid:28549770-disable-teo-util-threshold Bug: 356992601 Bug: 356967550 Signed-off-by: Qais Yousef Change-Id: I7dac74f137f0a9f96ad187172367aaffdbdaf102 --- conf/init.zumapro.board.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 506d282..035271b 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -14,7 +14,8 @@ on init # Set teo as cpu idle governor write /sys/devices/system/cpu/cpuidle/current_governor teo - write /proc/vendor_sched/teo_util_threshold "1024 1024 1024" + # 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 mq-deadline From ece41241bcf3a17d9c85dada465ed0eecd58c561 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 5 Aug 2024 14:16:05 -0700 Subject: [PATCH 060/117] Move the system read only partitions to fstab.ro.system The system/vendor/product read only partitions will be moved to fstab.ro.system file to easily identify them in the future. Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I0402df991160e1fabdfdc5d4e4482320f671ae09 --- conf/Android.bp | 4 +++- conf/fstab.ro.system | 14 ++++++++++++++ conf/fstab.zumapro.common | 11 ----------- 3 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 conf/fstab.ro.system diff --git a/conf/Android.bp b/conf/Android.bp index 0185c98..4741102 100644 --- a/conf/Android.bp +++ b/conf/Android.bp @@ -25,6 +25,8 @@ package { filegroup { name: "fstab.zumapro.common", - srcs: ["fstab.zumapro.common"], + srcs: ["fstab.ro.system", + "fstab.zumapro.common" + ], } diff --git a/conf/fstab.ro.system b/conf/fstab.ro.system new file mode 100644 index 0000000..989604b --- /dev/null +++ b/conf/fstab.ro.system @@ -0,0 +1,14 @@ +# Android fstab file for system/vendor/product partitions +# +# The filesystem that contains the filesystem checker binary (typically /system) cannot +# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK +# +# +system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +# During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. +system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,avb_keys=no_such_key,logical,first_stage_mount,readahead_size_kb=128 +system_ext /system_ext ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +product /product ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +vendor /vendor ext4 noatime,ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 +vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount diff --git a/conf/fstab.zumapro.common b/conf/fstab.zumapro.common index a5521b7..961cac6 100644 --- a/conf/fstab.zumapro.common +++ b/conf/fstab.zumapro.common @@ -1,17 +1,6 @@ # Android fstab file. # -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -# # -system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -# During compliance testing, the previous line would fail (because GSI is ext4), and the next line would be used to mount GSI. -system /system ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta_system,avb_keys=no_such_key,logical,first_stage_mount,readahead_size_kb=128 -system_ext /system_ext ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -product /product ext4 noatime,ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -vendor /vendor ext4 noatime,ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 -vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait From 970dfcb4ee3c38d6bacb80e7eb89363547e96d58 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 5 Aug 2024 16:41:35 -0700 Subject: [PATCH 061/117] Rename fstab.modem to fstab.ro.modem for zumapro devices Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I72d7d4138b23457ba23422e59d7745ab2e2017e0 --- conf/{fstab.modem => fstab.ro.modem} | 0 device.mk | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename conf/{fstab.modem => fstab.ro.modem} (100%) diff --git a/conf/fstab.modem b/conf/fstab.ro.modem similarity index 100% rename from conf/fstab.modem rename to conf/fstab.ro.modem diff --git a/device.mk b/device.mk index cc9fa53..e93ccd8 100644 --- a/device.mk +++ b/device.mk @@ -474,7 +474,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ - device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.ro.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.rw.efs:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs # Shell scripts From 497b93770fe9cfe5e733ca2cb629add7d1169a05 Mon Sep 17 00:00:00 2001 From: samou Date: Tue, 6 Aug 2024 02:37:17 +0000 Subject: [PATCH 062/117] Remove BCL from thermal Flag: EXEMPT tuning changes Bug: 349935208 Change-Id: I2117380350f6a193b484c536cb758c5fb527edf0 Signed-off-by: samou --- conf/init.zumapro.board.rc | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 9923903..99e8b04 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -686,35 +686,6 @@ on post-fs-data chown system system /sys/kernel/metrics/thermal/tr_by_group/spmic/stats_reset on property:vendor.thermal.link_ready=1 - chown system system /dev/thermal/tz-by-name/soc/mode - chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst - chown system system /dev/thermal/tz-by-name/batoilo2/trip_point_0_temp - chown system system /dev/thermal/tz-by-name/batoilo2/trip_point_0_hyst # Thermal chown system system /dev/thermal/tz-by-name/disp_therm/trip_point_0_temp chown system system /dev/thermal/tz-by-name/disp_therm/trip_point_0_hyst From e7b5c5ba0b937b2459bd909d0e3e039c9cc83a0e Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 6 Aug 2024 03:54:39 +0000 Subject: [PATCH 063/117] 16kb: Set PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO in zumapro devices The PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO flag makes sure that the bionic's PAGE_SIZE macro is not used. Bug: 346873199 Test: Built targets $ get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO true Flag: EXEMPT bugfix Change-Id: I267363a23c28edc564b61074f53f223fafdcc2b2 --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index cc9fa53..8aae301 100644 --- a/device.mk +++ b/device.mk @@ -1271,3 +1271,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ # since it can't be overridden from /vendor. PRODUCT_PRODUCT_PROPERTIES += \ dumpstate.strict_run=false + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true From fe3d0dbbfe035032ed723c2b40dc7a273a7d7741 Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Tue, 6 Aug 2024 03:30:57 +0000 Subject: [PATCH 064/117] init.zumapro.soc.rc: Set little core min freq to 820MHz Test: boot to home Bug: 348088963 Flag: NONE init.rc do not support flag Change-Id: I68f3ceaa17559aa27ef8daac98ef69dece39c361 --- conf/init.zumapro.soc.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 7c8efa0..617c840 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -27,6 +27,8 @@ on init write /proc/vendor_sched/groups/fg/prefer_idle 1 write /proc/vendor_sched/groups/sys/uclamp_min 190 write /proc/vendor_sched/groups/sys/prefer_idle 1 + # Make sure little core don't go below 820MHz + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 820000 write /proc/vendor_sched/groups/bg/rampup_multiplier 0 write /proc/vendor_sched/groups/cam/rampup_multiplier 1 From 5cfc68b55b588fd24b44000fdac87a059411738f Mon Sep 17 00:00:00 2001 From: Kuen-Han Tsai Date: Thu, 1 Aug 2024 22:08:09 +0800 Subject: [PATCH 065/117] Limit hub tuning when enable_hub is enabled Some external hubs have the same VID and PID as the internal hub, causing unintended hub tuning and compatibility issues. This patch restricts hub tuning to only the internal hub located on bus 1, port 1 when enable_hub is set to 1. Bug: 353650207 Test: Verified an external GL852G speakerphone dock works when docked. Test: adb shell cmd android.hardware.usb.IUsb/default hub-vendor-cmd Flag: EXEMPT bugfix Change-Id: I381f3883c90628753f0e5e9c11eb546fb15ce679 Signed-off-by: Kuen-Han Tsai --- usb/usb/Usb.cpp | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index d8afb80..aedca4e 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -54,6 +54,7 @@ namespace usb_flags = android::hardware::usb::flags; using aidl::android::frameworks::stats::IStats; using android::base::GetProperty; using android::base::Join; +using android::base::ParseInt; using android::base::ParseUint; using android::base::Tokenize; using android::base::Trim; @@ -101,7 +102,9 @@ constexpr char kThermalZoneForTempReadPrimary[] = "usb_pwr_therm2"; constexpr char kThermalZoneForTempReadSecondary1[] = "usb_pwr_therm"; constexpr char kThermalZoneForTempReadSecondary2[] = "qi_therm"; constexpr char kPogoUsbActive[] = "/sys/devices/platform/google,pogo/pogo_usb_active"; +constexpr char kPogoEnableHub[] = "/sys/devices/platform/google,pogo/enable_hub"; constexpr char kPogoEnableUsb[] = "/sys/devices/platform/google,pogo/enable_usb"; +constexpr char kInternalHubDevnum[] = "/sys/bus/usb/devices/1-1/devnum"; constexpr char kPowerSupplyUsbType[] = "/sys/class/power_supply/usb/usb_type"; constexpr char kIrqHpdCount[] = "irq_hpd_count"; constexpr char kUdcUeventRegex[] = @@ -524,11 +527,16 @@ void updatePortStatus(android::hardware::usb::Usb *usb) { queryVersionHelper(usb, ¤tPortStatus); } -static int usbDeviceRemoved(const char *devname, void* client_data) { - return 0; +static int getInternalHubUniqueId() { + string internalHubDevnum; + int devnum = 0, internalHubUniqueId = -1; + if (ReadFileToString(kInternalHubDevnum, &internalHubDevnum) && + ParseInt(Trim(internalHubDevnum).c_str(), &devnum)) + internalHubUniqueId = 1000 + devnum; + return internalHubUniqueId; } -static int usbDeviceAdded(const char *devname, void* client_data) { +static Status tuneInternalHub(const char *devname, void* client_data) { uint16_t vendorId, productId; struct usb_device *device; ::aidl::android::hardware::usb::Usb *usb; @@ -537,7 +545,7 @@ static int usbDeviceAdded(const char *devname, void* client_data) { device = usb_device_open(devname); if (!device) { ALOGE("usb_device_open failed\n"); - return 0; + return Status::ERROR; } usb = (::aidl::android::hardware::usb::Usb *)client_data; @@ -559,6 +567,26 @@ static int usbDeviceAdded(const char *devname, void* client_data) { usb_device_close(device); + return Status::SUCCESS; +} + +static int usbDeviceRemoved(const char *devname, void* client_data) { + return 0; +} + +static int usbDeviceAdded(const char *devname, void* client_data) { + string pogoEnableHub; + int uniqueId = 0; + + // Enable hub tuning when the pogo dock is connected. + if (ReadFileToString(kPogoEnableHub, &pogoEnableHub) && Trim(pogoEnableHub) == "1") { + // If enable_hub is set to 1, the internal hub is the first enumearted device on bus 1 and + // port 1. + uniqueId = usb_device_get_unique_id_from_name(devname); + if (uniqueId == getInternalHubUniqueId()) + tuneInternalHub(devname, client_data); + } + return 0; } From a1d5c9b4f3c0f1f6701e649ffb0f99ad65100bfe Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 5 Aug 2024 16:50:28 -0700 Subject: [PATCH 066/117] Rename fstab.postinstall to fstab.ro.postinstall for zumapro devices Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I762f8d757739e8c9685df73b7e39f10b4ce25d34 --- conf/{fstab.postinstall => fstab.ro.postinstall} | 0 device.mk | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename conf/{fstab.postinstall => fstab.ro.postinstall} (100%) diff --git a/conf/fstab.postinstall b/conf/fstab.ro.postinstall similarity index 100% rename from conf/fstab.postinstall rename to conf/fstab.ro.postinstall diff --git a/device.mk b/device.mk index 3cb6f7d..ef76fac 100644 --- a/device.mk +++ b/device.mk @@ -1002,7 +1002,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.postinstall.fstab.prefix=/product PRODUCT_COPY_FILES += \ - device/google/zumapro/conf/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall + device/google/zumapro/conf/fstab.ro.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall # fastbootd PRODUCT_PACKAGES += \ From 7e10eefc258d4da511a2f08bd203bbe53c694213 Mon Sep 17 00:00:00 2001 From: Woody Lin Date: Wed, 7 Aug 2024 10:41:12 +0800 Subject: [PATCH 067/117] Disable EHLD Disables EHLD as an workaround since reading PMU event counter currently conflicts with devfreq. Bug: 354380599 Test: Build/Flash Flag: EXEMPT bugfix Change-Id: If8c819fc5baf27c9f6ea4532429bede8c4579072 --- BoardConfig-common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 099c238..a37b49f 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -51,6 +51,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) BOARD_KERNEL_CMDLINE += kunit.enable=1 endif +BOARD_KERNEL_CMDLINE += ehld.noehld=1 + TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) From 23b79507ce3f3601d059416f716d3bc25013799d Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Tue, 16 Jul 2024 12:34:35 +0000 Subject: [PATCH 068/117] init.zumapro.soc.rc: Set disable_util_est knob for each group Set the new disablt_util_est knob for each group. It should be disabled by default except for few select groups. Bug: 336169796 Flag: EXEMPT boot time init script Signed-off-by: Qais Yousef Change-Id: I225b203756c656ee8b8d3157796b6fe5454c9e26 --- conf/init.zumapro.soc.rc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 617c840..ef3dbab 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -44,6 +44,19 @@ on init write /proc/vendor_sched/groups/ta/rampup_multiplier 1 write /proc/vendor_sched/adpf_rampup_multiplier 2 + write /proc/vendor_sched/groups/bg/disable_util_est 1 + write /proc/vendor_sched/groups/cam/disable_util_est 0 + write /proc/vendor_sched/groups/cam_power/disable_util_est 0 + write /proc/vendor_sched/groups/dex2oat/disable_util_est 1 + write /proc/vendor_sched/groups/fg/disable_util_est 1 + write /proc/vendor_sched/groups/nnapi/disable_util_est 1 + write /proc/vendor_sched/groups/ota/disable_util_est 1 + write /proc/vendor_sched/groups/rt/disable_util_est 1 + write /proc/vendor_sched/groups/sf/disable_util_est 0 + write /proc/vendor_sched/groups/sys/disable_util_est 1 + write /proc/vendor_sched/groups/sys_bg/disable_util_est 1 + write /proc/vendor_sched/groups/ta/disable_util_est 0 + # 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 c12ebf0a52b3fbce261f0c8451f2802d08151e78 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 9 Aug 2024 16:22:59 +0800 Subject: [PATCH 069/117] Add FSTAB_OWNERS and update OWNERS to include Android.bp Flag: EXEMPT only changing OWNERS Bug: 357036384 Change-Id: I7be3c9ff48063e708a8e2251d852ce99b39d9345 --- OWNERS | 2 +- conf/OWNERS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 conf/OWNERS diff --git a/OWNERS b/OWNERS index e6ce5d0..d1ffbd2 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:/MK_OWNERS +per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS diff --git a/conf/OWNERS b/conf/OWNERS new file mode 100644 index 0000000..20af85b --- /dev/null +++ b/conf/OWNERS @@ -0,0 +1,2 @@ +# per-file for Pixel fstab +per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS From 333fa47ad80d53a952a5eff322712d81fa0fada4 Mon Sep 17 00:00:00 2001 From: Joen Chen Date: Thu, 18 Jul 2024 00:31:38 +0000 Subject: [PATCH 070/117] init change owners of sysfs nodes frame_interval and expected_present_time init: change file owners of sysfs nodes frame_interval and expected_present_time in order to grant permission for hwcomposer Bug: 330392550 Flag: EXEMPT bugfix Test: swipe home screen, and check the notifyExpectedPresent() Change-Id: Ic8f5f2213c483eaa46cf3a6c1b4baa1b886cb6e4 --- conf/init.zumapro.board.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 035271b..b95a04f 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -409,6 +409,8 @@ on fs 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/devices/platform/exynos-drm/primary-panel/frame_interval + chown system system /sys/devices/platform/exynos-drm/primary-panel/expected_present_time 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 de1ffe682110ec0af2e539fff74b8e2ae30df44f Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Mon, 29 Jul 2024 18:11:29 +0000 Subject: [PATCH 071/117] dump_power: zumapro: add FG dump registers path Bug: 355756379 Test: adb bugreport verify ok Flag: EXEMPT bugfix Change-Id: I58a2a7f79bccbd560440054c2593b0ad6968b84c Signed-off-by: Spade Lee --- dumpstate/dump_power.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp index 0c54118..f373547 100644 --- a/dumpstate/dump_power.cpp +++ b/dumpstate/dump_power.cpp @@ -180,6 +180,7 @@ void dumpMaxFg() { const char *maxfg [][2] = { {"Power supply property maxfg", "/sys/class/power_supply/maxfg/uevent"}, + {"maxfg registers", "/sys/class/power_supply/maxfg/registers_dump"}, {"m5_state", "/sys/class/power_supply/maxfg/m5_model_state"}, {"maxfg logbuffer", "/dev/logbuffer_maxfg"}, {"maxfg_monitor logbuffer", "/dev/logbuffer_maxfg_monitor"}, @@ -187,6 +188,7 @@ void dumpMaxFg() { const char *max77779fgFiles [][2] = { {"Power supply property max77779fg", "/sys/class/power_supply/max77779fg/uevent"}, + {"max77779fg registers", "/sys/class/power_supply/max77779fg/registers_dump"}, {"model_state", "/sys/class/power_supply/max77779fg/model_state"}, {"max77779fg logbuffer", "/dev/logbuffer_max77779fg"}, {"max77779fg_monitor logbuffer", "/dev/logbuffer_max77779fg_monitor"}, @@ -195,6 +197,8 @@ void dumpMaxFg() { const char *maxfgSecondary [][2] = { {"Power supply property maxfg_base", "/sys/class/power_supply/maxfg_base/uevent"}, {"Power supply property maxfg_secondary", "/sys/class/power_supply/maxfg_secondary/uevent"}, + {"maxfg_base registers", "/sys/class/power_supply/maxfg_base/registers_dump"}, + {"maxfg_secondary registers", "/sys/class/power_supply/maxfg_secondary/registers_dump"}, {"model_state", "/sys/class/power_supply/maxfg_base/model_state"}, {"maxfg_base", "/dev/logbuffer_maxfg_base"}, {"maxfg_secondary", "/dev/logbuffer_maxfg_secondary"}, From ced94e11979ea9680d9fd5c8094a5163c644fcfd Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Mon, 29 Jul 2024 18:19:52 +0000 Subject: [PATCH 072/117] 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(); From 6792878186094fbab5f532fd345b2118aa5f42f6 Mon Sep 17 00:00:00 2001 From: Salmax Chang Date: Tue, 13 Aug 2024 19:47:22 +0800 Subject: [PATCH 073/117] init: restorecon and correct the modem efs files Sync the missing operations on modem efs files with the seperated fstab. Bug: 359426567 Flag: EXEMPT bugfix Change-Id: Ib678adc86c36a536ed32861e93d1d973e2c7c34a --- conf/init.efs.rc | 6 ++++++ conf/init.zumapro.board.rc | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/init.efs.rc b/conf/init.efs.rc index 434feb9..a3664d9 100644 --- a/conf/init.efs.rc +++ b/conf/init.efs.rc @@ -3,3 +3,9 @@ on early-init on late-fs mount_all /vendor/etc/fstab.efs --early + restorecon_recursive /mnt/vendor/efs + chown radio system /mnt/vendor/efs + restorecon_recursive /mnt/vendor/efs_backup + chown radio system /mnt/vendor/efs_backup + restorecon_recursive /mnt/vendor/modem_userdata + chown radio system /mnt/vendor/modem_userdata diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index ecd7440..6c288fc 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -360,12 +360,6 @@ on property:persist.vendor.radio.no_modem_board=1 on fs mount_all --early - restorecon_recursive /mnt/vendor/efs - chown radio system /mnt/vendor/efs - restorecon_recursive /mnt/vendor/efs_backup - chown radio system /mnt/vendor/efs_backup - restorecon_recursive /mnt/vendor/modem_userdata - chown radio system /mnt/vendor/modem_userdata # for battery defender mkdir /mnt/vendor/persist/battery 0700 system system From 7a2d14c2e9bcc95595c7d5dc79f442ed78868776 Mon Sep 17 00:00:00 2001 From: Terry Huang Date: Wed, 14 Aug 2024 05:45:47 +0000 Subject: [PATCH 074/117] Optional building Vendor Telephony proprietary by flag Bug: 359410792 Change-Id: I0edcdc1a9103741c603e01c58fe55e8e8c3c060a Test: Build pass Flag: EXEMPT bugfix --- device-common.mk | 2 ++ device.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/device-common.mk b/device-common.mk index b67982a..1e4691a 100644 --- a/device-common.mk +++ b/device-common.mk @@ -14,7 +14,9 @@ # limitations under the License. # +ifneq ($(BOARD_WITHOUT_RADIO), true) -include vendor/google_devices/zumapro/proprietary/telephony/device-vendor.mk +endif include device/google/zumapro/device.mk # Telephony diff --git a/device.mk b/device.mk index ee2b146..75c16f6 100644 --- a/device.mk +++ b/device.mk @@ -96,8 +96,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 # Include vendor telephony soong namespace +ifneq ($(BOARD_WITHOUT_RADIO), true) PRODUCT_SOONG_NAMESPACES += \ vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) +endif ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) #Set IKE logs to verbose for WFC From 3ad1508be9d01d00e2cf04e9a27bff5228e2be52 Mon Sep 17 00:00:00 2001 From: Thomas Nguyen Date: Mon, 12 Aug 2024 09:25:30 -0700 Subject: [PATCH 075/117] Use US geofence with better fidelity Flag: EXEMPT resource only update Bug: 357888681 Test: Manually verify using satellite S2 lookup tools and system test with Skylo network Test: 359574234 Change-Id: I05f9b6bafb1802c2c543ecaa8f66ecff560f50e9 --- telephony/README.md | 5 +++++ telephony/sats2.dat | Bin 63474 -> 69213 bytes 2 files changed, 5 insertions(+) create mode 100644 telephony/README.md diff --git a/telephony/README.md b/telephony/README.md new file mode 100644 index 0000000..5047f73 --- /dev/null +++ b/telephony/README.md @@ -0,0 +1,5 @@ +# Geofence Data Description +- The file `sats2.dat` contains the geofence data for the intersection of the entire US territory +and Skylo satellite coverage. +- Satellite coverage is not available in Hawaii and most parts of Alaska. +- This data has better fidelity than previous versions. \ No newline at end of file diff --git a/telephony/sats2.dat b/telephony/sats2.dat index 577b7af10e8be85d0220c82b6655e21d98fcff2e..ec9a7f4d60a53330a1070d8257d784fdf8fed7a1 100644 GIT binary patch literal 69213 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 St4GbxN=>X%v&dMJrTz=s7q;90 literal 63474 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 From c9f09aaf7ec4ee3fc7f5024fe1dff4afde6f1be7 Mon Sep 17 00:00:00 2001 From: Vadym Omelnytskyi Date: Wed, 14 Aug 2024 19:46:54 +0000 Subject: [PATCH 076/117] display: remove zumapro color data protobuf Remove color data protobuf and command that put protobuf to the Android filesystem Bug: 309149099 Flag: EXEMPT refactor Test: adb shell ls /vendor/etc/display_colordata_cal0.pb Test: change color mode in Display Settings and confirm the same colors Change-Id: I2727e9aa1baa35d814e5909c31b1c22f55885e61 --- device.mk | 2 -- display/display_colordata_cal0.pb | Bin 28275 -> 0 bytes 2 files changed, 2 deletions(-) delete mode 100644 display/display_colordata_cal0.pb diff --git a/device.mk b/device.mk index 75c16f6..8d75da1 100644 --- a/device.mk +++ b/device.mk @@ -847,8 +847,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.1.brightness.dimming.usage? PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.sf.native_mode=2 -PRODUCT_COPY_FILES += \ - device/google/zumapro/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb # limit DPP downscale ratio PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=4 diff --git a/display/display_colordata_cal0.pb b/display/display_colordata_cal0.pb deleted file mode 100644 index 9840d6a229a56b01d787625fe2d87cc50a20bc07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28275 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 TQDu0@Z0@B8D?G!F{G$H{U&&Vj From c0c63a37813641d31618304b46686925b3a16ee7 Mon Sep 17 00:00:00 2001 From: Chinmay Dhodapkar Date: Wed, 14 Aug 2024 23:52:28 +0000 Subject: [PATCH 077/117] Fwk timeout for enable/disable should be greater than the max time PSS takes to enable/disable Bug: 359928177 Test: basic esos Change-Id: I2afa1d8115e2b95f48560427882282f8bf805cb0 --- overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2678633..5741edf 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -321,6 +321,12 @@ com.google.android.satellite + + 240000 + com.google.android.apps.scone From 69a77f0305c1f0ac8d6ea6d8185864f02ff7cb50 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 15 Aug 2024 15:17:05 +0000 Subject: [PATCH 078/117] Add vendor HighPerformanceWI profile For multi-window foreground app group. Bug: 200769420 Test: build pass Flag: NONE vendor task_profiles.json does not support flag Change-Id: I6fb46c9eca2df2b1ca1b105f50c2cc550bb86db8 --- task_profiles.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/task_profiles.json b/task_profiles.json index 732ccd1..ee57c38 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -159,6 +159,21 @@ } ] }, + { + "Name": "HighPerformanceWI", + "Actions": [ + { + "Name": "WriteFile", + "Params": + { + "FilePath": "/proc/vendor_sched/groups/fg_wi/set_task_group", + "ProcFilePath": "/proc/vendor_sched/groups/fg_wi/set_proc_group", + "Value": "", + "LogFailures": "false" + } + } + ] + }, { "Name": "RealtimePerformance", "Actions": [ From cfd26f0431c8a4613492e2f65c12caff3270352c Mon Sep 17 00:00:00 2001 From: Ji Soo Shin Date: Fri, 16 Aug 2024 09:42:00 +0000 Subject: [PATCH 079/117] persist.sys.hdcp_checking: make default drm-only In case of always, we always enable hdcp regardless of drm status. Bug: 359951297 Flag: EXEMPT bugfix Change-Id: I477f5c0cfa1350c295c3722a35ab42fb7a9a73e6 Signed-off-by: Ji Soo Shin --- conf/init.zumapro.usb.rc | 2 +- device.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.zumapro.usb.rc b/conf/init.zumapro.usb.rc index ae67506..331475a 100644 --- a/conf/init.zumapro.usb.rc +++ b/conf/init.zumapro.usb.rc @@ -308,7 +308,7 @@ on property:persist.vendor.usb.displayport.enabled=0 write /sys/class/typec/port0/port0.0/mode1/active "no" on property:persist.sys.hdcp_checking=always - write /sys/module/exynos_hdcp2/parameters/max_ver 2 + write /sys/module/exynos_hdcp2/parameters/max_ver 3 on property:persist.sys.hdcp_checking="drm-only" write /sys/module/exynos_hdcp2/parameters/max_ver 2 diff --git a/device.mk b/device.mk index ee2b146..2009fb4 100644 --- a/device.mk +++ b/device.mk @@ -214,7 +214,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ endif PRODUCT_PROPERTY_OVERRIDES += \ - persist.sys.hdcp_checking=always + persist.sys.hdcp_checking=drm-only USE_LASSEN_OEMHOOK := true ifneq ($(BOARD_WITHOUT_RADIO),true) From 07028ee7653f999b50e7d5b927ab14cb5b420b2f Mon Sep 17 00:00:00 2001 From: Sungcheol Ahn Date: Fri, 16 Aug 2024 09:24:11 +0000 Subject: [PATCH 080/117] [Satellite] added Demo mode esos questionnaire button Test: manual Bug: 359897259 Flag: EXEMPT test only Change-Id: Ia4990d8bde587bb5bcbc459539d129cd8e602345 --- overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2678633..00f01d1 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -519,6 +519,9 @@ com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE + + com.google.android.apps.stargate.ACTION_ESOS_DEMO + 20000 From d1b0250fd7e9874845bc7d0d36feef250d2eaa1d Mon Sep 17 00:00:00 2001 From: Will Song Date: Mon, 15 Jul 2024 13:13:29 -0700 Subject: [PATCH 081/117] devices: Move cpufreq perf settings to gs-common Moving common cpufreq configurations to gs-common. Bug: 335874870 Flag: NONE code refactor Test: boot and check parameters Change-Id: Ieff1185a09b310924ea60ebc4f2fbf6047e8592f Signed-off-by: Will Song --- conf/init.zumapro.soc.rc | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index ef3dbab..72544be 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -1,15 +1,4 @@ on init - 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 - chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/pmu_limit_enable - - chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/memlat_cpuidle_state_aware chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/memlat_cpuidle_state_aware chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/memlat_cpuidle_state_aware @@ -57,17 +46,6 @@ on init write /proc/vendor_sched/groups/sys_bg/disable_util_est 1 write /proc/vendor_sched/groups/ta/disable_util_est 0 - # 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 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 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 500 - # memlat cpuidle awareness setting # FIXME(b/301212469) these nodes missing on zuma pro # TODO(b/308973423) these values need to be tuned From 35162f9a7c13de51688f5e3bc61c61311608037d Mon Sep 17 00:00:00 2001 From: "Pechetty Sravani (xWF)" Date: Mon, 19 Aug 2024 05:33:45 +0000 Subject: [PATCH 082/117] Revert "devices: Move cpufreq perf settings to gs-common" Revert submission 28323508-common_perf_init Reason for revert: Potential culprit for b/360746202- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:28323508-common_perf_init Change-Id: Ice26f3451cec999b3b2b3e2f42c0aa06eff68f75 --- conf/init.zumapro.soc.rc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 72544be..ef3dbab 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -1,4 +1,15 @@ on init + 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 + chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/pmu_limit_enable + + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/memlat_cpuidle_state_aware chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/memlat_cpuidle_state_aware chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/memlat_cpuidle_state_aware @@ -46,6 +57,17 @@ on init write /proc/vendor_sched/groups/sys_bg/disable_util_est 1 write /proc/vendor_sched/groups/ta/disable_util_est 0 + # 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 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 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 500 + # memlat cpuidle awareness setting # FIXME(b/301212469) these nodes missing on zuma pro # TODO(b/308973423) these values need to be tuned From 7f688ffd2877aecf4bebb11f47ed5ee9642cba42 Mon Sep 17 00:00:00 2001 From: Amit Sunil Dhamne Date: Fri, 16 Aug 2024 00:46:36 -0700 Subject: [PATCH 083/117] UsbGadget: Update SDP enum timeout when gadget is pulled up Indicate to the kernel that the usb gadget is pulled up by writing to `update_sdp_enum_timeout` sysfs node. Write to this node will inform the kernel that it can lower the SDP timeout alarm value which is used to detect an SDP port vs a DCP. Bug:356685367 Test: Check `update_sdp_enum_timeout` is written into after usb gadget is pulled up. Verify that the alarm timeout lowers. Flag: EXEMPT bugfix Change-Id: Id3ae7e7a20b236cec6604414a7f81860e868bdd0 (ported from commit d8e2a02998fc1db9be00dab69a213378fb3caede) Signed-off-by: Amit Sunil Dhamne --- usb/gadget/UsbGadget.cpp | 25 +++++++++++++++++++ usb/gadget/UsbGadget.h | 3 +++ usb/usb/android.hardware.usb-service-i2c11.rc | 2 ++ usb/usb/android.hardware.usb-service-i2c6.rc | 2 ++ 4 files changed, 32 insertions(+) diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 5dbf304..3f243ae 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -49,6 +49,7 @@ constexpr char kTcpcDevName[] = "i2c-max77759tcpc"; constexpr char kI2cClientId[] = "0025"; constexpr char kAccessoryLimitCurrent[] = "usb_limit_accessory_current"; constexpr char kAccessoryLimitCurrentEnable[] = "usb_limit_accessory_enable"; +constexpr char kUpdateSdpEnumTimeout[] = "update_sdp_enum_timeout"; UsbGadget::UsbGadget() : mGadgetIrqPath(""), mI2cClientPath("") { @@ -103,6 +104,7 @@ Status UsbGadget::getUsbGadgetIrqPath() { void currentFunctionsAppliedCallback(bool functionsApplied, void *payload) { UsbGadget *gadget = (UsbGadget *)payload; gadget->mCurrentUsbFunctionsApplied = functionsApplied; + gadget->updateSdpEnumTimeout(); } ScopedAStatus UsbGadget::getCurrentUsbFunctions(const shared_ptr &callback, @@ -369,6 +371,28 @@ ScopedAStatus UsbGadget::reset(const shared_ptr &callback, return ScopedAStatus::ok(); } +void UsbGadget::updateSdpEnumTimeout() { + string update_sdp_enum_timeout_path; + + if (mI2cClientPath.empty()) { + for (int i = 0; i < NUM_HSI2C_PATHS; ++i) { + mI2cClientPath = getI2cClientPath(kHsi2cPaths[i], kTcpcDevName, kI2cClientId); + if (mI2cClientPath.empty()) { + ALOGE("%s: Unable to locate i2c bus node", __func__); + } else { + break; + } + } + } + + update_sdp_enum_timeout_path = mI2cClientPath + kUpdateSdpEnumTimeout; + if (!WriteStringToFile("1", update_sdp_enum_timeout_path)) { + ALOGE("%s: Unable to write to %s.", __func__, update_sdp_enum_timeout_path.c_str()); + } else { + ALOGI("%s: Updated SDP enumeration timeout value.", __func__); + } +} + Status UsbGadget::setupFunctions(long functions, const shared_ptr &callback, uint64_t timeout, int64_t in_transactionId) { @@ -427,6 +451,7 @@ Status UsbGadget::setupFunctions(long functions, mCurrentUsbFunctionsApplied = true; if (callback) callback->setCurrentUsbFunctionsCb(functions, Status::SUCCESS, in_transactionId); + updateSdpEnumTimeout(); return Status::SUCCESS; } diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index 7f2d230..94a8d8d 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -115,6 +115,9 @@ struct UsbGadget : public BnUsbGadget { ScopedAStatus setVidPid(const char *vid,const char *pid); + // Indicates to the kernel that the gadget service is ready and the kernel can + // set SDP timeout to a lower value. + void updateSdpEnumTimeout(); std::string mI2cClientPath; private: diff --git a/usb/usb/android.hardware.usb-service-i2c11.rc b/usb/usb/android.hardware.usb-service-i2c11.rc index ba3e657..dd4b86b 100644 --- a/usb/usb/android.hardware.usb-service-i2c11.rc +++ b/usb/usb/android.hardware.usb-service-i2c11.rc @@ -15,6 +15,7 @@ on post-fs chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_current chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_enable chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_source_enable + chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/update_sdp_enum_timeout chown root graphics /sys/devices/platform/110f0000.drmdp/drm-displayport/dp_hotplug_error_code chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/hpd chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/irq_hpd @@ -39,6 +40,7 @@ on post-fs chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_current chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_enable chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_source_enable + chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/update_sdp_enum_timeout chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/dp_hotplug_error_code chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/hpd chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/irq_hpd diff --git a/usb/usb/android.hardware.usb-service-i2c6.rc b/usb/usb/android.hardware.usb-service-i2c6.rc index 5caed19..fac08b3 100644 --- a/usb/usb/android.hardware.usb-service-i2c6.rc +++ b/usb/usb/android.hardware.usb-service-i2c6.rc @@ -15,6 +15,7 @@ on post-fs chown root system /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/usb_limit_sink_current chown root system /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/usb_limit_sink_enable chown root system /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/usb_limit_source_enable + chown root system /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/update_sdp_enum_timeout chown root graphics /sys/devices/platform/110f0000.drmdp/drm-displayport/dp_hotplug_error_code chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/hpd chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/irq_hpd @@ -39,6 +40,7 @@ on post-fs chmod 664 /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/usb_limit_sink_current chmod 664 /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/usb_limit_sink_enable chmod 664 /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/usb_limit_source_enable + chmod 664 /sys/devices/platform/108d0000.hsi2c/i2c-6/6-0025/update_sdp_enum_timeout chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/dp_hotplug_error_code chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/hpd chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/irq_hpd From b171f02f9566a4c0e3a09d647503d876d40fe3f8 Mon Sep 17 00:00:00 2001 From: Amit Sunil Dhamne Date: Fri, 16 Aug 2024 17:48:10 -0700 Subject: [PATCH 084/117] usb: Modify sdp enumeration timeout value in charger mode Write to /sys/class/typec/port<...>/device/update_sdp_enum_timeout to reduce SDP enumeration timeout value when device is in charger mode. This will enable faster detection of a DCP port. Test: Validate (in charger mode) that the sysfs attribute is 1 (meaning lower sdp timeout value is being used). Read dmesg to see print showing timeout value is 5000ms. Bug: 356685367 Flag: EXEMPT bugfix Change-Id: I1bc872911d7f1eab26e62fe6f12fba05608e0f83 (porter from commit 3644ca07e87069fd2bed99f9f1fe13862ad43f62) Signed-off-by: Amit Sunil Dhamne --- conf/init.zumapro.usb.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.zumapro.usb.rc b/conf/init.zumapro.usb.rc index ae67506..53d4137 100644 --- a/conf/init.zumapro.usb.rc +++ b/conf/init.zumapro.usb.rc @@ -291,6 +291,7 @@ on property:sys.usb.config=charger && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "midi" symlink /config/usb_gadget/g1/functions/midi.gs5 /config/usb_gadget/g1/configs/b.1/f1 write /config/usb_gadget/g1/UDC ${sys.usb.controller} + write /sys/class/typec/port0/device/update_sdp_enum_timeout 0x1 setprop sys.usb.state ${sys.usb.config} on property:ro.bootmode=usbuwb From a5372bac754b486d0e140a54ccd744c36be78c92 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 14 Aug 2024 13:57:22 -0700 Subject: [PATCH 085/117] 16kb: Verify that zumapro prebuilts are 16kb compatible Set the product flag PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE to verify that zumapro prebuilts are 16kb compatible. See: https://source.android.com/docs/core/architecture/16kb-page-size/16kb#verify-16kb-alignment Bug: 342466032 Test: Build target Flag: EXEMPT bugfix Change-Id: I026a3094fc84234777f7885e0fec0c12efcd3079 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 75c16f6..c454833 100644 --- a/device.mk +++ b/device.mk @@ -1277,3 +1277,4 @@ PRODUCT_PRODUCT_PROPERTIES += \ dumpstate.strict_run=false PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true From 14e4154b5e8f4bf29b6b36c4255117ce9e383935 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 5 Aug 2024 16:46:29 -0700 Subject: [PATCH 086/117] Rename fstab.persist to fstab.rw.persist for zumaproe devices Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I457f169f14a937d96d8c1a7022455c58b9240b07 --- conf/{fstab.persist => fstab.rw.persist} | 1 - device.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) rename conf/{fstab.persist => fstab.rw.persist} (69%) diff --git a/conf/fstab.persist b/conf/fstab.rw.persist similarity index 69% rename from conf/fstab.persist rename to conf/fstab.rw.persist index 46437c1..b540a1e 100644 --- a/conf/fstab.persist +++ b/conf/fstab.rw.persist @@ -2,4 +2,3 @@ # # Keep persist in an fstab file, since we need to run fsck on it after abnormal shutdown. /dev/block/platform/13200000.ufs/by-name/persist /mnt/vendor/persist f2fs noatime,nosuid,nodev,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,formattable,metadata_csum diff --git a/device.mk b/device.mk index 7e95254..fdeef21 100644 --- a/device.mk +++ b/device.mk @@ -475,7 +475,7 @@ PRODUCT_PACKAGES += \ fstab.zumapro-fips.vendor_ramdisk PRODUCT_COPY_FILES += \ - device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.rw.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.ro.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.rw.efs:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs From ffb6a0852ef1407df050893391c85f796c73e680 Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 28 Aug 2024 07:51:14 +0000 Subject: [PATCH 087/117] audio: set util_clamp_min for s/w spatializer to avoid glitches - power measurement result is on b/262803152#comment5 Bug: 355912013 Test: spatial audio Flag: EXEMPT bugfix Change-Id: I1b0712254875bbecc89cd2355a3eac18d3789666 --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index f21a81d..b962e8e 100644 --- a/device.mk +++ b/device.mk @@ -634,6 +634,9 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 +# Set util_clamp_min for s/w spatializer +PRODUCT_PROPERTY_OVERRIDES += audio.spatializer.effect.util_clamp_min=300 + # Calliope firmware overwrite #PRODUCT_COPY_FILES += \ device/google/zumapro/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \ From bcf7f4be238091973430018be39324b56c1e6281 Mon Sep 17 00:00:00 2001 From: chenkris Date: Wed, 28 Aug 2024 09:19:49 +0000 Subject: [PATCH 088/117] Set permission for local_hbm_delay_frames Bug: 362149568 Test: enroll and authenticate fingerprint Change-Id: I84555689be95f0e0e8d8f1b8b154be438a9483f1 --- 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 2fc685f..9866297 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -392,6 +392,7 @@ on fs chown system system /sys/class/backlight/panel0-backlight/dimming_on chown system system /sys/class/backlight/panel0-backlight/hbm_mode chown system system /sys/class/backlight/panel0-backlight/local_hbm_mode + chown system system /sys/class/backlight/panel0-backlight/local_hbm_delay_frames chown system system /sys/devices/platform/exynos-drm/primary-panel/gamma chown system system /sys/devices/platform/exynos-drm/primary-panel/min_vrefresh chown system system /sys/devices/platform/exynos-drm/primary-panel/idle_delay_ms From ee8b790ce0f921223f3e7f10626c6d3d541d0541 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:56:42 -0700 Subject: [PATCH 089/117] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: I8bc3af1f566e649373aefd12de82ae1195681eb5 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 69a1bcd..5728c90 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 7ebbf913ef090401575738a8d20031745cc12e77 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Sat, 25 Mar 2023 10:25:00 +0000 Subject: [PATCH 090/117] Usb: Update UsbDataStatus while being docked Bug: 275150939 Bug: 357028350 Change-Id: I09499642012c7e95bb5a5fef1ac6eb7b8c4e6832 Signed-off-by: Badhri Jagan Sridharan (ported from ag/22273065) Signed-off-by: Kyle Tso --- usb/usb/Usb.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index aedca4e..43f105f 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -996,7 +996,13 @@ Status getPortStatusHelper(android::hardware::usb::Usb *usb, string pogoUsbActive = "0"; if (ReadFileToString(string(kPogoUsbActive), &pogoUsbActive) && stoi(Trim(pogoUsbActive)) == 1) { - (*currentPortStatus)[i].usbDataStatus.push_back(UsbDataStatus::DISABLED_DOCK); + /* + * Always signal USB device mode disabled irrespective of hub enabled while docked. + * Hub gets automatically enabled as needed. Signalling DISABLED_DOCK_HOST_MODE & + * DEVICE_MODE during pogo direct can cause notifications to show for brief windows + * when the state machine is still moving to steady state. + */ + (*currentPortStatus)[i].usbDataStatus.push_back(UsbDataStatus::DISABLED_DOCK_DEVICE_MODE); dataEnabled = false; } if (!usb->mUsbDataEnabled) { From f16ad492442360d5d6c6f6fb89e2806134ea2a92 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Mon, 31 Jan 2022 15:57:24 -0800 Subject: [PATCH 091/117] Rename enable_usb dev node to move_data_to_usb kernel dev attribute has now been renamed from enable_usb to move_data_to_usb. Update the same. Bug: 251381400 Bug: 357028350 Flag: EXEMPT bugfix Signed-off-by: Badhri Jagan Sridharan Change-Id: I8e4aa0b2e09bfef807f0169eabb79e2fa2e4d2c7 (ported from ag/20309232) Signed-off-by: Kyle Tso --- usb/usb/Usb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 43f105f..4202407 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -103,8 +103,8 @@ constexpr char kThermalZoneForTempReadSecondary1[] = "usb_pwr_therm"; constexpr char kThermalZoneForTempReadSecondary2[] = "qi_therm"; constexpr char kPogoUsbActive[] = "/sys/devices/platform/google,pogo/pogo_usb_active"; constexpr char kPogoEnableHub[] = "/sys/devices/platform/google,pogo/enable_hub"; -constexpr char kPogoEnableUsb[] = "/sys/devices/platform/google,pogo/enable_usb"; constexpr char kInternalHubDevnum[] = "/sys/bus/usb/devices/1-1/devnum"; +constexpr char KPogoMoveDataToUsb[] = "/sys/devices/platform/google,pogo/move_data_to_usb"; constexpr char kPowerSupplyUsbType[] = "/sys/class/power_supply/usb/usb_type"; constexpr char kIrqHpdCount[] = "irq_hpd_count"; constexpr char kUdcUeventRegex[] = @@ -245,12 +245,12 @@ ScopedAStatus Usb::enableUsbDataWhileDocked(const string& in_portName, ALOGI("Userspace enableUsbDataWhileDocked opID:%ld", in_transactionId); int flags = O_RDONLY; - ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(kPogoEnableUsb, flags))); + ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(KPogoMoveDataToUsb, flags))); if (fd != -1) { notSupported = false; - success = WriteStringToFile("1", kPogoEnableUsb); + success = WriteStringToFile("1", KPogoMoveDataToUsb); if (!success) { - ALOGE("Write to enable_usb failed"); + ALOGE("Write to move_data_to_usb failed"); } } From 53452df2c5acf162582656d3be42141da7f48347 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 29 Aug 2024 14:28:14 +0000 Subject: [PATCH 092/117] 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: Ib11681b9a751b1d67d02e9788d888e515d5a3519 --- conf/init.zumapro.soc.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index ef3dbab..ec0f6bc 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -181,9 +181,9 @@ on property:sys.boot_completed=1 write /sys/kernel/vendor_mm/kcompactd_cpu_affinity 7f # Restore prefer idle - 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/ta/preferred_idle_mask_low 0x7f + write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x7f + write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x7f write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0xff write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0xff write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0xff From cd60c30befc0455e1ef8a8c65934f952280a089e Mon Sep 17 00:00:00 2001 From: kellyhung Date: Fri, 23 Aug 2024 13:08:28 +0800 Subject: [PATCH 093/117] Add soong config use_google_qns in device/google/zumapro/device.mk Bug: 360757079 Test: lunch r11-trunk_staging-userdebug; m grilservice Flag: EXEMPT bugfix Change-Id: I3254d83d0aadc403cb6ce6470e601cf336957319 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index fdeef21..9745338 100644 --- a/device.mk +++ b/device.mk @@ -224,6 +224,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) +$(call soong_config_set,grilservice,use_google_qns,true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) From 56e949cdce6dc788ee1c1eb75d9a040a97ddc77b Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Fri, 30 Aug 2024 08:55:46 +0000 Subject: [PATCH 094/117] Revert "16kb: Verify that zumapro prebuilts are 16kb compatible" This reverts commit a5372bac754b486d0e140a54ccd744c36be78c92. Reason for revert: Build break. Bug: 363170018 Bug: 363170018 Bug: 363816648 Change-Id: I1a0d7ad852b375e77aa6c8fff0112e9c1014a56e --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index c454833..75c16f6 100644 --- a/device.mk +++ b/device.mk @@ -1277,4 +1277,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ dumpstate.strict_run=false PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true From c9f3f6d8a1019fcdd9319bfc20381126c9a3aee3 Mon Sep 17 00:00:00 2001 From: Neo Yu Date: Tue, 23 Jul 2024 18:24:10 +0800 Subject: [PATCH 095/117] Move define of hidl radioext to gs-common Bug: 283064367 Test: verify with test ROMs Flag: EXEMPT HAL interface change Change-Id: Ia587c3dbca175e8129acd863909ca68e5df1dd87 --- device_framework_matrix_product.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index d935d9a..bbd11d3 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -143,14 +143,6 @@ default - - vendor.google.radioext - 1.7 - - IRadioExt - default - - vendor.google.wifi_ext 2-3 From 13784c0062373ec4edb439c55903ae8890b84dd9 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Fri, 16 Aug 2024 10:02:37 +0000 Subject: [PATCH 096/117] Set initial value for foreground_window group For multi-window foreground app group. Bug: 200769420 Test: build pass Flag: NONE vendor init file does not support flag Change-Id: Ia20ec09e7b4eade86e013b102f81400898c0c54c --- conf/init.zumapro.soc.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index ef3dbab..ed9f6de 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -27,6 +27,7 @@ on init write /proc/vendor_sched/groups/fg/prefer_idle 1 write /proc/vendor_sched/groups/sys/uclamp_min 190 write /proc/vendor_sched/groups/sys/prefer_idle 1 + write /proc/vendor_sched/groups/fg_wi/prefer_idle 1 # Make sure little core don't go below 820MHz write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 820000 @@ -35,6 +36,7 @@ on init 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/fg_wi/rampup_multiplier 1 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 @@ -49,6 +51,7 @@ on init write /proc/vendor_sched/groups/cam_power/disable_util_est 0 write /proc/vendor_sched/groups/dex2oat/disable_util_est 1 write /proc/vendor_sched/groups/fg/disable_util_est 1 + write /proc/vendor_sched/groups/fg_wi/disable_util_est 0 write /proc/vendor_sched/groups/nnapi/disable_util_est 1 write /proc/vendor_sched/groups/ota/disable_util_est 1 write /proc/vendor_sched/groups/rt/disable_util_est 1 @@ -155,6 +158,7 @@ on zygote-start write /proc/vendor_sched/groups/dex2oat/ug 1 write /proc/vendor_sched/groups/ta/ug 2 write /proc/vendor_sched/groups/fg/ug 2 + write /proc/vendor_sched/groups/fg_wi/ug 2 write /proc/vendor_sched/groups/nnapi/ug 2 write /proc/vendor_sched/groups/rt/ug 2 write /proc/vendor_sched/groups/sf/ug 2 @@ -194,6 +198,7 @@ on property:sys.boot_completed=1 # Setup final cpuset write /dev/cpuset/top-app/cpus 0-7 write /dev/cpuset/foreground/cpus 0-6 + write /dev/cpuset/foreground_window/cpus 0-6 write /dev/cpuset/background/cpus 0-3 write /dev/cpuset/system-background/cpus 0-3 write /dev/cpuset/restricted/cpus 0-3 From 86dc4ddddd487f052127490582e9264f122fc6de Mon Sep 17 00:00:00 2001 From: Charlie Yang Date: Wed, 4 Sep 2024 11:02:52 +0000 Subject: [PATCH 097/117] Revert "Add soong config use_google_qns in device/google/zumapro..." Revert submission 28947244-grilservice Reason for revert: b/363911795 Reverted changes: /q/submissionid:28947244-grilservice Change-Id: Ib13bc42b054a627271c55d06f1190912c824d03d --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 9745338..fdeef21 100644 --- a/device.mk +++ b/device.mk @@ -224,7 +224,6 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) -$(call soong_config_set,grilservice,use_google_qns,true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) From e7925e4638d08dc1f27d143ece4b390f62ac9f58 Mon Sep 17 00:00:00 2001 From: carmenyip Date: Tue, 27 Aug 2024 08:06:29 +0000 Subject: [PATCH 098/117] extended_log: update directory permissions for zumapro Bug: 336638376 Test: verify with `ls -la` on directory Flag: NONE changing directory permissions only Change-Id: Ic978ae7af017a49564507865641db4d9892449cc --- conf/init.zumapro.board.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 9866297..7c62c9d 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -220,7 +220,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 # Modem MDS log folder mkdir /data/vendor/radio/mds 0771 radio system From c0257a0f667aa82a2a2a3204ce8b311a361017b7 Mon Sep 17 00:00:00 2001 From: Yixuan Jiang Date: Tue, 3 Sep 2024 17:15:57 +0800 Subject: [PATCH 099/117] Add pixellogger with non radio Flag: EXEMPT bugfix Bug: 353117906 Change-Id: I9223021c1fd0af8b868b5a8c40cc7c9b620ff0aa Signed-off-by: Yixuan Jiang --- device.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 229369a..95fb930 100644 --- a/device.mk +++ b/device.mk @@ -219,6 +219,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.hdcp_checking=drm-only USE_LASSEN_OEMHOOK := true + +# Pixel Logger +include hardware/google/pixel/PixelLogger/PixelLogger.mk + ifneq ($(BOARD_WITHOUT_RADIO),true) # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. @@ -274,9 +278,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.modem.extensive_logging_enabled=false -# Pixel Logger -include hardware/google/pixel/PixelLogger/PixelLogger.mk - # Use Lassen specifc Shared Modem Platform SHARED_MODEM_PLATFORM_VENDOR := lassen From c0aab4a5f123b00e094bde7f619c11695642731a Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Mon, 9 Sep 2024 13:51:29 +0800 Subject: [PATCH 100/117] Control GoogleDialer built from zumapro/proprietary/GoogleDialer For PDK build, the "vendor/unbundled_google" path doesn't exist. "GoogleDialer" will be built from vendor/google_devices/zumapro/proprietary/GoogleDialer. Flag: EXEMPT bugfix Bug: 364510147 Test: export USES_GOOGLE_DIALER_CARRIER_SETTINGS=true; m GoogleDialer Change-Id: I5c6796036627a5ae208dfda3ea19ead550a55c9a --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index 229369a..7d7ac5a 100644 --- a/device.mk +++ b/device.mk @@ -298,6 +298,8 @@ USE_GOOGLE_DIALER := true USE_GOOGLE_CARRIER_SETTINGS := true PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.uses_google_dialer_carrier_settings=1 +# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true" +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zumapro/proprietary/GoogleDialer endif ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) From fc85b23b29ab74435a6ba91a1509c4d823bcfc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Mon, 9 Sep 2024 17:11:06 +0000 Subject: [PATCH 101/117] Delete PRODUCT_FULL_TREBLE_OVERRIDE. This variable doesn't do anything for devices launching with API level 26 or later, and the initial zumapro devices (Pixel 9) launched with API level 34. Bug: 307369186 Test: presubmit Flag: EXEMPT trivial build cleanup Change-Id: If23568e7e1fc0dff05467e6b4fc97376c06c2233 --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index a37b49f..b21deda 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -16,9 +16,6 @@ include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigPixelCommon.mk -# Should be uncommented after fixing vndk-sp violation is fixed. -PRODUCT_FULL_TREBLE_OVERRIDE := true - # HACK : To fix up after bring up multimedia devices. TARGET_SOC := zumapro From 147b6373f471c5ac0494c2127f7c34c736934437 Mon Sep 17 00:00:00 2001 From: Chia-Chi Teng Date: Tue, 10 Sep 2024 00:42:02 +0000 Subject: [PATCH 102/117] Deprecate preloaded_nanoapps.json Flag: EXEMPT resource only update Bug: 350102369 Test: on device and presubmit Change-Id: I8056d46ef653b3cb6b498b02c5aee18ca22a53d0 --- device.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device.mk b/device.mk index 229369a..5386832 100644 --- a/device.mk +++ b/device.mk @@ -518,8 +518,6 @@ PRODUCT_COPY_FILES += \ ## Enable the CHRE Daemon CHRE_USF_DAEMON_ENABLED := false -PRODUCT_PACKAGES += \ - preloaded_nanoapps.json # Filesystem management tools PRODUCT_PACKAGES += \ From a24d3877e1ecaf7eac4c6f2cf9ab624b99a678f4 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 10 Sep 2024 22:34:41 -0700 Subject: [PATCH 103/117] 16kb: Config fstab for targets that only boot 16kb kernels The zumapro targets that only boot with 16kb kernels will have this filesystem setup for data and metadata partitions: - data partition: f2fs - metadata partition: ext4 Important: For the HW file encryption to work in the data partition in 16kb kernels the `dusize_4k` parameter has to be set: ``` fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0+dusize_4k ``` Bug: 350101696 Test: built pgagnostic target and checked the fs for mounted partitions. Flag: EXEMPT bugfix Change-Id: I566618e6fa1db2ff4463e00e8d091e7226ba0399 --- conf/fs-16kb/Android.bp | 164 +++++++++++++++++++++++++++++ conf/fs-16kb/fstab.rw.zumapro.16kb | 6 ++ 2 files changed, 170 insertions(+) create mode 100644 conf/fs-16kb/Android.bp create mode 100644 conf/fs-16kb/fstab.rw.zumapro.16kb diff --git a/conf/fs-16kb/Android.bp b/conf/fs-16kb/Android.bp new file mode 100644 index 0000000..b6f77a4 --- /dev/null +++ b/conf/fs-16kb/Android.bp @@ -0,0 +1,164 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// By default this device uses hardware-wrapped keys for storage encryption, +// which is intended to offer increased security over the traditional method +// (software keys). However, hardware-wrapped keys aren't compatible with +// FIPS-140 certification of the encryption hardware, and hence we have to +// disable the use of them in FIPS mode. This requires having two fstab files: +// one for the default mode, and one for FIPS mode selectable via +// androidboot.fstab_suffix on the kernel command line. These fstabs should be +// identical with the exception of the encryption settings, so to keep them in +// sync the rules below generate them from a template file. + +soong_namespace { + imports: [ + "device/google/zumapro", + ], +} + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_zumapro_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_zumapro_license"], +} + +genrule { + name: "gen_fstab.zuma-hw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-hw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@/fileencryption=:aes-256-hctr2:inlinecrypt_optimized+wrappedkey_v0+dusize_4k/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=:wrappedkey_v0/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-sw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-sw-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts:aes-256-hctr2/" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@/metadata_encryption=/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-no-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zuma"], + cmd: "sed -e s/@fileencryption@//" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@// $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-no-encrypt", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zumapro"], + cmd: "sed -e s/@fileencryption@//" + + " -e s/@inlinecrypt@// " + + " -e s/@metadata_encryption@// $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zuma-fips", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zuma-fips"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", +} + +genrule { + name: "gen_fstab.zumapro-fips", + srcs: [ + ":fstab.zumapro.common", + "fstab.rw.zumapro.16kb", + ], + out: ["fstab.zumapro-fips"], + cmd: "sed -e s/@fileencryption@/fileencryption=aes-256-xts/" + + " -e s/@inlinecrypt@/inlinecrypt/ " + + " -e s/@metadata_encryption@/metadata_encryption=aes-256-xts/ $(in) > $(out)", +} + +prebuilt_etc { + name: "fstab.zuma", + src: ":gen_fstab.zuma-hw-encrypt", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zumapro", + src: ":gen_fstab.zumapro-hw-encrypt", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zuma-fips", + src: ":gen_fstab.zuma-fips", + vendor: true, + vendor_ramdisk_available: true, +} + +prebuilt_etc { + name: "fstab.zumapro-fips", + src: ":gen_fstab.zumapro-fips", + vendor: true, + vendor_ramdisk_available: true, +} diff --git a/conf/fs-16kb/fstab.rw.zumapro.16kb b/conf/fs-16kb/fstab.rw.zumapro.16kb new file mode 100644 index 0000000..13fc45c --- /dev/null +++ b/conf/fs-16kb/fstab.rw.zumapro.16kb @@ -0,0 +1,6 @@ +# Android fstab file for /data and /metadata partitions. +# +# This fstab is used for devices that only boot 16kb page size kernels. +# +/dev/block/platform/13200000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount +/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device From a14c143c45bc95693a38484278bf9025c920c60e Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 10 Sep 2024 22:43:37 -0700 Subject: [PATCH 104/117] 16kb: Set f2fs block size to 16384 for targets that only boot 16kb kernels The f2fs block size has to be set up to 16384 for 16kb kernels. Bug: 350101696 Test: Built zumapro device and checked mounted partitions Flag: EXEMPT bugfix Change-Id: Ie3bf17d78da62a20882b17363afeb3a3a8a984e0 --- BoardConfig-16k-common.mk | 19 +++++++++++++++++++ BoardConfig-common.mk | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 BoardConfig-16k-common.mk diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk new file mode 100644 index 0000000..229248d --- /dev/null +++ b/BoardConfig-16k-common.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2024 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +ifeq ($(TARGET_BOOTS_16K),true) +BOARD_F2FS_BLOCKSIZE := 16384 +endif diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index b21deda..91cdb4c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -16,6 +16,9 @@ include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigPixelCommon.mk +# Include settings for 16k page size kernel if enabled. +include device/google/zumapro/BoardConfig-16k-common.mk + # HACK : To fix up after bring up multimedia devices. TARGET_SOC := zumapro From 7e4d66612d5f8fbeb810c090932edf6fa6001290 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 10 Sep 2024 22:45:13 -0700 Subject: [PATCH 105/117] 16kb: Select proper fstab for targets that only boot 16kb kernels The 16kb kernels need to select the fstab that has this configurations: - data partition: fstab - metadata partition: ext4 Bug: 350101696 Test: Built zumapro target and checked mounted partitions Flag: EXEMPT bugfix Change-Id: I2fc82946cdbadee7af0b3f6fc026b846fa79a146 --- device.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index a6c6588..43828af 100644 --- a/device.mk +++ b/device.mk @@ -457,7 +457,10 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc # Fstab files -ifeq (ext4,$(TARGET_RW_FILE_SYSTEM_TYPE)) +ifeq (true,$(TARGET_BOOTS_16K)) +PRODUCT_SOONG_NAMESPACES += \ + device/google/zumapro/conf/fs-16kb +else ifeq (ext4,$(TARGET_RW_FILE_SYSTEM_TYPE)) PRODUCT_SOONG_NAMESPACES += \ device/google/zumapro/conf/ext4 else From e767cebf22507593b354e9723ddf7ae3d5e5d420 Mon Sep 17 00:00:00 2001 From: Woody Lin Date: Fri, 13 Sep 2024 01:17:43 +0000 Subject: [PATCH 106/117] Revert "Disable EHLD" This reverts commit 7e10eefc258d4da511a2f08bd203bbe53c694213. Reason for revert: Re-enable EHLD since kernel EHLD issue is fixed. Bug: 354380599 Change-Id: I588c2b96a69cabb7be8d264c9591b61da80fb5e2 --- BoardConfig-common.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index a37b49f..099c238 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -51,8 +51,6 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) BOARD_KERNEL_CMDLINE += kunit.enable=1 endif -BOARD_KERNEL_CMDLINE += ehld.noehld=1 - TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) From d52c3bc6b2efd53627ab2c1585ab25722a5f97b2 Mon Sep 17 00:00:00 2001 From: Cyan Hsieh Date: Tue, 25 Jun 2024 07:59:24 +0000 Subject: [PATCH 107/117] Revert "Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by de..." 7efa373263a34047b58202cdd90c4bd673936ea7 Bug: 312876454 Change-Id: Ifedf3d3a98845830ff4d2b42e333a384926bc266 --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 3389983..f9a01c8 100644 --- a/device.mk +++ b/device.mk @@ -395,6 +395,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # GRAPHICS - GPU (end) # #################### +PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL) + # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ device/google/zumapro/manifest.xml @@ -419,8 +421,6 @@ DEVICE_MATRIX_FILE := \ DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay -PRODUCT_SHIPPING_API_LEVEL := 34 - # RKP VINTF -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk From 959bd67210871d09a7050a3c410087f2b6335df0 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Fri, 13 Sep 2024 15:28:32 +0800 Subject: [PATCH 108/117] Control the modules built from vendor/google_devices/zumapro/prebuilts/gpu For PDK build, the "vendor/arm" path doesn't exist. The modules will be built from vendor/google_devices/zumapro/prebuilts/gpu. Flag: EXEMPT bugfix Bug: 364491703 Test: 1. lunch comet-trunk_staging-eng 2. m libGLES_mali vulkan.mali libOpenCL libgpudataproducer Change-Id: Ie58b2707fb9774f4a3552561b809c3c15d3803ef --- device.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/device.mk b/device.mk index 098092b..48f6c21 100644 --- a/device.mk +++ b/device.mk @@ -324,8 +324,14 @@ else TARGET_USES_VULKAN = true endif +# "vendor/arm" doesn't exist in PDK build +ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp)) +PRODUCT_SOONG_NAMESPACES += \ + vendor/google_devices/zumapro/prebuilts/gpu +else PRODUCT_SOONG_NAMESPACES += \ vendor/arm/mali/valhall +endif $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) # TODO (b/297408842): The gralloc is being open-sourced, and we cannot pass From 619db1107c3fad425dee3f903a33a3cdb00c63fd Mon Sep 17 00:00:00 2001 From: Kuen-Han Tsai Date: Fri, 13 Sep 2024 15:52:49 +0800 Subject: [PATCH 109/117] usb: modify initial_descriptor_timeout to 500ms If the enumeration is too long, it may trigger the watchdog mechanism to cause device reset. Therefore, this patch will modify the timeout. Ported from Change-Id: Ib54d8ff5a1e680fc86f2b89ee0d02d63ee5741d8 (usb: modify the initial_descriptor_timeout to 500ms) Bug: 365715654 Test: verified `initial_descriptor_timeout` is set to 500 Flag: EXEMPT cherry-picked CLs from existing projects Change-Id: I36c5a0ba0a766720cd7d6601cc56f3a883adac8a Signed-off-by: Kuen-Han Tsai --- conf/init.zumapro.usb.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/init.zumapro.usb.rc b/conf/init.zumapro.usb.rc index 6dce47e..2fb3639 100644 --- a/conf/init.zumapro.usb.rc +++ b/conf/init.zumapro.usb.rc @@ -252,6 +252,8 @@ on early-boot setprop vendor.usb.functions.ready 1 on boot + # Set USB timeout + write sys/module/usbcore/parameters/initial_descriptor_timeout 500 # Use USB Gadget HAL setprop sys.usb.configfs 2 # Enable in-kernel media-presence polling for SD cards From 8d3dd98c477d3d6fbf4af19874a28f6ef23bb1f6 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Tue, 17 Sep 2024 11:16:46 -0700 Subject: [PATCH 110/117] [ZumaPro] Change default MTE mode to Asymm. Flag: EXEMPT device rc update Bug: 367730185 Test: build Change-Id: Ifd1efba5c081e6b7612ca82110feac4473aceb74 --- conf/init.zumapro.soc.rc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index ec0f6bc..3852fd3 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -130,6 +130,16 @@ on init write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/stall_floor 2400 write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/stall_floor 500 + # Prefer Asymmetric MTE mode when enabled + write /sys/devices/system/cpu/cpu0/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu1/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu2/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu3/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu4/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu5/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu6/mte_tcf_preferred asymm + write /sys/devices/system/cpu/cpu7/mte_tcf_preferred asymm + on zygote-start # For PixelLogger configuration file. chmod 0771 /data/vendor/wifi From 92b2e67e825b3d1b0cafd9946612b803f237da12 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Thu, 12 Sep 2024 15:26:19 +0800 Subject: [PATCH 111/117] Control the "init_dpm.sh" to be built in zumapro devices Flag: EXEMPT bugfix Bug: 364510147 Test: lunch comet-trunk_staging-eng && m init_dpm.sh Change-Id: I43e7614e1ec0d8b62b35af6ae6774340e9248577 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index d7acb2a..916c98b 100644 --- a/device.mk +++ b/device.mk @@ -80,6 +80,7 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/zumapro \ device/google/zumapro/powerstats \ vendor/google_devices/common/chre/host/hal \ + vendor/google_devices/zumapro/proprietary/debugpolicy \ vendor/google/whitechapel/tools \ vendor/google/interfaces \ vendor/google_nos/host/android \ From c2a8604f034ba55a32cf0961a2c30365d0abaf4a Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Mon, 1 Jul 2024 06:48:41 +0000 Subject: [PATCH 112/117] Add input event profile to mitigate input latency of input threads Bug: 347122505 Test: check the priority and latency of input thread in Perffeto Flag: NONE early device setting updates Change-Id: Ib4f7efd03bb7118b32538b569a6587f4a786ca7b --- conf/init.zumapro.board.rc | 4 ++++ task_profiles.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 7c62c9d..a13f7d9 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -48,6 +48,8 @@ on init chown system system /proc/vendor_sched/prefer_idle_clear chown system system /proc/vendor_sched/pmu_poll_enable chown system system /proc/vendor_sched/pmu_poll_time + chown system system /proc/vendor_sched/uclamp_fork_reset_clear + chown system system /proc/vendor_sched/uclamp_fork_reset_set chmod 0220 /proc/vendor_sched/groups/bg/set_task_group chmod 0220 /proc/vendor_sched/groups/cam/set_task_group @@ -77,6 +79,8 @@ on init chmod 0220 /proc/vendor_sched/prefer_idle_clear chmod 0660 /proc/vendor_sched/pmu_poll_enable chmod 0220 /proc/vendor_sched/pmu_poll_time + chmod 0220 /proc/vendor_sched/uclamp_fork_reset_clear + chmod 0220 /proc/vendor_sched/uclamp_fork_reset_set start vendor.keymaster-4-0 diff --git a/task_profiles.json b/task_profiles.json index ee57c38..236014b 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -303,6 +303,10 @@ { "Name": "OtaProfiles", "Profiles": [ "OtaPerformance", "ServiceCapacityLow", "LowIoPriority", "TimerSlackHigh" ] + }, + { + "Name": "InputPolicy", + "Profiles": [ "ResetUclampGrp" ] } ] } From 26fefc16908989eecbae769a3f8d82be04541570 Mon Sep 17 00:00:00 2001 From: Sungcheol Ahn Date: Tue, 10 Sep 2024 08:17:55 +0000 Subject: [PATCH 113/117] Force EST loopback for hidden menu testing Test: manual Bug: b/365556180 Flag: EXEMPT test only Change-Id: I581257736e12ec1ebd533f9494855f8132a6c5fe --- overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index cb3e540..6a884c6 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -522,6 +522,9 @@ com.google.android.apps.stargate;com.google.android.apps.stargate.questionnaire.QuestionnaireHomeActivity + + com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE_TEST_WITH_ESP_REPLIES + com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE From 793ad7feb6397b54cfb683debf9a63bbc77d6b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Fri, 20 Sep 2024 19:27:46 +0000 Subject: [PATCH 114/117] Delete TARGET_CPU_VARIANT_RUNTIME. This variable only does something when it differs from TARGET_CPU_VARIANT. Setting it to the same values doesn't do anything. Bug: 368635026 Test: presubmit Flag: EXEMPT trivially safe build cleanup Change-Id: Id2934bc0dcbffb85a43ab020a8208fb85f51432a --- BoardConfig-common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 3c667c0..f3ae9d5 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -30,7 +30,6 @@ TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-2a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := cortex-a55 -TARGET_CPU_VARIANT_RUNTIME := cortex-a55 BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10870000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on From dcaeaf64cf1b7778621ea1e35b4ee96ab291ba2d Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Mon, 23 Sep 2024 12:42:32 +0000 Subject: [PATCH 115/117] Change permission of fg_wi file nodes Bug: 200769420 Test: build pass Flag: NONE vendor init file does not support flag Change-Id: I5830f0faa2230aa8bf66d13f64c3156aab0d8379 --- conf/init.zumapro.board.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 14a6282..92b21e3 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -32,6 +32,7 @@ on init chown system system /proc/vendor_sched/groups/dex2oat/set_task_group chown system system /proc/vendor_sched/groups/cam_power/set_task_group chown system system /proc/vendor_sched/groups/ota/set_task_group + chown system system /proc/vendor_sched/groups/fg_wi/set_task_group chown system system /proc/vendor_sched/groups/bg/set_proc_group chown system system /proc/vendor_sched/groups/cam/set_proc_group chown system system /proc/vendor_sched/groups/fg/set_proc_group @@ -44,6 +45,7 @@ on init chown system system /proc/vendor_sched/groups/dex2oat/set_proc_group chown system system /proc/vendor_sched/groups/cam_power/set_proc_group chown system system /proc/vendor_sched/groups/ota/set_proc_group + chown system system /proc/vendor_sched/groups/fg_wi/set_proc_group chown system system /proc/vendor_sched/prefer_idle_set chown system system /proc/vendor_sched/prefer_idle_clear chown system system /proc/vendor_sched/pmu_poll_enable @@ -63,6 +65,7 @@ on init chmod 0220 /proc/vendor_sched/groups/dex2oat/set_task_group chmod 0220 /proc/vendor_sched/groups/cam_power/set_task_group chmod 0220 /proc/vendor_sched/groups/ota/set_task_group + chmod 0220 /proc/vendor_sched/groups/fg_wi/set_task_group chmod 0220 /proc/vendor_sched/groups/bg/set_proc_group chmod 0220 /proc/vendor_sched/groups/cam/set_proc_group chmod 0220 /proc/vendor_sched/groups/fg/set_proc_group @@ -75,6 +78,7 @@ on init chmod 0220 /proc/vendor_sched/groups/dex2oat/set_proc_group chmod 0220 /proc/vendor_sched/groups/cam_power/set_proc_group chmod 0220 /proc/vendor_sched/groups/ota/set_proc_group + chmod 0220 /proc/vendor_sched/groups/fg_wi/set_proc_group chmod 0220 /proc/vendor_sched/prefer_idle_set chmod 0220 /proc/vendor_sched/prefer_idle_clear chmod 0660 /proc/vendor_sched/pmu_poll_enable From 758649b0b38e0458a3103754c5e5676bcf93147f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Mon, 26 Aug 2024 09:10:27 +0000 Subject: [PATCH 116/117] Set priority task name Set task name and boost value for ExoPlayer:Place thread. Bug: 357956265 Test: build pass Flag: NONE init rc file change does not support flags (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e83b04a10be95d45c6996a8ed000cc328d76f10) Merged-In: I09e79a16b7b6a0675de606b2f65dfbee154ec943 Change-Id: I09e79a16b7b6a0675de606b2f65dfbee154ec943 --- conf/init.zumapro.soc.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 4876919..4ebe1a3 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -230,6 +230,10 @@ on property:sys.boot_completed=1 write /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/pmu_limit_enable 1 write /proc/vendor_sched/pmu_poll_enable 0 + # Set priority task name and boost value + write /proc/vendor_sched/priority_task_name "ExoPlayer:Place" + write /proc/vendor_sched/priority_task_boost_value 742 + # MTE on property:persist.device_config.runtime_native_boot.mode_override=sync # Per-core mode overrides. From 4edd952b94e19754644259b0f7f86c806f25bc96 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Wed, 9 Oct 2024 13:01:31 +0000 Subject: [PATCH 117/117] Set auto prefer idle task name Set InputDispatche and InputReader prefer idle explicitly, which is a workaround and should be removed after they become ADPF. Bug: 366146314 Flag: NONE init rc file change does not support flags Test: tasks set as expected (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76b662b189e0ab7a555d93a8390c792631cc0558) Merged-In: Ica1cc1bcf44205f6ccfb09529a52107b1c5091b3 Change-Id: Ica1cc1bcf44205f6ccfb09529a52107b1c5091b3 --- conf/init.zumapro.soc.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc index 4ebe1a3..6bd32f8 100644 --- a/conf/init.zumapro.soc.rc +++ b/conf/init.zumapro.soc.rc @@ -234,6 +234,9 @@ on property:sys.boot_completed=1 write /proc/vendor_sched/priority_task_name "ExoPlayer:Place" write /proc/vendor_sched/priority_task_boost_value 742 + # To be removed after InputDispatche and InputReader become ADPF + write /proc/vendor_sched/prefer_idle_task_name "InputDispatcher,InputReader" + # MTE on property:persist.device_config.runtime_native_boot.mode_override=sync # Per-core mode overrides.