From 68323f2e75d2de1ede1b557270161c80f26b5acf Mon Sep 17 00:00:00 2001 From: Jonglin Lee Date: Mon, 13 Jun 2022 15:37:18 -0700 Subject: [PATCH 1/4] tangorpro: sync latest powerhint Sync latest powerhint to unblock boot. Bug: 235850212 Test: Boot to home Signed-off-by: Jonglin Lee Change-Id: I0369570176d962411ae1bc2b40396952e8ac205f --- powerhint.json | 499 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 434 insertions(+), 65 deletions(-) diff --git a/powerhint.json b/powerhint.json index 49acd2b..c603918 100644 --- a/powerhint.json +++ b/powerhint.json @@ -103,9 +103,10 @@ "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", "Values": [ + "848000", "762000", + "572000", "471000", - "400000", "302000", "151000" ], @@ -121,7 +122,7 @@ "ResetOnInit": true }, { - "Name": "ReducePreferIdle", + "Name": "ReduceRreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", "Values": [ "0", @@ -143,8 +144,9 @@ "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ - "20 5 80", - "20 10 80" + "20 10 80", + "80 10 80", + "60 10 40" ], "ResetOnInit": true }, @@ -152,7 +154,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "612", "185", "1", "63" @@ -183,11 +185,20 @@ "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ "180", - "512" + "650" ], "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "44", + "1000" + ], + "HoldFd": true + }, { "Name": "CDPreferIdle", "Path": "/proc/vendor_sched/cam_prefer_idle", @@ -264,9 +275,10 @@ "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/fg_prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -278,6 +290,15 @@ ], "ResetOnInit": true }, + { + "Name": "NPITaskPacking", + "Path": "/proc/vendor_sched/npi_packing", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, { "Name": "DisplayWakeup", "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", @@ -327,7 +348,7 @@ "Name": "BigControlTempSet", "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", "Values": [ - "90000", + "100000", "80000" ], "DefaultIndex": 0, @@ -337,7 +358,7 @@ "Name": "MidControlTempSet", "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", "Values": [ - "90000", + "100000", "80000" ], "DefaultIndex": 0, @@ -347,7 +368,7 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "95000", + "100000", "80000" ], "DefaultIndex": 0, @@ -357,7 +378,27 @@ "Name": "G3dControlTempSet", "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", "Values": [ - "90000", + "100000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "TpuControlTempSet", + "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Values": [ + "100000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "AurControlTempSet", + "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Values": [ + "100000", "80000" ], "DefaultIndex": 0, @@ -367,7 +408,7 @@ "Name": "BigSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", "Values": [ - "70000", + "80000", "60000" ], "DefaultIndex": 0, @@ -377,7 +418,7 @@ "Name": "MidSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", "Values": [ - "70000", + "80000", "60000" ], "DefaultIndex": 0, @@ -387,7 +428,7 @@ "Name": "LittleSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", "Values": [ - "70000", + "80000", "60000" ], "DefaultIndex": 0, @@ -397,11 +438,83 @@ "Name": "G3dSwitchOnTempSet", "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", "Values": [ - "70000", + "80000", "60000" ], "DefaultIndex": 0, "ResetOnInit": false + }, + { + "Name": "TpuSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", + "Values": [ + "80000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "AurSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", + "Values": [ + "80000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "CPU_LITTLE_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_MID_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_BIG_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "TRUSTY_VIRTIO_HIGH", + "Path": "/sys/module/trusty_virtio/parameters/use_high_wq", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "TRUSTY_HIGH", + "Path": "/sys/module/trusty_core/parameters/use_high_wq", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "PMU_POLL", + "Path": "/proc/vendor_sched/pmu_poll_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 } ], "Actions": [ @@ -419,10 +532,33 @@ }, { "PowerHint": "LAUNCH", - "Node": "ReducePreferIdle", + "Node": "ReduceRreferIdle", "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH_120FPS", + "Node": "GPUMinFreq", + "Duration": 1000, + "Value": "848000" + }, + { + "PowerHint": "LAUNCH_120FPS", + "Node": "SFUClampBoost", + "Duration": 1000, + "Value": "159" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_120FPS" + }, { "PowerHint": "LAUNCH", "Node": "SFUClampBoost", @@ -451,7 +587,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "612" }, { "PowerHint": "LAUNCH", @@ -465,6 +601,12 @@ "Duration": 5000, "Value": "3172000" }, + { + "PowerHint": "LAUNCH", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -513,6 +655,12 @@ "Duration": 1000, "Value": "4-7" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "NPITaskPacking", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -531,6 +679,12 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "NPITaskPacking", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -711,6 +865,12 @@ "Duration": 3000, "Value": "9999999" }, + { + "PowerHint": "GCA_CAMERA_SHOT_GPU_EXTREME", + "Node": "GPUMinFreq", + "Duration": 3000, + "Value": "848000" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterMaxFreq", @@ -735,12 +895,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "302000" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "MemFreq", @@ -751,7 +905,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "MIFTargetLoad", "Duration": 0, - "Value": "20 10 80" + "Value": "80 10 80" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -783,6 +937,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", @@ -813,12 +973,6 @@ "Duration": 0, "Value": "1401000" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "302000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "MemFreq", @@ -829,7 +983,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "MIFTargetLoad", "Duration": 0, - "Value": "20 10 80" + "Value": "80 10 80" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -861,6 +1015,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -891,12 +1051,6 @@ "Duration": 0, "Value": "1401000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "302000" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -927,6 +1081,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -963,12 +1123,6 @@ "Duration": 0, "Value": "1401000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "302000" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "MemFreq", @@ -999,6 +1153,24 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_GPU_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "572000" + }, + { + "PowerHint": "CAMERA_GPU_STANDARD", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMaxFreq", @@ -1126,7 +1298,13 @@ "Value": "2401000" }, { - "PowerHint": "REFRESH_90FPS", + "PowerHint": "LOW_POWER", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, "Value": "63" @@ -1135,7 +1313,12 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "42" + "Value": "63" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "LAUNCH_120FPS" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1151,7 +1334,7 @@ { "PowerHint": "ADPF_DISABLE_TA_BOOST", "Type": "EndHint", - "Value": "BOOST_90HZ" + "Value": "BOOST_120HZ" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1161,7 +1344,7 @@ { "PowerHint": "BOOST_DISPLAY", "Type": "DoHint", - "Value": "BOOST_90HZ" + "Value": "BOOST_120HZ" }, { "PowerHint": "BOOST_DISPLAY", @@ -1174,7 +1357,7 @@ "Value": "BOOST_DISPLAY" }, { - "PowerHint": "BOOST_90HZ", + "PowerHint": "BOOST_120HZ", "Node": "TAUClampBoost", "Duration": 200, "Value": "185" @@ -1186,14 +1369,14 @@ "Value": "185" }, { - "PowerHint": "REFRESH_90FPS", + "PowerHint": "REFRESH_120FPS", "Type": "MaskHint", "Value": "BOOST_60HZ" }, { "PowerHint": "REFRESH_60FPS", "Type": "MaskHint", - "Value": "BOOST_90HZ" + "Value": "BOOST_120HZ" }, { "PowerHint": "DISPLAY_IDLE", @@ -1215,7 +1398,7 @@ { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "BOOST_90HZ" + "Value": "BOOST_120HZ" }, { "PowerHint": "DISPLAY_IDLE", @@ -1255,56 +1438,86 @@ "PowerHint": "EXPENSIVE_RENDERING", "Node": "GPUMinFreq", "Duration": 0, - "Value": "400000" + "Value": "572000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1317,6 +1530,24 @@ "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", @@ -1329,11 +1560,143 @@ "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": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "650" + }, + { + "PowerHint": "ML_ACC", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "44" }, { "PowerHint": "DEVICE_IDLE", @@ -1354,13 +1717,14 @@ "PID_On": true, "PID_Po": 2.0, "PID_Pu": 1.0, - "PID_I": 0.001, + "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, "PID_I_Low": -30, "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, + "UclampMin_Init": 185, "UclampMin_High": 384, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1377,13 +1741,14 @@ "PID_On": true, "PID_Po": 2.0, "PID_Pu": 1.0, - "PID_I": 0.001, + "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, "PID_I_Low": -30, "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, + "UclampMin_Init": 129, "UclampMin_High": 384, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1400,13 +1765,14 @@ "PID_On": true, "PID_Po": 2.0, "PID_Pu": 1.0, - "PID_I": 0.001, + "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, "PID_I_Low": -30, "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, + "UclampMin_Init": 129, "UclampMin_High": 384, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1433,6 +1799,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, + "UclampMin_Init": 200, "UclampMin_High": 157, "UclampMin_Low": 157, "ReportingRateLimitNs": 1, @@ -1456,6 +1823,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, + "UclampMin_Init": 200, "UclampMin_High": 42, "UclampMin_Low": 42, "ReportingRateLimitNs": 1, @@ -1479,6 +1847,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, + "UclampMin_Init": 200, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, From 78cb84cd1b221ace881b1c169b223e4ee726255b Mon Sep 17 00:00:00 2001 From: Jonglin Lee Date: Mon, 13 Jun 2022 16:07:57 -0700 Subject: [PATCH 2/4] [REVERTME] tangorpro: set metadata_init_delete_all_keys to false Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot. Bug: 235884193 Test: Boot to home Change-Id: Ife8d090ad8b337e16b7703b1431c34545e0b5063 Signed-off-by: Jonglin Lee --- device-tangorpro.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index cc46041..8fdd68f 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -154,3 +154,6 @@ endif # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 + +# Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot +PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false From f896a210188693cc2964aad3b89cbc7cedb42d60 Mon Sep 17 00:00:00 2001 From: Achigo Liu Date: Tue, 14 Jun 2022 12:30:24 +0800 Subject: [PATCH 3/4] tangorpro: rotate recovery UI by 90 degrees left Tangorpro POR is landscape mode, rotate recovery UI by 90 degrees left so all recovery-based modes have correct orientation. Bug: 235803156 Test: build pass Signed-off-by: Achigo Liu Change-Id: I87b994ab97ec4f812936f4d7c49ce5b98839d70f --- device-tangorpro.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 8fdd68f..caba00f 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -16,6 +16,7 @@ TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers +TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT $(call inherit-product-if-exists, vendor/google_devices/tangorpro/prebuilts/device-vendor-tangorpro.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) From ae0e8ef2fb8538f15508a7f0d412c2683a9ef9e4 Mon Sep 17 00:00:00 2001 From: normanwhl Date: Tue, 14 Jun 2022 04:39:29 +0000 Subject: [PATCH 4/4] Integrate wifi configuraions for tangorpro 1. Add supplicant service init 2. Add p2p and aware interface property 3. Force softap use wlan1 interface 4. verbose logging always on for userdebug build Bug: 235906179 Test: 1. check supplicant can be started 2. check property ro.vendor.wifi.sap.interface 3. check property wifi.direct.interface 4. check property wifi.aware.interface Change-Id: I92d83db81e5260b8bb781e9263c0bef62fbf8d7a --- conf/init.tangorpro.rc | 15 +++++++++++++-- device-tangorpro.mk | 4 ++++ rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ wifi/BoardConfig-wifi.mk | 3 +++ wifi/p2p_supplicant.conf | 10 ++++++++++ wifi/wpa_supplicant_overlay.conf | 10 ++++++++++ 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 wifi/p2p_supplicant.conf create mode 100644 wifi/wpa_supplicant_overlay.conf diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index 6534386..bdd0d95 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -62,5 +62,16 @@ on post-fs-data exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app # Wifi -on property:sys.boot_completed=1 - write /sys/bus/platform/drivers/cnss2/qcom,cnss-qca6490/fs_ready 1 +on post-fs-data + setprop wifi.direct.interface p2p-dev-wlan0 + setprop wifi.aware.interface aware_nmi0 + +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ + -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ + -m/vendor/etc/wifi/p2p_supplicant.conf \ + -g@android:wpa_wlan0 -dd + interface aidl android.hardware.wifi.supplicant.ISupplicant/default + socket wpa_wlan0 dgram 660 wifi wifi + class main + disabled + oneshot diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 8fdd68f..9e93903 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -155,5 +155,9 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 +# Wifi SAP Interface Name +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.wifi.sap.interface=wlan1 + # Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index d5818e4..8a92e98 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -114,4 +114,10 @@ true + + + + 1 diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 587f245..2e02ca1 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -28,3 +28,6 @@ WIFI_FEATURE_IMU_DETECTION := true WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true +PRODUCT_COPY_FILES += \ + device/google/tangorpro/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ + device/google/tangorpro/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant.conf new file mode 100644 index 0000000..4ec8453 --- /dev/null +++ b/wifi/p2p_supplicant.conf @@ -0,0 +1,10 @@ +driver_param=use_p2p_group_interface=1p2p_device=1 +update_config=1 +eapol_version=1 +ap_scan=1 +fast_reauth=1 +pmf=1 +p2p_add_cli_chan=1 +disable_scan_offload=1 +p2p_go_vht=1 +p2p_pref_chan=124:149, 115:36 diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf new file mode 100644 index 0000000..6f274c1 --- /dev/null +++ b/wifi/wpa_supplicant_overlay.conf @@ -0,0 +1,10 @@ +sae_pwe=2 +driver_param=use_p2p_group_interface=1p2p_device=1 +disable_scan_offload=1 +wowlan_triggers=any +bss_max_count=512 +interworking=1 +hs20=1 +auto_interworking=0 +bss_no_flush_when_down=1 +btm_offload=1