From 72f03002d6bde070abcc4645c89c0c3803db90ec Mon Sep 17 00:00:00 2001
From: weichinweng <weichinweng@google.com>
Date: Mon, 29 Jan 2024 02:59:42 +0000
Subject: [PATCH 1/2] Add BT offload config into bt_vendo_overlay

bug: 287672291
bug: 323464810
Test: BT off/on when BT CHRE enabled/disabled
Change-Id: Iaeffd8c9906132f15072f642f11e3cfc6328e1a4
---
 bluetooth/bt_vendor_overlay.conf            | 13 +++++++++++++
 bluetooth/bt_vendor_overlay_ripcurrent.conf | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index e85c15f..df3cab7 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -14,6 +14,19 @@ HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2
 # supported by BT firmware.
 HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1
 
+# Priority of uart type
+# HciUartSocket = 0
+# SerialUartPort = 1
+# SerialAocUartPort = 2
+# UserialInvalid = 3
+UserialTypePriority = 2-1
+
+# <string> The hardware support which offload capability
+BtOffloadCap = AOC
+
+# <string> The BT Offload Trunk Flag Group Name
+BtOffloadTrunkGroup = 23P_AOC
+
 # <boolean> APM Uart skip suspend to aovid hold system too long when BT using AOC UART
 ApmUartSkipSuspend = true
 
diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf
index 2473a1b..1cbbb1a 100644
--- a/bluetooth/bt_vendor_overlay_ripcurrent.conf
+++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf
@@ -3,6 +3,19 @@
 # Uart port name
 UartPort = /dev/ttySAC18
 
+# Priority of uart type
+# HciUartSocket = 0
+# SerialUartPort = 1
+# SerialAocUartPort = 2
+# UserialInvalid = 3
+UserialTypePriority = 2-1
+
+# <string> The hardware support which offload capability
+BtOffloadCap = AOC
+
+# <string> The BT Offload Trunk Flag Group Name
+BtOffloadTrunkGroup = 23P_AOC
+
 # Sar backOff high resolution support
 SarBackOffHighResolution = true
 

From dbbb0c62eae8ba034c6d6c70d482c05941cc0bdb Mon Sep 17 00:00:00 2001
From: Sam Paradis <samuelparadis@google.com>
Date: Wed, 31 Jan 2024 23:27:56 +0000
Subject: [PATCH 2/2] Change FACE_UNLOCK_BOOST to Maximize CPU Frequency

This is part of an optimization that limits the length and prevelance of
this power hint. Strict, ultra-agression minimizes power and latency
versus always-on mid aggression.

Bug: 297964952
Change-Id: I384f2e04f69d570e10c8e52f2818c1ecde6be1a0
---
 perf/powerhint-husky.json      | 16 +++++-----------
 perf/powerhint-ripcurrent.json | 16 +++++-----------
 perf/powerhint-shiba.json      | 16 +++++-----------
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 78206c8..987ecf8 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -2712,25 +2712,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "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"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1852000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 0eb4107..5735e66 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -2501,25 +2501,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "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"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1852000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index d272dbf..90ed3b1 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -2616,25 +2616,19 @@
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
       "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"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1852000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
       "Value": "1"
     },
     {