From a782655d545a342f2fc8b42afc1fde0a0ea3e2e7 Mon Sep 17 00:00:00 2001 From: David Chao Date: Fri, 21 Jul 2023 06:52:48 +0000 Subject: [PATCH] thermal: update powerhints for thermal trips Add switch on/off to remove dependency on powerhint.json when updating thermal thresholds Bug: 283038681 Test: Build and boot on device Change-Id: Ibf318176ba5e2c51b2989080c860560f1f1351a0 --- perf/powerhint-husky.json | 228 ++++++++-------------------------- perf/powerhint-shiba.json | 250 ++++++++------------------------------ 2 files changed, 96 insertions(+), 382 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index d288d84..f5e7562 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -448,121 +448,61 @@ "ResetOnInit": true }, { - "Name": "BigControlTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Name": "BigTjOffset", + "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", "Values": [ - "95000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "MidControlTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Name": "MidTjOffset", + "Path": "/sys/devices/platform/100a0000.MID/offset_enabled", "Values": [ - "95000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "LittleControlTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Name": "LittleTjOffset", + "Path": "/sys/devices/platform/100a0000.LITTLE/offset_enabled", "Values": [ - "100000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "G3dControlTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Name": "G3dTjOffset", + "Path": "/sys/devices/platform/100b0000.G3D/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "TpuControlTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Name": "TpuTjOffset", + "Path": "/sys/devices/platform/100b0000.TPU/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "AurControlTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Name": "AurTjOffset", + "Path": "/sys/devices/platform/100b0000.AUR/offset_enabled", "Values": [ - "85000", - "80000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", - "Values": [ - "75000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "MidSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", - "Values": [ - "75000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "LittleSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", - "Values": [ - "75000", - "65000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "G3dSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "TpuSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "AurSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", - "Values": [ - "65000", - "60000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false @@ -2177,75 +2117,39 @@ }, { "PowerHint": "LOW_POWER", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" + "Value": "1" }, { "PowerHint": "REFRESH_120FPS", @@ -2350,75 +2254,39 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index be39284..80e5d27 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -438,131 +438,61 @@ "ResetOnInit": true }, { - "Name": "BigControlTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Name": "BigTjOffset", + "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", "Values": [ - "90000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "MidControlTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Name": "MidTjOffset", + "Path": "/sys/devices/platform/100a0000.MID/offset_enabled", "Values": [ - "90000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "LittleControlTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Name": "LittleTjOffset", + "Path": "/sys/devices/platform/100a0000.LITTLE/offset_enabled", "Values": [ - "95000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "G3dControlTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Name": "G3dTjOffset", + "Path": "/sys/devices/platform/100b0000.G3D/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "TpuControlTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Name": "TpuTjOffset", + "Path": "/sys/devices/platform/100b0000.TPU/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "AurControlTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Name": "AurTjOffset", + "Path": "/sys/devices/platform/100b0000.AUR/offset_enabled", "Values": [ - "85000", - "80000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", - "Values": [ - "70000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "MidSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", - "Values": [ - "70000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "LittleSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", - "Values": [ - "70000", - "65000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "G3dSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "TpuSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "AurSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigEarlyThrottlingTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_4_temp", - "Values": [ - "80000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false @@ -2075,81 +2005,39 @@ }, { "PowerHint": "LOW_POWER", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "LOW_POWER", - "Node": "BigEarlyThrottlingTempSet", - "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "REFRESH_120FPS", @@ -2254,81 +2142,39 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigEarlyThrottlingTempSet", - "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",