diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk index 717fea7..90f1034 100644 --- a/akita/BoardConfig.mk +++ b/akita/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 @@ -27,13 +28,9 @@ RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_AKITA_RADIOCFG_DIR) TARGET_BOARD_INFO_FILE := device/google/akita/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := akita -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_AKITA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_AKITA_DIR) +$(call soong_config_set,akita_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_AKITA_DIR)) TARGET_SCREEN_DENSITY := 420 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_AKITA := true @@ -45,3 +42,7 @@ include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/akita/proprietary/BoardConfigVendor.mk include device/google/akita-sepolicy/akita-sepolicy.mk include device/google/akita/wifi/BoardConfig-wifi.mk + +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/5_15/BoardUserdebugModules.mk +endif diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc310/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc310/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc310/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc311/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc311/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc311/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc312/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc312/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc312/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc313/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc313/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc313/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc314/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc314/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc314/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc315/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc315/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc315/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita/overlay/frameworks/base/core/res/res/values-mcc316/config.xml b/akita/overlay/frameworks/base/core/res/res/values-mcc316/config.xml new file mode 100644 index 0000000..6a8c43b --- /dev/null +++ b/akita/overlay/frameworks/base/core/res/res/values-mcc316/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + + diff --git a/akita_generic.mk b/akita_generic.mk new file mode 100644 index 0000000..bb260cd --- /dev/null +++ b/akita_generic.mk @@ -0,0 +1,20 @@ +# +# Copyright 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. +# + +$(call inherit-product, device/google/akita/device-akita.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/aosp_akita.mk b/aosp_akita.mk index 50807be..bf2b33c 100644 --- a/aosp_akita.mk +++ b/aosp_akita.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true $(call inherit-product, device/google/zuma/aosp_common.mk) -$(call inherit-product, device/google/akita/device-akita.mk) +$(call inherit-product, device/google/akita/akita_generic.mk) PRODUCT_NAME := aosp_akita PRODUCT_DEVICE := akita diff --git a/audio/akita/config/audio_platform_configuration.xml b/audio/akita/config/audio_platform_configuration.xml index e4de84f..ceebcf3 100644 --- a/audio/akita/config/audio_platform_configuration.xml +++ b/audio/akita/config/audio_platform_configuration.xml @@ -303,7 +303,7 @@ - + diff --git a/audio/akita/config/audio_policy_configuration.xml b/audio/akita/config/audio_policy_configuration.xml index 3150f07..5a6c86d 100644 --- a/audio/akita/config/audio_policy_configuration.xml +++ b/audio/akita/config/audio_policy_configuration.xml @@ -50,6 +50,9 @@ + - - - - @@ -154,8 +153,6 @@ - - + - - - - @@ -153,8 +152,6 @@ - - diff --git a/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 38309e5..a600ac8 100644 --- a/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/akita/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -130,10 +130,6 @@ - - - - @@ -153,8 +149,6 @@ - - diff --git a/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml b/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml index bf995fe..9365471 100644 --- a/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/akita/config/audio_policy_configuration_le_offload_disabled.xml @@ -49,6 +49,9 @@ + - - - - @@ -157,8 +156,6 @@ - - The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24M_AOC + # APM Uart skip suspend to aovid hold system too long when BT using AOC UART ApmUartSkipSuspend = true + +# Update BQR Event Mask property value +BqrEventMaskValueUpdate = 295006 diff --git a/conf/init.akita.rc b/conf/init.akita.rc index c317eee..4a20af1 100644 --- a/conf/init.akita.rc +++ b/conf/init.akita.rc @@ -13,9 +13,10 @@ on init setprop persist.vendor.se.streset libstreset23 setprop dalvik.vm.dexopt.thermal-cutoff 1 +on fs # Display permissions for SSC mode - chown system system /sys/class/backlight/panel0-backlight/ssc_mode - chmod 664 /sys/class/backlight/panel0-backlight/ssc_mode + chown system system /sys/class/backlight/panel0-backlight/ssc_en + chmod 664 /sys/class/backlight/panel0-backlight/ssc_en on early-boot # Wait for insmod_sh to finish all common modules diff --git a/device-akita.mk b/device-akita.mk index e409819..df24564 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -14,18 +14,19 @@ # limitations under the License. # -PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/release_config_map.textproto) +PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/pixel_2024_midyear/release_config_map.textproto) -TARGET_KERNEL_DIR ?= device/google/akita-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/akita-kernel/kernel-headers - -ifdef RELEASE_GOOGLE_AKITA_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_AKITA_KERNEL_VERSION) +ifdef RELEASE_KERNEL_AKITA_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_AKITA_VERSION) endif -ifdef RELEASE_GOOGLE_AKITA_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers +ifdef RELEASE_KERNEL_AKITA_DIR +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_AKITA_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_AKITA_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/akita-kernels/5.15/trunk +TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernels/5.15/trunk/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.mk) @@ -217,11 +218,11 @@ PRODUCT_PACKAGES += \ # LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default) PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.toggle_visible=false + persist.bluetooth.leaudio.toggle_visible=true # LE Audio use classic connection by default PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio.le_audio_connection_by_default=false + ro.bluetooth.leaudio.le_audio_connection_by_default=true # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. @@ -236,6 +237,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Enable one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -255,6 +260,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.vendor.btsnoop=false endif +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Spatial Audio PRODUCT_PACKAGES += \ libspatialaudio \ @@ -313,13 +322,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q2 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/trunk -endif # include GNSSD include device/google/akita/location/gnssd/device-gnss.mk @@ -335,13 +337,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q2 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/trunk -endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -373,6 +368,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.ois_with_system_imu=true # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.supported_primitives=243 \ @@ -385,8 +381,15 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.settlingtime=5000 # Increment the SVN for any official public releases +ifdef RELEASE_SVN_AKITA +TARGET_SVN ?= $(RELEASE_SVN_AKITA) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 18 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=9 + ro.vendor.build.svn=$(TARGET_SVN) # Keyboard height ratio and bottom padding in dp for portrait mode PRODUCT_PRODUCT_PROPERTIES += \ @@ -403,3 +406,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) # Disable Settings large-screen optimization enabled by Window Extensions PRODUCT_SYSTEM_PROPERTIES += \ persist.settings.large_screen_opt.enabled=false + +# ETM +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif diff --git a/factory_akita.mk b/factory_akita.mk index b834d1e..aae1617 100644 --- a/factory_akita.mk +++ b/factory_akita.mk @@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_ak3_wide_hat_tool + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/location/gnssd/Android.bp b/location/gnssd/Android.bp index f5b180c..1774bd7 100644 --- a/location/gnssd/Android.bp +++ b/location/gnssd/Android.bp @@ -93,4 +93,7 @@ cc_prebuilt_binary { ], }, }, + required: [ + "libcustomgnss", + ], } diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk index d5b6a5c..452d7d9 100644 --- a/location/gnssd/gnss_release.mk +++ b/location/gnssd/gnss_release.mk @@ -1,5 +1,5 @@ # Enable pixel gnss hal service -include device/google/akita/location/gnssd/pixel_gnss_hal.mk +-include vendor/google/gnss/aidl_service/pixel_gnss_hal.mk PRODUCT_PACKAGES += \ gnssd \ diff --git a/location/gnssd/pixel_gnss_hal.mk b/location/gnssd/pixel_gnss_hal.mk deleted file mode 100644 index 6a36473..0000000 --- a/location/gnssd/pixel_gnss_hal.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Enable aidl service -$(call soong_config_set, pixel_gnss, enable_pixel_gnss_aidl_service, true) - -PRODUCT_PACKAGES += \ - android.hardware.gnss-service.pixel - -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.gps.hal.service.name=vendor - -# Compatibility matrix -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \ - device/google/akita/location/gnssd/device_framework_matrix_product.xml diff --git a/location/gnssd/release/android.hardware.gnss-service b/location/gnssd/release/android.hardware.gnss-service index 22efdd8..c96a344 100644 Binary files a/location/gnssd/release/android.hardware.gnss-service and b/location/gnssd/release/android.hardware.gnss-service differ diff --git a/location/gnssd/release/build.properties b/location/gnssd/release/build.properties new file mode 100644 index 0000000..3167c2a --- /dev/null +++ b/location/gnssd/release/build.properties @@ -0,0 +1,7 @@ +BUILD_TIMESTAMP_UTC=2024-04-18 01:11:46.484924 +USER_COMMIT=19011f36bde8ec7bf0f7f60d906e4a019b4e6e43 +GNSS_SW_VER_BRANCH=R4.13 +GNSS_SW_VER_STRING=4.13.2_8_Release_216074 +BASE_COMMIT=f40f31115750f412c4860692772ef6b0b4141105 +WORD_SIZE=arm64 +ANDROID_VERSION=34 diff --git a/location/gnssd/release/gnssd b/location/gnssd/release/gnssd index 9b7cfa8..7946906 100644 Binary files a/location/gnssd/release/gnssd and b/location/gnssd/release/gnssd differ diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg index 5975716..fc32a7e 100644 --- a/location/gnssd/release/gps.cfg +++ b/location/gnssd/release/gps.cfg @@ -110,6 +110,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled (default), 1 = Enabled Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# MTPL: 0 = Disabled, 1 = Enabled (default) +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -118,7 +120,7 @@ Chip_Configuration_FeatureCfg_DFS = 1 # CHUB = 0x8 # The CHUB on the neus continually triggers a bit so this is to prevent # it from continually waking the gnss. -mailboxDisabled=0x8 +mailboxDisabled=0x0 ### Specify RFIC ID for K40 ### # 55200001 = S5520 EVT1 @@ -155,8 +157,9 @@ Agnss_IsGloAidingEnable=0 Agnss_SuplUseCpNi=1 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 @@ -228,7 +231,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_UT2_SEC=10 diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg index ac99937..ed40ec5 100644 --- a/location/gnssd/release/gps_user.cfg +++ b/location/gnssd/release/gps_user.cfg @@ -34,7 +34,8 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 -mailboxDisabled=0x8 +Chip_Configuration_FeatureCfg_MTPL = 0 +mailboxDisabled=0x0 gnss_rfic_chip_id=55200001 UseRtcForAiding=1 rtc_min_num_of_fixes=10 @@ -46,8 +47,9 @@ Agnss_IsGloAidingEnable=0 Agnss_SuplUseCpNi=1 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 @@ -108,7 +110,6 @@ ENABLE_NLP_IN_LPPE=0 ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_UT2_SEC=10 diff --git a/location/gnssd/release/kepler.bin b/location/gnssd/release/kepler.bin index 382b8e5..ba6ea45 100644 Binary files a/location/gnssd/release/kepler.bin and b/location/gnssd/release/kepler.bin differ diff --git a/powerhint-akita.json b/powerhint-akita.json index 923d0dc..3186b4a 100644 --- a/powerhint-akita.json +++ b/powerhint-akita.json @@ -212,6 +212,16 @@ ], "ResetOnInit": true }, + { + "Name": "AutoPreferIdle", + "Path": "/proc/vendor_sched/auto_prefer_idle", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "BigClusterPowerDownTargetResidency", "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency", @@ -423,6 +433,33 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "TAPreferredIdleMaskHigh", + "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", + "Values": [ + "0x1ff", + "0xff" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferredIdleMaskMid", + "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid", + "Values": [ + "0x1ff", + "0xff" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferredIdleMaskLow", + "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low", + "Values": [ + "0x1ff", + "0xff" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -827,6 +864,12 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Node": "AutoPreferIdle", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "LAUNCH_GPU", "Node": "GPUDvfsPeriod", @@ -1028,12 +1071,30 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskHigh", + "Duration": 5000, + "Value": "0x1ff" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "FGPreferIdle", "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "AutoPreferIdle", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -1046,6 +1107,12 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "AutoPreferIdle", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "DISPLAY_CHANGE_GPU", "Node": "GPUDvfsPeriod", @@ -1176,6 +1243,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1266,6 +1339,12 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "AutoPreferIdle", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "FGCpuset", @@ -1386,6 +1465,12 @@ "Duration": 100, "Value": "1" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "CAMERA_ZOOMING_BOOST", "Node": "PMU_POLL", @@ -1602,6 +1687,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1758,6 +1849,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferIdle", @@ -1794,6 +1891,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUDVFSHeadroom", @@ -1938,6 +2041,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUDVFSHeadroom", @@ -2052,6 +2161,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2485,6 +2600,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "AutoPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "FGPreferIdle", @@ -2620,25 +2741,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1852000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { @@ -2834,6 +2949,7 @@ "Value": "20 80" } ], + "GpuSysfsPath" : "/sys/devices/platform/1f000000.mali", "AdpfConfig": [ { "Name": "REFRESH_120FPS", @@ -2857,7 +2973,18 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 40000, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2881,7 +3008,18 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 32500, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2905,7 +3043,18 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 25000, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -2929,7 +3078,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBooost" : false }, { "Name": "UiLowBoostWithoutPid", @@ -2953,7 +3103,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBooost" : false }, { "Name": "UiLowNoneBoost", @@ -2977,7 +3128,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBooost" : false } ] } diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index f43162c..ff45641 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -140,7 +140,7 @@ - true + false true diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json index 71f21ad..fc255eb 100644 --- a/thermal_info_config_akita.json +++ b/thermal_info_config_akita.json @@ -207,10 +207,6 @@ "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 99, 99] @@ -480,7 +476,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -500,7 +496,7 @@ "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -540,6 +536,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 9, 11, 11], "LimitInfo": [0, 0, 0, 0, 0, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -879,6 +884,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true,