From 3cfc93b4f68459de64f823f2ed79b79d6e152f5e Mon Sep 17 00:00:00 2001
From: Taeju Park <taeju@google.com>
Date: Fri, 3 May 2024 23:42:09 +0000
Subject: [PATCH 1/3] powerhint: add PMU_FORCE_LIMIT control knob

Bug: 335331630
Change-Id: Idb5f21cdb98611edd07d3edcafca5699515e9bae
Signed-off-by: Taeju Park <taeju@google.com>
---
 perf/powerhint-caiman.json        | 51 +++++++++++++++++++++++++++++++
 perf/powerhint-komodo.json        | 51 +++++++++++++++++++++++++++++++
 perf/powerhint-ripcurrentpro.json | 45 +++++++++++++++++++++++++++
 perf/powerhint-tokay.json         | 51 +++++++++++++++++++++++++++++++
 perf/powerhint-zuma.json          | 36 ++++++++++++++++++++++
 5 files changed, 234 insertions(+)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index bd9a7efe..42ff773c 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -579,6 +579,15 @@
       ],
       "DefaultIndex": 0
     },
+    {
+      "Name": "PMU_FORCE_LIMIT",
+      "Path": "/proc/vendor_sched/pmu_force_limited",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "DefaultIndex": 0
+    },
     {
       "Name": "EM_Profile",
       "Path": "/sys/kernel/pixel_em/active_profile",
@@ -1764,6 +1773,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "EM_Profile",
@@ -1896,6 +1911,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "EM_Profile",
@@ -2058,6 +2079,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
@@ -2358,6 +2385,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_LIMIT_FREQ",
@@ -2552,6 +2585,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "BigTjOffset",
@@ -2677,6 +2716,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "BigTjOffset",
@@ -2983,6 +3028,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "EM_Profile",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index a513e6eb..4a868d88 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -579,6 +579,15 @@
       ],
       "DefaultIndex": 0
     },
+    {
+      "Name": "PMU_FORCE_LIMIT",
+      "Path": "/proc/vendor_sched/pmu_force_limited",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "DefaultIndex": 0
+    },
     {
       "Name": "EM_Profile",
       "Path": "/sys/kernel/pixel_em/active_profile",
@@ -1764,6 +1773,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "EM_Profile",
@@ -1896,6 +1911,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "EM_Profile",
@@ -2058,6 +2079,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
@@ -2358,6 +2385,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_LIMIT_FREQ",
@@ -2552,6 +2585,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "BigTjOffset",
@@ -2677,6 +2716,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "BigTjOffset",
@@ -2983,6 +3028,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "EM_Profile",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 4ed5a55f..999f0a98 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -663,6 +663,15 @@
       ],
       "DefaultIndex": 0
     },
+    {
+      "Name": "PMU_FORCE_LIMIT",
+      "Path": "/proc/vendor_sched/pmu_force_limited",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "DefaultIndex": 0
+    },
     {
       "Name": "EM_Profile",
       "Path": "/sys/kernel/pixel_em/active_profile",
@@ -1753,6 +1762,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "EM_Profile",
@@ -1885,6 +1900,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "EM_Profile",
@@ -2047,6 +2068,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
@@ -2347,6 +2374,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_LIMIT_FREQ",
@@ -2541,6 +2574,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "BigTjOffset",
@@ -2726,6 +2765,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "BigTjOffset",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 02d1615d..dae37274 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -579,6 +579,15 @@
       ],
       "DefaultIndex": 0
     },
+    {
+      "Name": "PMU_FORCE_LIMIT",
+      "Path": "/proc/vendor_sched/pmu_force_limited",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "DefaultIndex": 0
+    },
     {
       "Name": "EM_Profile",
       "Path": "/sys/kernel/pixel_em/active_profile",
@@ -1764,6 +1773,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "EM_Profile",
@@ -1896,6 +1911,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "EM_Profile",
@@ -2058,6 +2079,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
@@ -2358,6 +2385,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_LIMIT_FREQ",
@@ -2552,6 +2585,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "BigTjOffset",
@@ -2677,6 +2716,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "BigTjOffset",
@@ -2983,6 +3028,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "EM_Profile",
diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json
index 3cd2fa90..d5649f28 100644
--- a/perf/powerhint-zuma.json
+++ b/perf/powerhint-zuma.json
@@ -1524,6 +1524,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "EM_Profile",
@@ -1650,6 +1656,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "EM_Profile",
@@ -1782,6 +1794,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
@@ -2052,6 +2070,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_LIMIT_FREQ",
@@ -2246,6 +2270,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "BigTjOffset",
@@ -2431,6 +2461,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "PMU_FORCE_LIMIT",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "BigTjOffset",

From 26876c97409afcca2e953c982b4914b502c03a80 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Thu, 9 May 2024 04:28:35 +0000
Subject: [PATCH 2/3] waves: Thermal Throttling scheme

Bug: 338159946
Bug: 338159502
Test: manual test

Change-Id: I539d7cf1fbcab817a86ce54b4f6ee6ac28943d86
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/caiman/tuning/waves/waves_preset.mps | Bin 223938 -> 223938 bytes
 audio/tokay/tuning/waves/waves_preset.mps  | Bin 223938 -> 223938 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/caiman/tuning/waves/waves_preset.mps b/audio/caiman/tuning/waves/waves_preset.mps
index f07d0bcb074d69e3830f90a76f35f72c83208ff4..8b937baa954824be9e435d4d586b08341b125166 100644
GIT binary patch
delta 5634
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

delta 5791
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

diff --git a/audio/tokay/tuning/waves/waves_preset.mps b/audio/tokay/tuning/waves/waves_preset.mps
index f07d0bcb074d69e3830f90a76f35f72c83208ff4..8b937baa954824be9e435d4d586b08341b125166 100644
GIT binary patch
delta 5634
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

delta 5791
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


From 730f445f0164fc85390a7ddefb3d753108eb2c40 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Mon, 6 May 2024 20:51:07 +0000
Subject: [PATCH 3/3] Enable PMU during photo capture

Bug: 298227152
Test: Kibble 12MP - https://docs.google.com/spreadsheets/d/1Exxzy_7CHu4RQQ_-eR2s16Ob9BpxdQZFn6GIkUmoc4k/edit?resourcekey=0-CrG5HCXn9v7iR0PFk84j2g#gid=328258859
Test: Kibble 50MP - https://docs.google.com/spreadsheets/d/1qIdxci3qRwgM_XD5rRdmQPqDrsf8VHQIqQggDh2rgGY/edit?resourcekey=0-t25YyqKalsLbrCM7ADDHlQ#gid=2134912777
Test: Kibble 12MP - repeated capture - https://docs.google.com/spreadsheets/d/1XTwC5iCaobxwCcj5QH1f_34lJysvFDv53wt4K9l8DAM/edit#gid=1477598242
Test: Kibble 50MP - repeated capture - https://docs.google.com/spreadsheets/d/17wlxE2MsRx56Vhr9IE1iBYLz1Lee1s7Bb7E_GKaBJtc/edit?resourcekey=0-Vh8vf55xZHgYnWqDESm5lA#gid=1630323952
Test: Latency 12MP - https://docs.google.com/spreadsheets/d/1xUmS4H8SmwKzrL-CScIhZABsrlCq1CZsDT9ZSWFAMwU/edit#gid=466916271
Test: Latency 50MP - https://docs.google.com/spreadsheets/d/1GUs1TVCCOD6Bv73ilxrjg99tJVq6wQ5kJfYrJ1djY54/edit#gid=1885938822
Change-Id: I5083184f9e226d42584de5b6910994f1d5d3cc52
---
 perf/powerhint-caiman.json        | 52 ++++++++++++++++++-----------
 perf/powerhint-komodo.json        | 52 ++++++++++++++++++-----------
 perf/powerhint-ripcurrentpro.json | 54 ++++++++++++++++++++-----------
 perf/powerhint-tokay.json         | 54 ++++++++++++++++++++-----------
 4 files changed, 138 insertions(+), 74 deletions(-)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index bd9a7efe..d322bcff 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -594,10 +594,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -606,6 +607,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -620,6 +622,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -632,6 +635,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -654,8 +658,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1412,27 +1416,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index a513e6eb..4af907ea 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -594,10 +594,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -606,6 +607,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -620,6 +622,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -632,6 +635,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -654,8 +658,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1412,27 +1416,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 4ed5a55f..4f6c5517 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -53,7 +53,7 @@
         "1800000",
         "1548000",
         "820000",
-        "610000",        
+        "610000",
         "0"
       ],
       "ResetOnInit": true
@@ -678,10 +678,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -690,6 +691,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -704,6 +706,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -716,6 +719,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -738,8 +742,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1401,27 +1405,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 02d1615d..d322bcff 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -594,10 +594,11 @@
       "Name": "PMU_LIT_LIMIT_FREQ",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
       "Values": [
+        "1425000",
         "1328000",
         "1098000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -606,6 +607,7 @@
       "Values": [
         "76",
         "70",
+        "40",
         "55",
         "42",
         "35",
@@ -620,6 +622,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency",
       "Values": [
         "1795000",
+        "1549000",
         "1328000"
       ],
       "DefaultIndex": 0,
@@ -632,6 +635,7 @@
         "59",
         "50",
         "32",
+        "15",
         "30",
         "20",
         "18"
@@ -654,8 +658,8 @@
       "Values": [
         "62",
         "50",
-        "22",
-        "20"
+        "20",
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -764,7 +768,7 @@
         "1800000",
         "1548000",
         "820000",
-        "610000",        
+        "610000",
         "0"
       ],
       "ResetOnInit": true
@@ -1412,27 +1416,39 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 3000,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
+      "Node": "PMU_LIT_LIMIT_FREQ",
       "Duration": 3000,
       "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "PMU_POLL",
+      "Node": "PMU_MID_LIMIT_FREQ",
       "Duration": 3000,
-      "Value": "0"
+      "Value": "1549000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_LIMIT_FREQ",
+      "Duration": 3000,
+      "Value": "1885000"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "40"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_MID_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "15"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "PMU_BIG_SPC_THRESHOLD",
+      "Duration": 3000,
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",