From 0dd1ab91a9e6cb15f2297e22e48de6bb18992195 Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 12 Aug 2024 16:44:22 +0000 Subject: [PATCH 01/13] powerhint: Lower CAM uclamp min Current CAM uclamp min is beyond MID clusters capacity when CAM2 energy model is used. This causes most of camera HAL threads scheduled on big cluster only with CAM2 EM profile. Lowering CAM uclamp min so it is within MID clusters capacity for both energe model Flag: EXEMPT tuning changes Test: check camera trace with proper uclamp value Bug: 350629738 Change-Id: I40ce59d0a0d99ea6ba016a24245f44713485bc52 --- perf/powerhint-husky.json | 6 +++--- perf/powerhint-ripcurrent.json | 6 +++--- perf/powerhint-shiba.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index fd71402..6641a3f 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -315,7 +315,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -1371,7 +1371,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1485,7 +1485,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index e91061c..5e84b1a 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -301,7 +301,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -1347,7 +1347,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1443,7 +1443,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 2a45ff0..6d2ba53 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -315,7 +315,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ - "765", + "720", "250", "0" ], @@ -1377,7 +1377,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1491,7 +1491,7 @@ "PowerHint": "CAMERA_SHOT", "Node": "CAMUClampBoost", "Duration": 100, - "Value": "765" + "Value": "720" }, { "PowerHint": "CAMERA_BACKEND_BOOST", From c3e76e51faa568589032336caa39f57aa0a7065d Mon Sep 17 00:00:00 2001 From: Mostafa Saleh Date: Sat, 27 Jul 2024 21:46:07 +0000 Subject: [PATCH 02/13] shiba: Remove AVF assignable devices This should be in experimental. Bug: 352009226 Bug: 349571564 Flag: EXEMPT experimental code Change-Id: I712caa712286c9625ca22983ba55395f08d7f22d Signed-off-by: Mostafa Saleh --- avf/Android.bp | 22 ---------------------- avf/assignable_devices.xml | 22 ---------------------- device-husky.mk | 3 --- device-shiba.mk | 3 --- 4 files changed, 50 deletions(-) delete mode 100644 avf/Android.bp delete mode 100644 avf/assignable_devices.xml diff --git a/avf/Android.bp b/avf/Android.bp deleted file mode 100644 index d707db1..0000000 --- a/avf/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (C) 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -prebuilt_etc { - name: "shusky_assignable_devices.xml", - src: "assignable_devices.xml", - filename: "assignable_devices.xml", - vendor: true, - relative_install_path: "avf", -} diff --git a/avf/assignable_devices.xml b/avf/assignable_devices.xml deleted file mode 100644 index baacffc..0000000 --- a/avf/assignable_devices.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - eh - eh - /sys/bus/platform/devices/16d00000.eh - - diff --git a/device-husky.mk b/device-husky.mk index a2e4c36..9880c06 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -462,9 +462,6 @@ PRODUCT_PRODUCT_PROPERTIES ?= \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# AVF assignable devices xml -PRODUCT_PACKAGES += shusky_assignable_devices.xml - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index 838ee76..a50d77e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -431,9 +431,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# AVF assignable devices xml -PRODUCT_PACKAGES += shusky_assignable_devices.xml - # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true From 70363dbbfa08da53cf9eb5605b0d8b0618a8f42f Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Thu, 22 Aug 2024 02:32:49 +0000 Subject: [PATCH 03/13] Update mismatched frequency for husky and shiba - Update freq for legacy mismatched frequency with the rule of scaling_max_freq will automatically round down, scaling_min_freq will round up. All powerhint behavior should not change. - Remove some min/max frequency not used in any nodes. Bug: 361294204 FLAG: NONE powerhint do not need flag Change-Id: I0242977f05f859ad5c3c38673579e296e74c78ca --- perf/powerhint-husky.json | 62 +++++++++++++++++---------------------- perf/powerhint-shiba.json | 62 +++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 70 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..fab84f0 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -81,8 +81,8 @@ "Values": [ "9999999", "1098000", - "1475000", - "975000", + "1425000", + "955000", "1197000", "1328000", "1548000", @@ -96,7 +96,7 @@ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1475000", + "1548000", "1197000", "0" ], @@ -120,14 +120,11 @@ "9999999", "2253000", "2130000", - "1082000", - "1221000", - "1418000", "910000", "1328000", - "1622000", + "1572000", "1836000", - "1999000" + "1945000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -140,7 +137,6 @@ "2253000", "2130000", "1836000", - "1221000", "0" ], "ResetOnInit": true @@ -165,14 +161,11 @@ "2704000", "2507000", "2252000", - "893000", - "1328000", - "1852000", - "1164000", + "1298000", "1557000", "1745000", "2049000", - "2409000" + "2363000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -185,8 +178,7 @@ "2704000", "2507000", "2252000", - "1852000", - "1164000", + "1885000", "0" ], "ResetOnInit": true @@ -737,7 +729,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2363000", - "1852000", + "1745000", "1298000" ], "DefaultIndex": 0 @@ -1341,7 +1333,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1365,7 +1357,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPULittleClusterMinFreq", "Duration": 1000, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1455,19 +1447,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", "Duration": 3000, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2253,19 +2245,19 @@ "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_STREAMING_LOW", @@ -2525,7 +2517,7 @@ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "Node": "CPULittleClusterMaxFreq", "Duration": 3600000, - "Value": "975000" + "Value": "955000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", @@ -2567,7 +2559,7 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_70", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "LOW_POWER_MID_CLUSTER_80", @@ -2579,13 +2571,13 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_90", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1999000" + "Value": "1945000" }, { "PowerHint": "LOW_POWER_CPU_50", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "1328000" + "Value": "1298000" }, { "PowerHint": "LOW_POWER_CPU_60", @@ -2609,7 +2601,7 @@ "PowerHint": "LOW_POWER_CPU_90", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "2409000" + "Value": "2363000" }, { "PowerHint": "LOW_POWER", @@ -2890,7 +2882,7 @@ "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 500, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", @@ -2992,7 +2984,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3040,19 +3032,19 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_PROJECT11", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..8ed56c4 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -81,8 +81,8 @@ "Values": [ "9999999", "1098000", - "1475000", - "975000", + "1425000", + "955000", "1197000", "1328000", "1548000", @@ -96,7 +96,7 @@ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1475000", + "1548000", "1197000", "0" ], @@ -118,14 +118,11 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ "9999999", - "1082000", - "1221000", - "1418000", "910000", "1328000", - "1622000", + "1572000", "1836000", - "1999000" + "1945000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -136,7 +133,6 @@ "Values": [ "9999999", "1836000", - "1221000", "0" ], "ResetOnInit": true @@ -158,14 +154,11 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", "Values": [ "9999999", - "893000", - "1328000", - "1852000", - "1164000", + "1298000", "1557000", "1745000", "2049000", - "2409000" + "2363000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -175,8 +168,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", - "1852000", - "1164000", + "1885000", "0" ], "ResetOnInit": true @@ -737,7 +729,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ "2363000", - "1852000", + "1745000", "1298000" ], "DefaultIndex": 0 @@ -1347,7 +1339,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1371,7 +1363,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CPULittleClusterMinFreq", "Duration": 1000, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1461,19 +1453,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", "Duration": 3000, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2151,19 +2143,19 @@ "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_STREAMING_LOW", @@ -2429,7 +2421,7 @@ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "Node": "CPULittleClusterMaxFreq", "Duration": 3600000, - "Value": "975000" + "Value": "955000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", @@ -2471,7 +2463,7 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_70", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "LOW_POWER_MID_CLUSTER_80", @@ -2483,13 +2475,13 @@ "PowerHint": "LOW_POWER_MID_CLUSTER_90", "Node": "CPUMidClusterMaxFreq", "Duration": 3600000, - "Value": "1999000" + "Value": "1945000" }, { "PowerHint": "LOW_POWER_CPU_50", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "1328000" + "Value": "1298000" }, { "PowerHint": "LOW_POWER_CPU_60", @@ -2513,7 +2505,7 @@ "PowerHint": "LOW_POWER_CPU_90", "Node": "CPUBigClusterMaxFreq", "Duration": 3600000, - "Value": "2409000" + "Value": "2363000" }, { "PowerHint": "LOW_POWER", @@ -2794,7 +2786,7 @@ "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 500, - "Value": "1852000" + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", @@ -2896,7 +2888,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", @@ -2944,19 +2936,19 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "1852000" + "Value": "1745000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "1622000" + "Value": "1572000" }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1425000" }, { "PowerHint": "CAMERA_PROJECT11", From 6391431d8965c8df3bf74a3cc471a480015cf9e1 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Thu, 1 Aug 2024 09:18:18 +0000 Subject: [PATCH 04/13] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: I9186c0cd69e61c9e2a772e47531e7626c91fdaa4 --- location/gps.6.1.xml.hk3 | 2 ++ location/gps.6.1.xml.sb3 | 2 ++ location/gps.xml.hk3 | 2 ++ location/gps.xml.sb3 | 2 ++ location/gps_user.6.1.xml.hk3 | 2 ++ location/gps_user.6.1.xml.sb3 | 2 ++ location/gps_user.xml | 2 ++ location/gps_user.xml.hk3 | 2 ++ location/gps_user.xml.sb3 | 2 ++ 9 files changed, 18 insertions(+) diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index 20329db..cf2fceb 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -101,6 +101,8 @@ /> diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index a848fd9..cf01e15 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -101,6 +101,8 @@ /> diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index b238f9b..1b2566e 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 1abf8e2..1647b50 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 index a6ddbce..a1d9fde 100644 --- a/location/gps_user.6.1.xml.hk3 +++ b/location/gps_user.6.1.xml.hk3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 index 4248a7b..6ee10ee 100644 --- a/location/gps_user.6.1.xml.sb3 +++ b/location/gps_user.6.1.xml.sb3 @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index 292fa2b..b0f0218 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 3a0f045..38f7f47 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 463fd07..e065de1 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -97,6 +97,8 @@ /> From 54c0accb7fbca10638f0f93a41cd3abb360a9049 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Fri, 24 May 2024 13:45:23 +0000 Subject: [PATCH 05/13] Set big core to group_cfs_skip_mask for sys group by default Let sys group tasks will run less in big core by default. Bug: 328210236 Test: build pass Change-Id: I0092c5d32091894750287fb1fb0c5756158d37b1 --- perf/powerhint-husky.json | 9 +++++++++ perf/powerhint-ripcurrent.json | 9 +++++++++ perf/powerhint-shiba.json | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..50a14b6 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -466,6 +466,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1f2ae91..c1fd03c 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -452,6 +452,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..c27e274 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -466,6 +466,15 @@ ], "ResetOnInit": true }, + { + "Name": "SysGroupCfsSkipMask", + "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", From a2b661cfc15be226edcbcda329b38e8c7fa9178f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 27 Aug 2024 15:04:37 +0000 Subject: [PATCH 06/13] Enable auto prefer idle Also disable prefer idle for TA and FG by default. Bug: 236868627 Flag: NONE powerhint change does not support flags Test: build pass Change-Id: I0d06e707900ec9a85decbdecbd184532743c7de0 --- perf/powerhint-husky.json | 3 --- perf/powerhint-ripcurrent.json | 3 --- perf/powerhint-shiba.json | 3 --- 3 files changed, 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..6adab31 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -228,7 +228,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -436,7 +435,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1f2ae91..5702708 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -214,7 +214,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -422,7 +421,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -459,7 +457,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..43ec6aa 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -218,7 +218,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -436,7 +435,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { From 80d1365e54f3806dda8042b409aabf912717ece5 Mon Sep 17 00:00:00 2001 From: JJ Lee Date: Wed, 3 Jul 2024 16:33:30 +0800 Subject: [PATCH 07/13] audio: power optimization for deepbuffer playback Bug: 249436330 Test: build pass, cts pass, regression test pass Flag: EXEMPT bugfix Change-Id: Iacf4ad1ade7148491b24e7bd0f1e423f0a6d34de Signed-off-by: JJ Lee --- audio/husky/config/audio_platform_configuration.xml | 4 ++-- audio/ripcurrent/config/audio_platform_configuration.xml | 4 ++-- audio/shiba/config/audio_platform_configuration.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 3c403c1..9b28124 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml index 2435e98..4748e6f 100644 --- a/audio/ripcurrent/config/audio_platform_configuration.xml +++ b/audio/ripcurrent/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 3c403c1..9b28124 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -179,8 +179,8 @@ - - + + From e295a3ae54597a0e2e97fb0466d5c51e1566bd8b Mon Sep 17 00:00:00 2001 From: Hana Huang Date: Thu, 8 Aug 2024 14:03:19 +0000 Subject: [PATCH 08/13] Update estimated WiFi power consumption value Bug: 351925447 Test: Wifi Regression Test Flag: EXEMPT overlay update Change-Id: I2b4badc92df027d366e9f3b21b6eb0c17022ad42 Signed-off-by: Hana Huang --- .../frameworks/base/core/res/res/xml/power_profile.xml | 8 ++++---- .../frameworks/base/core/res/res/xml/power_profile.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 5f36d8c..0680f65 100644 --- a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -188,11 +188,11 @@ 3700 - 79 + 38 - 118 + 57 - 331 + 550 - 3700 + 3850 diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 5f36d8c..0680f65 100644 --- a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -188,11 +188,11 @@ 3700 - 79 + 38 - 118 + 57 - 331 + 550 - 3700 + 3850 From 6041d91a969dff6d5e4d44376e592f8620306311 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:55:29 -0700 Subject: [PATCH 09/13] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: Ic4fb66eebda66173aa8186d96f2b1dbd9ea33ad8 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index e01d156..18109c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder From e2a796691da7a51bb40e31e35449fde71543a4e4 Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Sat, 31 Aug 2024 05:20:01 +0000 Subject: [PATCH 10/13] powerhint: Update not available frequency to reflect its actual behavior Some frequencies uses unavailable frequency other soc ex: ag/22293847, the patch update them to explicitly show the actual actions of driver. Bug: 361294204 Change-Id: I1adc41aca636650b4eaad179d73bde030146347c FLAG: NONE powerhint do not need flag --- perf/powerhint-husky.json | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index fab84f0..1cf6e87 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -118,7 +118,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ "9999999", - "2253000", + "2245000", "2130000", "910000", "1328000", @@ -134,7 +134,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", "Values": [ "9999999", - "2253000", + "2245000", "2130000", "1836000", "0" @@ -158,9 +158,8 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq", "Values": [ "9999999", - "2704000", - "2507000", - "2252000", + "2687000", + "2147000", "1298000", "1557000", "1745000", @@ -175,9 +174,9 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", - "2704000", - "2507000", - "2252000", + "2687000", + "2363000", + "2147000", "1885000", "0" ], @@ -1531,13 +1530,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2704000" + "Value": "2687000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2704000" + "Value": "2687000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", @@ -1549,13 +1548,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2507000" + "Value": "2363000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2507000" + "Value": "2363000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", @@ -1567,13 +1566,13 @@ "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", "Node": "CPUBigClusterMaxFreq", "Duration": 3000, - "Value": "2252000" + "Value": "2147000" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3", "Node": "CPUBigClusterMinFreq", "Duration": 3000, - "Value": "2252000" + "Value": "2147000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1", @@ -1591,13 +1590,13 @@ "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2", "Node": "CPUMidClusterMaxFreq", "Duration": 3000, - "Value": "2253000" + "Value": "2245000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2", "Node": "CPUMidClusterMinFreq", "Duration": 3000, - "Value": "2253000" + "Value": "2245000" }, { "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3", From da53d20798b6175e129f3b76df0d65778504078f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 3 Sep 2024 09:07:08 +0000 Subject: [PATCH 11/13] Fix cpu mask for big core The big core mask on zuma should be 0x100. Bug: 248621289 Test: build pass Flag: NONE powerhint change does not support flags Change-Id: Id9dbd933505d3eaa2553ed1851883a3042028f16 --- perf/powerhint-husky.json | 4 ++-- perf/powerhint-ripcurrent.json | 4 ++-- perf/powerhint-shiba.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index e5c67c2..f5ca2ae 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -278,7 +278,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -462,7 +462,7 @@ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 4844ea3..41e06e7 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -273,7 +273,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -457,7 +457,7 @@ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c3458e3..158f6fc 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -279,7 +279,7 @@ "Path": "/proc/vendor_sched/cpu_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, @@ -463,7 +463,7 @@ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask", "Values": [ "0x0", - "0x80" + "0x100" ], "ResetOnInit": true }, From 50bfd1510395f1d3efc309f146ae516371c47b6c Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:36:46 +0000 Subject: [PATCH 12/13] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: I9066437856338ef7da02be5648a119c1c38cc288 Signed-off-by: Robin Peng --- husky/BoardConfig.mk | 1 + ripcurrent/BoardConfig.mk | 1 + shiba/BoardConfig.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 63ef483..9240a13 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -45,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index a84d4b0..142e21a 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -31,5 +31,6 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 30d204e..847a288 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -41,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/shiba-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk From cc052744f183bc2e819c5c443a3551f9627644c7 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:19:12 +0000 Subject: [PATCH 13/13] Update product id for Shiba and Husky Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I5f8afb3ab826864884b3ba2cf27bd149efea3c2f --- device-husky.mk | 3 ++- device-shiba.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index c5c9057..40e1216 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -519,8 +519,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id +# Husky: 0x410D PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20493 + bluetooth.device_id.product_id=16653 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 8d8d142..206e4a6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -488,8 +488,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id +# Shiba: 0x410E PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20492 + bluetooth.device_id.product_id=16654 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \