From 22a99356543a341e7673b885066c62f6d7a39c16 Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Wed, 13 Sep 2023 11:15:27 -0700
Subject: [PATCH] Restrict foreground cpuset to cpu0-5 when camera launch

Bug: 297789578
Test: Boot & check perfetto traces
Change-Id: I3d38149afb36f0b50804e2cced45d057482206ff
---
 perf/powerhint-husky.json      | 21 +++++++++++++++++++++
 perf/powerhint-ripcurrent.json | 21 +++++++++++++++++++++
 perf/powerhint-shiba.json      | 21 +++++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index dc514f4..62a8b68 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -317,6 +317,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "FGCpuset",
+      "Path": "/dev/cpuset/foreground/cpus",
+      "Values": [
+        "0-5",
+        "0-7"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDCpuset",
       "Path": "/dev/cpuset/camera-daemon/cpus",
@@ -1101,6 +1110,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "FGCpuset",
+      "Duration": 1000,
+      "Value": "0-5"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH_EXTENDED",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1143,6 +1158,12 @@
       "Duration": 2000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "FGCpuset",
+      "Duration": 2000,
+      "Value": "0-5"
+    },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 96b400c..87404ac 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -303,6 +303,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "FGCpuset",
+      "Path": "/dev/cpuset/foreground/cpus",
+      "Values": [
+        "0-5",
+        "0-7"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDCpuset",
       "Path": "/dev/cpuset/camera-daemon/cpus",
@@ -1083,6 +1092,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "FGCpuset",
+      "Duration": 1000,
+      "Value": "0-5"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH_EXTENDED",
       "Node": "CPUBigClusterMaxFreq",
@@ -1107,6 +1122,12 @@
       "Duration": 2000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "FGCpuset",
+      "Duration": 2000,
+      "Value": "0-5"
+    },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 6638a8f..c3d92d5 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -307,6 +307,15 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "FGCpuset",
+      "Path": "/dev/cpuset/foreground/cpus",
+      "Values": [
+        "0-5",
+        "0-7"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDCpuset",
       "Path": "/dev/cpuset/camera-daemon/cpus",
@@ -1091,6 +1100,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "FGCpuset",
+      "Duration": 1000,
+      "Value": "0-5"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH_EXTENDED",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1133,6 +1148,12 @@
       "Duration": 2000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH_EXTENDED",
+      "Node": "FGCpuset",
+      "Duration": 2000,
+      "Value": "0-5"
+    },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",