From 0d8f79ac75bfd13801ad22f2ec62eb853cc40b2a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 25 Apr 2024 03:48:48 +0000 Subject: [PATCH 1/4] Update shiba SVN to 27 Bug: 336526332 Change-Id: I4f73498adb2f1dd69794889c1d9311d5d81cacaa --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 35d59ab..e83d420 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -379,7 +379,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 2b195c3b0d38237f5bb72ef0068507132120196f Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 5 Jun 2024 00:07:37 +0000 Subject: [PATCH 2/4] Verify shusky prebuilts are 16 KB compatible. Bug: 342466032 Test: build only Change-Id: I7025cd2a02904c9bb974112f0f70368325b89d7f --- device-husky.mk | 1 + device-shiba.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 62608e8..8e123ae 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -472,3 +472,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true diff --git a/device-shiba.mk b/device-shiba.mk index f3b7e91..9cda45c 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -441,3 +441,4 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu endif PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true From d6c3e07eb4eabd45789a15be59e70dbfe188f13b Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 6 Jun 2024 03:01:52 +0000 Subject: [PATCH 3/4] Revert "Set big core to group_cfs_skip_mask for sys group" This reverts commit 83bdd31a60abf78b3a2d4b609af294a3eeeea661. Reason for revert: 2dQ3 kernel prebuilt not ready Bug: 248621289 Change-Id: I34c8616bc6b39e178c665a77c266c2a60438a651 Test: build pass --- perf/powerhint-husky.json | 16 ---------------- perf/powerhint-ripcurrent.json | 16 ---------------- perf/powerhint-shiba.json | 16 ---------------- 3 files changed, 48 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 02dcff1..b944c9c 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -457,16 +457,6 @@ ], "ResetOnInit": true }, - { - "Name": "SysGroupCfsSkipMask", - "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", - "Values": [ - "0x0", - "0x80" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -1285,12 +1275,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "SysGroupCfsSkipMask", - "Duration": 0, - "Value": "0x80" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1367f6f..f5f1ca1 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -443,16 +443,6 @@ ], "ResetOnInit": true }, - { - "Name": "SysGroupCfsSkipMask", - "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", - "Values": [ - "0x0", - "0x80" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -1284,12 +1274,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "SysGroupCfsSkipMask", - "Duration": 0, - "Value": "0x80" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 6bb7a0d..c9ca7d2 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -457,16 +457,6 @@ ], "ResetOnInit": true }, - { - "Name": "SysGroupCfsSkipMask", - "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", - "Values": [ - "0x0", - "0x80" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", @@ -1291,12 +1281,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "SysGroupCfsSkipMask", - "Duration": 0, - "Value": "0x80" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", From 5d7958215d018afea719575a7e9fe4f17117721a Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 6 Jun 2024 03:02:13 +0000 Subject: [PATCH 4/4] Revert "Set big core to cpu skip mask by default" This reverts commit c6609a4bb95f69dcedd9023332f43d7e487f6a2c. Reason for revert: 24Q3 kernel prebuilt not ready Bug: 248621289 Change-Id: I53abd0932443fa437a487255b74e06dad18f7b9f Test: build pass --- perf/powerhint-husky.json | 63 -------------------------------- perf/powerhint-ripcurrent.json | 63 -------------------------------- perf/powerhint-shiba.json | 65 +--------------------------------- 3 files changed, 1 insertion(+), 190 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index d215204..b944c9c 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -282,15 +282,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUSkipMask", - "Path": "/proc/vendor_sched/cpu_skip_mask", - "Values": [ - "0x0", - "0x80" - ], - "ResetOnInit": true - }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -851,12 +842,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1010,12 +995,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1296,12 +1275,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1872,12 +1845,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2040,12 +2007,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2196,12 +2157,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2292,12 +2247,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2442,12 +2391,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -3091,12 +3034,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index df0f423..f5f1ca1 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -268,15 +268,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUSkipMask", - "Path": "/proc/vendor_sched/cpu_skip_mask", - "Values": [ - "0x0", - "0x80" - ], - "ResetOnInit": true - }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -873,12 +864,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1032,12 +1017,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1295,12 +1274,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1721,12 +1694,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1877,12 +1844,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2015,12 +1976,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2105,12 +2060,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2255,12 +2204,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2874,12 +2817,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 3345675..c9ca7d2 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -282,15 +282,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "CPUSkipMask", - "Path": "/proc/vendor_sched/cpu_skip_mask", - "Values": [ - "0x0", - "0x80" - ], - "ResetOnInit": true - }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -851,12 +842,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1010,12 +995,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1302,12 +1281,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1776,12 +1749,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1944,12 +1911,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2100,12 +2061,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2202,18 +2157,12 @@ "Duration": 0, "Value": "cam1" }, - { + { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1280" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferHighCap", @@ -2346,12 +2295,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2995,12 +2938,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad",