From ccb94f3981c300a8e5bf1c3fec702132feb8ad7d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:37:53 +0000 Subject: [PATCH 01/25] Update oriole SVN to 76 Bug: 313797924 Change-Id: I79b23046dcfc6238eb31964a039c48ddd7e5e46f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 6044ec6..edac624 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -199,7 +199,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=75 + ro.vendor.build.svn=76 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 384d14b4591bb609b1c3c3d4d71df53e34a55f2a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:38:47 +0000 Subject: [PATCH 02/25] Update raven SVN to 76 Bug: 313797924 Change-Id: I921196f7e076adc6c100fd797c85f285759ff791 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 1549d07..1850ba1 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -203,7 +203,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=75 + ro.vendor.build.svn=76 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 68e08bf9de4dbf3f6328ec6022109119d23e4919 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Mon, 25 Dec 2023 17:11:24 +0800 Subject: [PATCH 03/25] audio: support incall capture dl/ul concurrent recording Bug: 317726514 Test: Verified by test build Change-Id: I0194ef5a32eb6676bf1d03107ff6872a557c3e56 Signed-off-by: Carter Hsu --- audio/oriole/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../config/audio_policy_configuration_bluetooth_legacy_hal.xml | 2 +- .../config/audio_policy_configuration_le_offload_disabled.xml | 2 +- audio/raven/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../config/audio_policy_configuration_bluetooth_legacy_hal.xml | 2 +- .../config/audio_policy_configuration_le_offload_disabled.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index f91a44d..b40204e 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index bc18a46..0f85d74 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 90e4a16..a55b5d1 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml index a96e6b3..72748dd 100644 --- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index f91a44d..b40204e 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index bc18a46..0f85d74 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 90e4a16..a55b5d1 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml index a96e6b3..72748dd 100644 --- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml @@ -94,7 +94,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + From 926ef4120ccd0a4fbb9c9c10c58de35e3bc26db5 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Wed, 27 Dec 2023 00:58:22 +0800 Subject: [PATCH 04/25] raviole: control the kernel by release configuration Bug: 317784824 Change-Id: I4aec167fcec9e04590b18fa2bb64a42934b041aa Signed-off-by: Aaron Ding --- device-oriole.mk | 9 +++++++++ device-raven.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index edac624..7218b2b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/raviole-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers +ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers +endif + $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) diff --git a/device-raven.mk b/device-raven.mk index 1850ba1..44853db 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/raviole-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers +endif + $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) From 574d9b1e7f1c17a5a795ea22a1d4f77083d4a94a Mon Sep 17 00:00:00 2001 From: Mao Lee Date: Mon, 8 Jan 2024 04:33:43 +0000 Subject: [PATCH 05/25] powerhint: correct the down rate limit paths for some in-market devices Test: build Bug: 295636226 Change-Id: I937fe16b776ffdb2087a4761ab3e7955b051d005 --- powerhint-oriole.json | 2 +- powerhint-raven.json | 2 +- powerhint-slider.json | 2 +- powerhint-whitefin.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 7161acd..47e6bf1 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -122,7 +122,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" diff --git a/powerhint-raven.json b/powerhint-raven.json index 1dc065c..ebd95a5 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -121,7 +121,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" diff --git a/powerhint-slider.json b/powerhint-slider.json index d8755b1..5726aa9 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -121,7 +121,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 8576d18..d44d6f9 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -121,7 +121,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" From b57a625bb0188fc8aebb5d21cce8824a5500e9dd Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 9 Jan 2024 11:14:10 -0800 Subject: [PATCH 06/25] Revert "powerhint: correct the down rate limit paths for some in-market devices" Bug: 295636226 Test: build This reverts commit 574d9b1e7f1c17a5a795ea22a1d4f77083d4a94a. Change-Id: I942b1953003be8ce96ca6a14eadd1d137e4b062a --- powerhint-oriole.json | 2 +- powerhint-raven.json | 2 +- powerhint-slider.json | 2 +- powerhint-whitefin.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 47e6bf1..7161acd 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -122,7 +122,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" diff --git a/powerhint-raven.json b/powerhint-raven.json index ebd95a5..1dc065c 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -121,7 +121,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" diff --git a/powerhint-slider.json b/powerhint-slider.json index 5726aa9..d8755b1 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -121,7 +121,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index d44d6f9..8576d18 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -121,7 +121,7 @@ }, { "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", "3000" From 2892978d1883a6443a6e2c5cf05b0c9a2f1eafb2 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 9 Jan 2024 11:15:47 -0800 Subject: [PATCH 07/25] Revert "powerhint: game mode tuning" Bug: 295636226 Test: build This reverts commit 52e8289e029569c3a63d55c61ddf7ed3bc284358. Change-Id: I0678592a800a74ce863a78b326016626ce7a5809 --- powerhint-oriole.json | 60 ----------------------------------------- powerhint-raven.json | 60 ----------------------------------------- powerhint-slider.json | 60 ----------------------------------------- powerhint-whitefin.json | 60 ----------------------------------------- 4 files changed, 240 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 7161acd..890fa70 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -585,36 +585,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUDVFSHeadroom", - "Duration": 5000, - "Value": "1280" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 5000, - "Value": "5000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1515,36 +1485,6 @@ "Duration": 0, "Value": "400000" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, - { - "PowerHint": "GAME", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "GAME", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 0, - "Value": "500" - }, - { - "PowerHint": "GAME", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, - { - "PowerHint": "GAME", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-raven.json b/powerhint-raven.json index 1dc065c..e3822af 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -584,36 +584,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUDVFSHeadroom", - "Duration": 5000, - "Value": "1280" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 5000, - "Value": "5000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1496,36 +1466,6 @@ "Duration": 0, "Value": "400000" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, - { - "PowerHint": "GAME", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "GAME", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 0, - "Value": "500" - }, - { - "PowerHint": "GAME", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, - { - "PowerHint": "GAME", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-slider.json b/powerhint-slider.json index d8755b1..73f513a 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -494,36 +494,6 @@ "Duration": 5000, "Value": "107" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUDVFSHeadroom", - "Duration": 5000, - "Value": "1280" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 5000, - "Value": "5000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1372,36 +1342,6 @@ "Duration": 0, "Value": "400000" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, - { - "PowerHint": "GAME", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "GAME", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 0, - "Value": "500" - }, - { - "PowerHint": "GAME", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, - { - "PowerHint": "GAME", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 8576d18..eb09e26 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -485,36 +485,6 @@ "Duration": 5000, "Value": "107" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUDVFSHeadroom", - "Duration": 5000, - "Value": "1280" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 5000, - "Value": "5000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 5000, - "Value": "20000" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1357,36 +1327,6 @@ "Duration": 0, "Value": "400000" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, - { - "PowerHint": "GAME", - "Node": "CPUTaperedDVFSHeadroomEnable", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "GAME", - "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 0, - "Value": "500" - }, - { - "PowerHint": "GAME", - "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, - { - "PowerHint": "GAME", - "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 0, - "Value": "3000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "BigControlTempSet", From 9905d597384296a2e6be3a3428e032ccbd7f0454 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 17 Aug 2023 16:19:10 -0700 Subject: [PATCH 08/25] Revert "powerhint: add game mode tuning nodes" Bug: 295636226 Test: build This reverts commit e0ee3084bf4b897b774fe145a8865250a5952c10. Change-Id: Iab78f3585e031ecbc8c2f5fea662905fd7a0b80f --- powerhint-oriole.json | 45 ++----------------------------------- powerhint-raven.json | 45 ++----------------------------------- powerhint-slider.json | 50 ++++------------------------------------- powerhint-whitefin.json | 50 ++++------------------------------------- 4 files changed, 12 insertions(+), 178 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 890fa70..0f9afe0 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -46,16 +46,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPULittleClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "5000", - "500" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -83,16 +73,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUMidClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -120,16 +100,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -170,16 +140,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUTaperedDVFSHeadroomEnable", - "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", - "Values": [ - "0", - "1" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/groups/ta/uclamp_min", @@ -285,10 +245,9 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "1", - "0" + "0", + "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-raven.json b/powerhint-raven.json index e3822af..1f3c408 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -45,16 +45,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPULittleClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "5000", - "500" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -82,16 +72,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUMidClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -119,16 +99,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -169,16 +139,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUTaperedDVFSHeadroomEnable", - "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", - "Values": [ - "0", - "1" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/groups/ta/uclamp_min", @@ -284,10 +244,9 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "1", - "0" + "0", + "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-slider.json b/powerhint-slider.json index 73f513a..e7d781c 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -45,16 +45,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPULittleClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "5000", - "500" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -82,16 +72,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUMidClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -119,16 +99,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -169,16 +139,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUTaperedDVFSHeadroomEnable", - "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", - "Values": [ - "0", - "1" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -294,20 +254,18 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "1", - "0" + "0", + "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ - "1", - "0" + "0", + "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index eb09e26..3a1de82 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -45,16 +45,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPULittleClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "5000", - "500" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -82,16 +72,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUMidClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -119,16 +99,6 @@ ], "ResetOnInit": true }, - { - "Name": "CPUBigClusterDownRateLimitUs", - "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", - "Values": [ - "20000", - "3000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -169,16 +139,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUTaperedDVFSHeadroomEnable", - "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", - "Values": [ - "0", - "1" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -294,20 +254,18 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "1", - "0" + "0", + "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ - "1", - "0" + "0", + "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { From 1f290e6b189a7b9cacd01d7d251360a9e0f6d938 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 9 Jan 2024 11:21:41 -0800 Subject: [PATCH 09/25] powerhint: add game mode tuning nodes Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes. Test: build Bug: 295636226 Change-Id: I49c004e205a6d80c1281d2063747206faa642938 --- powerhint-oriole.json | 45 +++++++++++++++++++++++++++++++++++-- powerhint-raven.json | 45 +++++++++++++++++++++++++++++++++++-- powerhint-slider.json | 50 +++++++++++++++++++++++++++++++++++++---- powerhint-whitefin.json | 50 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 178 insertions(+), 12 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 0f9afe0..abae37d 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -46,6 +46,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -73,6 +83,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -100,6 +120,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -140,6 +170,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/groups/ta/uclamp_min", @@ -245,9 +285,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-raven.json b/powerhint-raven.json index 1f3c408..aaeafea 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -45,6 +45,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -72,6 +82,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -99,6 +119,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -139,6 +169,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/groups/ta/uclamp_min", @@ -244,9 +284,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-slider.json b/powerhint-slider.json index e7d781c..3fcc94e 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -45,6 +45,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -72,6 +82,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -99,6 +119,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -139,6 +169,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -254,18 +294,20 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 3a1de82..4bd419d 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -45,6 +45,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -72,6 +82,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -99,6 +119,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -139,6 +169,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -254,18 +294,20 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { From e099a9e14f825c3723c4d7333bc0612de5cc33d1 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 19:52:29 -0700 Subject: [PATCH 10/25] powerhint: game mode tuning Test: test build Bug: 295636226 Change-Id: I4ccf52032fa9fcc80bf9c19466ef7a8d9ad6374e --- powerhint-oriole.json | 60 +++++++++++++++++++++++++++++++++++++++++ powerhint-raven.json | 60 +++++++++++++++++++++++++++++++++++++++++ powerhint-slider.json | 60 +++++++++++++++++++++++++++++++++++++++++ powerhint-whitefin.json | 60 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index abae37d..47e6bf1 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -585,6 +585,36 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1485,6 +1515,36 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-raven.json b/powerhint-raven.json index aaeafea..ebd95a5 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -584,6 +584,36 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1466,6 +1496,36 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-slider.json b/powerhint-slider.json index 3fcc94e..5726aa9 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -494,6 +494,36 @@ "Duration": 5000, "Value": "107" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1342,6 +1372,36 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 4bd419d..d44d6f9 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -485,6 +485,36 @@ "Duration": 5000, "Value": "107" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1327,6 +1357,36 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "BigControlTempSet", From 3150bc3d412c60af77f81a7ff7bb2ede368d24cd Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 9 Jan 2024 05:22:38 +0000 Subject: [PATCH 11/25] gps: Update the aiding interval Bug: 309119807 Test: Verification at b/309119807#comment44 Change-Id: I267b34d111ce726ecb1e1defd41e33a6af046109 --- location/gps.xml | 4 +++- location/gps.xml.oriole | 4 +++- location/gps.xml.raven | 4 +++- location/gps_user.xml | 4 +++- location/gps_user.xml.oriole | 4 +++- location/gps_user.xml.raven | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 97c7d8b..52827b8 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -59,7 +59,7 @@ CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" - ReAidingIntervalSec="1200" + ReAidingIntervalSec="3600" PpsDevice="/sys/class/pps/pps0/assert_elapsed" SensorsMask="0x244" MaxThreadNum="13" @@ -92,6 +92,8 @@ MinGpsWeekNumber="2216" OnChipAccMask="50" EnableB1C="false" + + RTICacheTimeoutSec="3600" /> Date: Mon, 15 Jan 2024 12:52:32 +0000 Subject: [PATCH 12/25] esim: load st33spi module Bug: 320201140 Test: Driver probed and checked lsmod Change-Id: I051ecabd56d0fb303409397fe33c5eb772c7e956 --- init.insmod.oriole.cfg | 1 + init.insmod.raven.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/init.insmod.oriole.cfg b/init.insmod.oriole.cfg index 6617a28..0ab8ad5 100644 --- a/init.insmod.oriole.cfg +++ b/init.insmod.oriole.cfg @@ -9,6 +9,7 @@ modprobe|bcmdhd4389.ko modprobe|ftm5.ko modprobe|sec_touch.ko +modprobe|st33spi.ko # All device specific modules loaded setprop|vendor.device.modules.ready diff --git a/init.insmod.raven.cfg b/init.insmod.raven.cfg index d12fc88..84b3239 100644 --- a/init.insmod.raven.cfg +++ b/init.insmod.raven.cfg @@ -8,6 +8,7 @@ # Modules here will be loaded *after* all common modules modprobe|bcmdhd4389.ko modprobe|sec_touch.ko +modprobe|st33spi.ko # All device specific modules loaded setprop|vendor.device.modules.ready From 6b1fb3a66a24a3292f9805d4e5030ca0d2dedecd Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 17 Jan 2024 18:00:25 +0000 Subject: [PATCH 13/25] Update pixel pitch of device Bug: 319894241 Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT Test: manual Change-Id: I9b112fd5e3d988fd735ec13e99d4005151f29846 --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 +++ .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index fa178a8..8e6ed37 100644 --- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -52,5 +52,8 @@ 16px + + + 61.8 diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index bc7aab2..78e96da 100644 --- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -59,5 +59,8 @@ 68px + + + 49.6 From 23d495f4ec74d122ef041d69f427ad52948c7338 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:38:47 +0000 Subject: [PATCH 14/25] Update raven SVN to 76 Bug: 313797924 Change-Id: I921196f7e076adc6c100fd797c85f285759ff791 (cherry picked from commit 384d14b4591bb609b1c3c3d4d71df53e34a55f2a) Merged-In: I921196f7e076adc6c100fd797c85f285759ff791 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c7e8531..aa5411b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=75 + ro.vendor.build.svn=76 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From d1ebd6f07a6e2454a581f9b131ab045edc6363c5 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 29 Jan 2024 11:31:47 +0800 Subject: [PATCH 15/25] powerstats: use display MRR state residency data provider Bug: 322717760 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: I671d21b3da98b4c0973e6cf281f694d90df47ef4 Signed-off-by: Darren Hsu --- powerstats/oriole/service.cpp | 27 +++++++++++++++++---------- powerstats/raven/service.cpp | 35 +++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/powerstats/oriole/service.cpp b/powerstats/oriole/service.cpp index af936a3..09466cd 100644 --- a/powerstats/oriole/service.cpp +++ b/powerstats/oriole/service.cpp @@ -41,17 +41,24 @@ std::map displayChannelNames = { void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1080x2400@30", - "On: 1080x2400@60", - "On: 1080x2400@90", - "HBM: 1080x2400@60", - }; + struct stat buffer; + if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { + // time_in_state exists + addDisplayMrr(p); + } else { + // time_in_state doesn't exist + std::vector states = { + "Off", + "LP: 1080x2400@30", + "On: 1080x2400@60", + "On: 1080x2400@90", + "HBM: 1080x2400@60", + }; - p->addStateResidencyDataProvider(std::make_unique("Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique("Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } std::string rev = android::base::GetProperty(kBootRevision, ""); diff --git a/powerstats/raven/service.cpp b/powerstats/raven/service.cpp index 10bf17e..d8494e2 100644 --- a/powerstats/raven/service.cpp +++ b/powerstats/raven/service.cpp @@ -43,21 +43,28 @@ std::map displayChannelNames = { void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1440x3120@10", - "LP: 1440x3120@30", - "On: 1440x3120@10", - "On: 1440x3120@30", - "On: 1440x3120@60", - "On: 1440x3120@90", - "On: 1440x3120@120", - "HBM: 1440x3120@60", - }; + struct stat buffer; + if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) { + // time_in_state exists + addDisplayMrr(p); + } else { + // time_in_state doesn't exist + std::vector states = { + "Off", + "LP: 1440x3120@10", + "LP: 1440x3120@30", + "On: 1440x3120@10", + "On: 1440x3120@30", + "On: 1440x3120@60", + "On: 1440x3120@90", + "On: 1440x3120@120", + "HBM: 1440x3120@60", + }; - p->addStateResidencyDataProvider(std::make_unique("Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique("Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } std::string rev = android::base::GetProperty(kBootRevision, ""); From 20530333c2cf07184db7f4d95bc89b0c27fa7d4f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:37:53 +0000 Subject: [PATCH 16/25] Update oriole SVN to 76 Bug: 313797924 Change-Id: I79b23046dcfc6238eb31964a039c48ddd7e5e46f (cherry picked from commit ccb94f3981c300a8e5bf1c3fec702132feb8ad7d) Merged-In: I79b23046dcfc6238eb31964a039c48ddd7e5e46f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index db1dca8..43ac14c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=75 + ro.vendor.build.svn=76 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 101091c6f70e778e80d2246dc3e89aa8a83d98e3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sun, 28 Jan 2024 00:24:59 +0000 Subject: [PATCH 17/25] Update oriole SVN to 77 Bug: 313797924 Change-Id: Ie1289324007b51b1a1f5c58a261da8ed303781ff --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 7218b2b..477e944 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -208,7 +208,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=76 + ro.vendor.build.svn=77 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 07b4480d86bb02ff2dfbb721d69fa00379355e8f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sun, 28 Jan 2024 00:27:22 +0000 Subject: [PATCH 18/25] Update raven SVN to 77 Bug: 313797924 Change-Id: I6ad9c6d1f35a449ff6ce8e261d0be0f0281b49ee --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 44853db..a5e0de7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -212,7 +212,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=76 + ro.vendor.build.svn=77 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 78c26013fa9187d35411e929cf42ff3912df66a0 Mon Sep 17 00:00:00 2001 From: Jacky Liu Date: Fri, 2 Feb 2024 12:59:20 +0800 Subject: [PATCH 19/25] Update i2c device paths Update i2c device paths with static bus numbers. Also remove some redundant paths. Bug: 323447554 Test: Boot to home Change-Id: Ibe1f5060daa45a7d19be08bd60c3f3a615427632 Signed-off-by: Jacky Liu --- conf/init.oriole.rc | 4 +--- conf/init.raven.rc | 4 +--- conf/init.slider.rc | 4 ---- powerstats/oriole/service.cpp | 14 ++------------ powerstats/raven/service.cpp | 14 ++------------ powerstats/slider/service.cpp | 14 ++------------ 6 files changed, 8 insertions(+), 46 deletions(-) diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc index 23d1bff..a68876f 100644 --- a/conf/init.oriole.rc +++ b/conf/init.oriole.rc @@ -3,10 +3,8 @@ import /vendor/etc/init/hw/init.gs101.rc import /vendor/etc/init/hw/init.raviole.rc on init - # logbuffer - chown system system /dev/logbuffer_5-0057 # nvmem dump - chown system system /sys/bus/nvmem/devices/4-00500/nvmem + chown system system /sys/bus/nvmem/devices/8-00500/nvmem on init && property:ro.boot.vh_sched_available=0 setprop vendor.powerhal.config powerhint-mainline.json diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 816e368..b3776ae 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -3,10 +3,8 @@ import /vendor/etc/init/hw/init.gs101.rc import /vendor/etc/init/hw/init.raviole.rc on init - # logbuffer - chown system system /dev/logbuffer_5-0057 # nvmem dump - chown system system /sys/bus/nvmem/devices/5-00500/nvmem + chown system system /sys/bus/nvmem/devices/8-00500/nvmem # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats diff --git a/conf/init.slider.rc b/conf/init.slider.rc index af4a484..49c20ea 100644 --- a/conf/init.slider.rc +++ b/conf/init.slider.rc @@ -10,10 +10,6 @@ on init on init && property:ro.build.flavor=factory_slider-userdebug import /vendor/etc/init/hw/init.factory.rc -on init - # logbuffer - chown system system /dev/logbuffer_6-0057 - on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 diff --git a/powerstats/oriole/service.cpp b/powerstats/oriole/service.cpp index 09466cd..fadc674 100644 --- a/powerstats/oriole/service.cpp +++ b/powerstats/oriole/service.cpp @@ -94,18 +94,8 @@ int main() { addGs101CommonDataProviders(p); addDisplay(p); - if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); diff --git a/powerstats/raven/service.cpp b/powerstats/raven/service.cpp index d8494e2..56fc6fd 100644 --- a/powerstats/raven/service.cpp +++ b/powerstats/raven/service.cpp @@ -136,18 +136,8 @@ int main() { addGs101CommonDataProviders(p); addDisplay(p); - if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); diff --git a/powerstats/slider/service.cpp b/powerstats/slider/service.cpp index 6969cc0..1d7966d 100644 --- a/powerstats/slider/service.cpp +++ b/powerstats/slider/service.cpp @@ -70,18 +70,8 @@ int main() { addGs101CommonDataProviders(p); addDisplay(p); - if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); From 2d94179b9754dcf4f349f18caeccee5a4e1beee3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 00:31:03 +0000 Subject: [PATCH 20/25] Update raven SVN to 78 Bug: 313797924 Change-Id: I076db31a580a1cdacf0d55fa131cee22b8da1cc2 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index a5e0de7..ac26300 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -212,7 +212,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=77 + ro.vendor.build.svn=78 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From d3c5202b4b0d7027081bcafeadd3a1b4e20fdb36 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 00:47:26 +0000 Subject: [PATCH 21/25] Update oriole SVN to 78 Bug: 313797924 Change-Id: I3f190b287adbdfaf9abbd52d27705ea341dda15c --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 477e944..2cb35b4 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -208,7 +208,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=77 + ro.vendor.build.svn=78 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From ead4bfa1d267de5cb71a88d6edbd5f211f973170 Mon Sep 17 00:00:00 2001 From: George Chang Date: Mon, 19 Feb 2024 07:08:42 +0000 Subject: [PATCH 22/25] Enable NFC firmware logging Enable NFC firmware logging by default for better debuggability. Bug: 307999188 Bug: 325604333 Test: manual Change-Id: I8a7d2f404cb64a7b1b079637049531cc545dd2c3 --- nfc/libnfc-hal-st.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index b7599c7..7300e21 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0 ############################################################################### # Vendor specific mode to enable FW (RF & SWP) traces. -STNFC_FW_DEBUG_ENABLED=0 +STNFC_FW_DEBUG_ENABLED=1 ############################################################################### # File used for NFA storage From 933d33189c7433456aa1e5481888247e93d103f4 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 27 Feb 2024 15:45:19 +0800 Subject: [PATCH 23/25] Initial Bootloader prebuilt for AP3% build Bug: 326002225 Change-Id: I2eafa58131f635b21f6ffc4cfa9d539226cc087d --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- device-slider.mk | 2 +- device-whitefin.mk | 2 +- oriole/BoardConfig.mk | 2 +- raven/BoardConfig.mk | 2 +- slider/BoardConfig.mk | 2 +- whitefin/BoardConfig.mk | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2cb35b4..4c2706e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -50,7 +50,7 @@ include device/google/gs-common/touch/stm/stm11.mk GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk @@ -248,7 +248,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk diff --git a/device-raven.mk b/device-raven.mk index ac26300..51f3904 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -50,7 +50,7 @@ include device/google/gs-common/touch/lsi/lsi.mk GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk @@ -256,7 +256,7 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk diff --git a/device-slider.mk b/device-slider.mk index 75287bc..b7ca9e6 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -107,7 +107,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk diff --git a/device-whitefin.mk b/device-whitefin.mk index 0e03ece..82c07a8 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -90,7 +90,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 5176a54..a138bc2 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -26,7 +26,7 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_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/raven/BoardConfig.mk b/raven/BoardConfig.mk index 0fc37e8..70f7077 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -26,7 +26,7 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_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/slider/BoardConfig.mk b/slider/BoardConfig.mk index 70a80b1..0c3d11f 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider 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/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index f78f6c8..e824c17 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin 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 88e48ff82b15fa4bf044afc7bb0a781314a63a96 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 29 Feb 2024 15:28:36 +0000 Subject: [PATCH 24/25] Enabling Observe mode Bug: 327601464 Test: Tested on local device Change-Id: Ic1aebe1ef50a80450941aa0188814e9fbb102252 --- raven/rro_overlays/NfcOverlay/res/values/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml index e17a0a2..9545f18 100644 --- a/raven/rro_overlays/NfcOverlay/res/values/config.xml +++ b/raven/rro_overlays/NfcOverlay/res/values/config.xml @@ -32,4 +32,5 @@ 106 + true From 7c9d6f18197b37021dddbfdb035c4b9c8553a133 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 29 Feb 2024 15:28:36 +0000 Subject: [PATCH 25/25] Enabling Observe mode Bug: 327601464 Test: Tested on local device Change-Id: Id59e87e47845cbb2187588f623f1e981c0bfd3da --- oriole/rro_overlays/NfcOverlay/res/values/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml index d1f5832..1b70812 100644 --- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml +++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml @@ -32,4 +32,5 @@ 106 + true