From cdda43b5d039e6c08f01fb0c85da1e9729e19205 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Mon, 24 Jun 2024 16:31:25 +0000 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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