From 9a2484adcf8e18ba9179dcc48c08a87471be2925 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 27 Feb 2024 16:45:38 +0800 Subject: [PATCH 1/3] Initial Bootloader prebuilt for AP3% build Bug: 326002225 Change-Id: I47a6d882e3403801753858bb215c6dcd017fdbe9 --- device-husky.mk | 4 ++-- device-ripcurrent.mk | 2 +- device-shiba.mk | 4 ++-- husky/BoardConfig.mk | 2 +- ripcurrent/BoardConfig.mk | 2 +- shiba/BoardConfig.mk | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 8218db9..a78e3a8 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -284,7 +284,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk @@ -321,7 +321,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 else APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 8f13185..f4b6590 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -233,7 +233,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk diff --git a/device-shiba.mk b/device-shiba.mk index 06c6ba8..d316501 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -270,7 +270,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 else APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 0f5e382..cef3db2 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -29,7 +29,7 @@ RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index d25edd1..22437b6 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -29,7 +29,7 @@ USES_DEVICE_GOOGLE_SHUSKY := true ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 4ae6c8b..116edac 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -29,7 +29,7 @@ RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk From 53efbd4d47225eadfe254c13d5266bc5d5131670 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 7 Feb 2024 04:19:42 +0000 Subject: [PATCH 2/3] P23 DVFS headroom and ADPF tuning Perf and Power tuning by 1. DVFS headroom from 1280 to 1100 for power saving 2. ADPF Pu from 1.0 to 0.6 Bug: 326322782 Change-Id: Icdbb6dda2472754f5e7fda9803ca885917b1120c --- perf/powerhint-husky.json | 16 ++++++++++++++-- perf/powerhint-shiba.json | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index e88b40f..78206c8 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -249,7 +249,7 @@ "1280", "1100" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1910,6 +1910,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2048,6 +2054,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -2919,7 +2931,7 @@ "Name": "REFRESH_120FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.6, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 2b7d5e1..d272dbf 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -249,7 +249,7 @@ "1280", "1100" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1814,6 +1814,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1952,6 +1958,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -2823,7 +2835,7 @@ "Name": "REFRESH_120FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.6, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, From 26080f1132326914e4ec3bb36db278f0cf7be7d2 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Thu, 29 Feb 2024 07:53:09 +0000 Subject: [PATCH 3/3] shusky: bluetooth configuration source incorrect. Test: build pass. Bug: 327547346 Change-Id: Ifb01dcef086f81a6fa863677a97925005f443f8a --- audio/husky/audio-tables.mk | 2 +- audio/shiba/audio-tables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 7cbcdf4..1506b4e 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index a21cd56..dd809ee 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \