From 36fff56043f378bed05cf0766ed2a182443eacf7 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Mon, 18 Mar 2024 18:32:21 +0800 Subject: [PATCH 1/2] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I2eca814516b28f95ffba1a94ed0fcfc8b6fa8bd0 --- device-husky.mk | 8 ++++++-- device-ripcurrent.mk | 4 +++- device-shiba.mk | 8 ++++++-- husky/BoardConfig.mk | 4 +++- ripcurrent/BoardConfig.mk | 4 +++- shiba/BoardConfig.mk | 4 +++- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 706195d..b98e51d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -289,8 +289,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk endif @@ -326,8 +328,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q3 else APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk endif diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index f4b6590..39e892d 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -233,8 +233,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk endif diff --git a/device-shiba.mk b/device-shiba.mk index 9abf639..7ed0a77 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -275,8 +275,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk endif @@ -308,8 +310,10 @@ 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% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q3 else APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk endif diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index cef3db2..900136f 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -29,8 +29,10 @@ 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% 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/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 22437b6..dd8cd7a 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -29,8 +29,10 @@ USES_DEVICE_GOOGLE_SHUSKY := true 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/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 116edac..940e42b 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -29,8 +29,10 @@ 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% 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 From 024418b3a24740858e618f1138232775ffe17042 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Mon, 25 Mar 2024 15:56:01 +0000 Subject: [PATCH 2/2] Change set preferred idle mask to top-app Set default value to 0xff to exclude big core for all priorities, but restore high and mid to 0x1ff when app launch. Bug: 248621289 Test: value set correctly Change-Id: If9696e02f2a54f07d5acb974ff0301ea936c53e0 --- perf/powerhint-husky.json | 39 ++++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 39 ++++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 987ecf8..bcde8f1 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -420,6 +420,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", @@ -805,6 +832,18 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskHigh", + "Duration": 5000, + "Value": "0x1ff" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 5735e66..a6ba53d 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -406,6 +406,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 +854,18 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskHigh", + "Duration": 5000, + "Value": "0x1ff" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 90ed3b1..2b6d8f7 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -420,6 +420,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", @@ -805,6 +832,18 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskHigh", + "Duration": 5000, + "Value": "0x1ff" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle",