From de3d6dd287e5ab531c40e30c74645abc4f0fe7f7 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 18 Aug 2022 03:09:37 +0000 Subject: [PATCH 1/3] Remove RestrictedCpuset hint With systemui now changed its cpuset in early stage, we no longer need RestrictedCpuset hint as workaround. Bug: 242775562 Test: build pass Change-Id: I17603010b7070594f703e04b09cfb3a2a37ecac5 --- powerhint.json | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/powerhint.json b/powerhint.json index 67e9845..3316276 100644 --- a/powerhint.json +++ b/powerhint.json @@ -217,15 +217,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1708,18 +1699,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ From 60f3c1e73e1acacbd71b80e618e84a9e09c1e7f0 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 1 Sep 2022 08:37:24 +0000 Subject: [PATCH 2/3] Config dex2oat according to thermal status Config dex2oat cpuset and thread count according to thermal status. LIGHT cpuset = 0,1,2,3,4,5 thread = 6 MODERATE cpuset = 0,1,2,3 thread = 4 SEVERE cpuset = 0,1,2,3 thread = 4 CRITICAL cpuset = 0,1,2,3 thread = 2 EMERGENCY cpuset = 0,1,2,3 thread = 1 Bug: 242948832 Test: build pass Change-Id: If352833f9fe0f2593f5e98648587e2a99d5669c5 --- powerhint.json | 406 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 361 insertions(+), 45 deletions(-) diff --git a/powerhint.json b/powerhint.json index 4fe3832..1e5e914 100644 --- a/powerhint.json +++ b/powerhint.json @@ -505,6 +505,28 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" } ], "Actions": [ @@ -1502,76 +1524,286 @@ "Value": "60000" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, "Value": "1" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "PMU_POLL", + "Duration": 0, "Value": "1" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, "Value": "1" }, { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "TRUSTY_VIRTIO_HIGH", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "TRUSTY_HIGH", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", @@ -1669,6 +1901,90 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_VIRTIO_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_HIGH", + "Duration": 1000, + "Value": "1" + }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", From 1427b821b674010b72718a571c6818614177b7cd Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Thu, 1 Sep 2022 21:39:19 +0000 Subject: [PATCH 3/3] Revert "uwb: update vendor hal folder location" Revert "uwb: move uwb hal into dw3000-hal folder" Revert "uwb: update vendor hal folder location" Revert submission 19786107-241468038 Reason for revert: b/244619620 - This change will cause automerger conflicts and should go into tm-qpr-dev since tm-qpr-dev is still actively being used. Reverted Changes: I6c84b59fe:uwb: update vendor hal folder location If64da8254:uwb: update vendor hal folder location Ie3a507f22:uwb: update vendor hal folder location Ib5c22ea7e:uwb: move uwb hal into dw3000-hal folder Id48f26750:uwb: update vendor hal folder location I1a05fe35f:uwb: update vendor hal folder location Change-Id: I250c3b228b4ea28914c73171bdc4a176206ee448 --- uwb/uwb_calibration.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 2cf44c8..c7075bf 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -14,7 +14,7 @@ # limitations under the License. # UWB - ultra wide band -$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/tangorpro/uwb