From bc102418c52a393c91a626abbfbffb09943dad34 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 7 Apr 2023 23:12:39 +0000 Subject: [PATCH 01/23] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_EfficientBase" value to the ADPF config in the powerhint.json to specify efficient core scheduling in the static case, and "UclampMax_EfficientOffset" for the dynamic case, for this device. Bug: 277285195 Test: manual Change-Id: I1b4858365696f79be0b52276528af470c3eb5961 --- powerhint.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/powerhint.json b/powerhint.json index 9942292..6876f29 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1698,6 +1698,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 400, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1722,6 +1724,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 400, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1746,6 +1750,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 400, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1773,6 +1779,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 400, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1797,6 +1805,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 400, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1821,6 +1831,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 400, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, From 6c243941ba9cbe0835f377f6a95ed1d29e90c94f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 00:03:59 +0000 Subject: [PATCH 02/23] Update bluejay SVN to 58 Bug: 325156176 Change-Id: I2b77dc5a7ddeb6e082710a2515ea1a3398d1fe58 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 6feff8b..e6c744b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -132,7 +132,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=57 + ro.vendor.build.svn=58 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6b60346a7580a63940a3700afd1e37afcabaf7da Mon Sep 17 00:00:00 2001 From: Barry Date: Tue, 5 Mar 2024 09:40:30 +0000 Subject: [PATCH 03/23] BT: set system property for Bluetooth Auto On Set bluetooth.server.automatic_turn_on true for Bluetooth Auto On feature. The feature will be enabled with both system property and flag set. Bug: 328168526 Test: check system property value Change-Id: Id179264d39551a3f52fb92a2ef479a5ade35def3 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index ef5a2c7..5c628fd 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -186,7 +186,8 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ - persist.bluetooth.firmware.selection=BCM.hcd + persist.bluetooth.firmware.selection=BCM.hcd \ + bluetooth.server.automatic_turn_on=true # Set zram size PRODUCT_VENDOR_PROPERTIES += \ From 8b3b8cfbb484ac7a1b504cf4b9ea4df29b5c0aff Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 00:05:22 +0000 Subject: [PATCH 04/23] Update bluejay SVN to 59 Bug: 325156176 Change-Id: Ia7c000f30bb7d19830c83596e9dda76f91debb28 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b300bbc..c05d983 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -144,7 +144,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 3f1de34bf50647d159fad48473f5834ec9caa79e Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 13:54:23 +0800 Subject: [PATCH 05/23] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I9030340e6dfecd9fe49150afb2e58ad5b0f92f4a Signed-off-by: Nina Chen --- device-bluejay.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b300bbc..bfb8396 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -17,16 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/bluejay-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/bluejay-kernel/kernel-headers - ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/bluejay-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/bluejay-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk) From cc1a8946436212346ed46d92c45ce046ce6b84bd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 00:08:18 +0000 Subject: [PATCH 06/23] Update bluejay SVN to 60 Bug: 325156176 Change-Id: I4b8eb00b66dbc3f794f1678b5d5edcfea5fd49b3 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index c05d983..d01abaa 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -144,7 +144,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=60 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 9a8f074c0140915dfd0948d0d0663458e72ad3f0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:39:41 +0000 Subject: [PATCH 07/23] Update bluejay SVN to 61 Bug: 325156176 Change-Id: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index f87ecda..a6c723d 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -145,7 +145,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=60 + ro.vendor.build.svn=61 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e1fef93f63d3e62891e7d2212c9b79bbac701778 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:28:31 +0000 Subject: [PATCH 08/23] Update bluejay SVN to 62 Bug: 330382848 Change-Id: Iae4ad013a81459411eac77c9486ecc8411e0b9b1 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index a6c723d..4b990ed 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -145,7 +145,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=61 + ro.vendor.build.svn=62 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 0d1122b2e9658e5166584dbff2b83790c1f6dcd9 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Thu, 14 Mar 2024 16:03:31 +0000 Subject: [PATCH 09/23] powerhint: set uclampmin_init value for applying CPU Load boost Bug: 329483662 Test: Manual Test Change-Id: Id882cc213befc89f75af6b64c241fbc66e2eec25 --- powerhint.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index 6dc9ebc..3c2da20 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1832,7 +1832,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1856,7 +1856,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1880,7 +1880,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, From 9edb9e7c67d6609238217c23d85af70ec71330b2 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:19:10 +0000 Subject: [PATCH 10/23] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: I7ff73a5552bb8ccae39a52bf259be8b2eeafccc3 --- powerhint.json | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/powerhint.json b/powerhint.json index 3c2da20..dfce97a 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1832,15 +1832,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1856,15 +1856,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1880,15 +1880,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1911,8 +1911,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1935,8 +1933,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1959,8 +1955,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } From 1278fc7ffc92e5f5e77d7386b1a2cdc3a9ceeeb2 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 11 Apr 2024 14:44:17 +0800 Subject: [PATCH 11/23] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I6f75f77ae21fedb4a124159ec0a8d2a3225d1f91 --- bluejay/BoardConfig.mk | 4 +++- device-bluejay.mk | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 94dea6a..d287dbb 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -23,8 +23,10 @@ endif RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/device-bluejay.mk b/device-bluejay.mk index 4b990ed..f7fa0a1 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -52,8 +52,10 @@ include device/google/gs-common/touch/stm/stm11.mk GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk endif @@ -156,8 +158,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk endif From dfef42eaf06919f67b6c1ef8adc4237b6889f039 Mon Sep 17 00:00:00 2001 From: Barry Date: Thu, 11 Apr 2024 15:07:43 +0000 Subject: [PATCH 12/23] [Bluetooth] Disable BT auto on feature Set bluetooth.server.automatic_turn_on false for disable Bluetooth Auto On feature Bug: 333830114 Test: make Change-Id: I51710920158bee1f291262ed73a664cd1de3067e --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4b990ed..d8417fd 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -188,7 +188,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ persist.bluetooth.firmware.selection=BCM.hcd \ - bluetooth.server.automatic_turn_on=true + bluetooth.server.automatic_turn_on=false # Set zram size PRODUCT_VENDOR_PROPERTIES += \ From 4ec979e7986ebbe0015679f15859d8f5d9c04c5a Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:42:14 +0800 Subject: [PATCH 13/23] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: I43eef055d8ff15ae71f1dcb8e78385378234a6ac --- device-bluejay.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index a6c723d..62d130d 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -17,18 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_BLUEJAY_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/bluejay-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/bluejay-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_BLUEJAY_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_BLUEJAY_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) From a390f107efe65b3a2dd168f7f673327a339fb4f7 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 15:35:00 +0800 Subject: [PATCH 14/23] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I6512d22d6d615f39a9f497ef7bc1ee3bc686eb01 --- bluejay/BoardConfig.mk | 12 +++--------- device-bluejay.mk | 18 ------------------ 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index d287dbb..252e397 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -21,15 +21,9 @@ else endif RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true diff --git a/device-bluejay.mk b/device-bluejay.mk index 2ed6df2..a8b7940 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -42,15 +42,6 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/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) @@ -148,15 +139,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk -endif # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 From 6e8bf98d40f2a40fd5e2dcdfd68a801289bf6b47 Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:21:17 +0000 Subject: [PATCH 15/23] Revert "[Bluetooth] Disable BT auto on feature" Revert submission 26919210-BTAUTOOFF4389 Reason for revert: Auto On has been approved for 24Q3 Reverted changes: /q/submissionid:26919210-BTAUTOOFF4389 Change-Id: I45576bc88502a9e42a5af4bb55b4624a4c76e2e8 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index d8417fd..4b990ed 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -188,7 +188,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ persist.bluetooth.firmware.selection=BCM.hcd \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true # Set zram size PRODUCT_VENDOR_PROPERTIES += \ From 7c1707228c8c1751d6f7861c88ea48b5821437f9 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Sat, 27 Apr 2024 01:43:34 +0800 Subject: [PATCH 16/23] audio: remove unused device Bug: 337191827 Test: build pass Change-Id: I6bc3d745dabe5ff8aeca6ad56d74d3c001e1087f Signed-off-by: Carter Hsu --- audio/bluejay/config/audio_policy_configuration.xml | 8 -------- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- 3 files changed, 24 deletions(-) diff --git a/audio/bluejay/config/audio_policy_configuration.xml b/audio/bluejay/config/audio_policy_configuration.xml index 266bf4e..3463cf3 100644 --- a/audio/bluejay/config/audio_policy_configuration.xml +++ b/audio/bluejay/config/audio_policy_configuration.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml index c2e949e..2a64248 100644 --- a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - From 1a07b1edc7a4dc7c54c62bac6b0a0838dd54f71b Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Thu, 2 May 2024 21:03:18 +0800 Subject: [PATCH 17/23] Load fips140.ko before all other kernel modules Bug: 337838109 Bug: 331791671 Change-Id: I823169ea48db8cfdc4c7755e62861de0020887d0 Signed-off-by: Qian-Hao Huang --- bluejay/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 252e397..1ad1be2 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -29,6 +29,7 @@ $(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUE 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_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 From cf0bf3a40a135270c1c3960175dcdb11b9bb8afa Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 1 May 2024 17:59:53 +0800 Subject: [PATCH 18/23] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: Ie8e4a8afe5b0386646b31dba32a107248be70acb --- bluejay/BoardConfig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 252e397..f08699f 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -21,9 +21,9 @@ else endif RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR)) +$(call soong_config_set,bluejay_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true From 1b33bad9d2d4e0416d5f1b298230908c1cc8a05c Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 6 May 2024 14:31:47 +0000 Subject: [PATCH 19/23] gps: Reduce logging mask Bug: 267729515 Bug: 312716075 Test: Verification for logging system. Test: Verification at b/267729515#comment152 Change-Id: I7522585e3810daf4b544bb9acef78ddd01fcb295 --- gps.xml.b3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gps.xml.b3 b/gps.xml.b3 index fd10075..9ee4e24 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -68,7 +68,7 @@ Date: Wed, 15 May 2024 11:47:06 +0000 Subject: [PATCH 20/23] thermal: Remove SOFT_OCP related tzones Bug: 337976702 Test: Confirm boot Change-Id: I06e168898cea7580a666d7c81abb845b615fbf23 Signed-off-by: samou --- thermal_info_config_bluejay.json | 100 ------------------------------- 1 file changed, 100 deletions(-) diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index a8a1166..17b0eb0 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -959,106 +959,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", From 17721a271917b720a118b2a4fa9bd28c60d65278 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 16 May 2024 18:50:22 +0000 Subject: [PATCH 21/23] Adpf:bluejay: enable heuristic boost. Heuristic boost will adjust the ADPF boost profile when the powerhal detects the power session is very janky, providing more boost for deadline sensitive threads managed in the session. Bug: 341111433 Test: adb shell dumpsys android.hardware.power.IPower/default; check the device adpf sessions' traces. Change-Id: Ia581a9578b16356ea7529230e13832dea3129531 --- powerhint.json | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index 82eec3d..b2d3388 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1844,7 +1844,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "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", @@ -1870,7 +1879,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "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", @@ -1896,7 +1914,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", From 3d6495dc827c720a27b83c1feffe641f97a806fd Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Mon, 13 May 2024 08:39:54 +0000 Subject: [PATCH 22/23] Vibrator: Set Soong Config variable - kernel_ver Bug: 340148508 Test: Build and check fw files in all devices. Change-Id: I43f1a3211423abe39d8e28559440d1a8b4b94b4a --- device-bluejay.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 3999e04..9898ba7 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -230,6 +230,7 @@ endif PRODUCT_SHIPPING_API_LEVEL := 32 # 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 \ From a7b7acea91c09d5fb5cc8aab983c0b0e32ad4a35 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 28 May 2024 02:02:27 +0000 Subject: [PATCH 23/23] waves: correct config to fix wrong tuning - remove unused controls since the last version isn't expected multiple instance. Bug: 341323676 Test: manual test Change-Id: I3a3c91ec742a46169cab8c57d32b5faef49603c6 Signed-off-by: Jasmine Cha --- audio/bluejay/tuning/waves/waves_config.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/audio/bluejay/tuning/waves/waves_config.ini b/audio/bluejay/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/bluejay/tuning/waves/waves_config.ini +++ b/audio/bluejay/tuning/waves/waves_config.ini @@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## [HAL_SUPPORTED_CONTROLS] SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so