From b8a61cc3837324a6f1099e9652baeca71a404d66 Mon Sep 17 00:00:00 2001
From: Ted Wang <tedwang@google.com>
Date: Wed, 10 Apr 2024 02:31:25 +0000
Subject: [PATCH 01/10] [Bluetooth] Update Bluetooth SAR table for JP region

Test: make; verified by RF
Bug: 329349632
Change-Id: Ie40cfe7e65ef6b62bf7480aab944dc18a6577b2c
---
 bluetooth/bluetooth_power_limits_comet_JP.csv | 71 +++++++++++++++++++
 device-comet.mk                               |  1 +
 2 files changed, 72 insertions(+)
 create mode 100644 bluetooth/bluetooth_power_limits_comet_JP.csv

diff --git a/bluetooth/bluetooth_power_limits_comet_JP.csv b/bluetooth/bluetooth_power_limits_comet_JP.csv
new file mode 100644
index 0000000..8131391
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_comet_JP.csv
@@ -0,0 +1,71 @@
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
diff --git a/device-comet.mk b/device-comet.mk
index fb2a398..22ca33f 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -152,6 +152,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+    $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CE.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CE.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv

From 2c94505351705e741b161c2807786516ae918eee Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Fri, 19 Apr 2024 03:33:46 +0800
Subject: [PATCH 02/10] thermal: read thermistor temperature from upstream
 sysfs

tz_temp callback will invoke thermal_zone_device_update and return the
cached temp from thermal core. However, during device resume, the cached
temp may be reset to INVALID number before being returned.

So, change the reading path to upstream temp_show which will return the
temperature from thermistor driver directly.

Current Issue:
We are observing lot of extreme low temp for vskin being reported and
with all coefficients being positive the only way negative vskin is
reported is when thermistors report very low temp. Since abnormality
logging is rate limited this reduces the amount of ml model issues
reported.

Bug: 323987378
Test: Local build and verify lshal
Change-Id: I2445f9d654c2a86c9507bf1654dc44f3b765c889
---
 thermal/thermal_info_config_charge_comet.json | 6 ------
 thermal/thermal_info_config_comet.json        | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json
index e8b7e55..8ab9979 100644
--- a/thermal/thermal_info_config_charge_comet.json
+++ b/thermal/thermal_info_config_charge_comet.json
@@ -4,7 +4,6 @@
       "Name": "soc_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -13,7 +12,6 @@
       "Name": "rffe_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -22,7 +20,6 @@
       "Name": "modem_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -31,7 +28,6 @@
       "Name": "gnss_tcxo_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -40,7 +36,6 @@
       "Name": "usb_conn_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 46.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -49,7 +44,6 @@
       "Name": "charger_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 34.89, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index bb699f5..48361f6 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -44,7 +44,6 @@
             "Name": "soc_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -53,7 +52,6 @@
             "Name": "rffe_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -62,7 +60,6 @@
             "Name": "modem_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -71,7 +68,6 @@
             "Name": "gnss_tcxo_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -80,7 +76,6 @@
             "Name": "usb_conn_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NAN", 30.79, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -89,7 +84,6 @@
             "Name": "charger_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NAN", 34.89, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -97,13 +91,11 @@
         {
             "Name": "inner_display_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/inner_display_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
             "Name": "display_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/display_therm/tz_temp",
             "Multiplier": 0.001
         },
         {

From 2e325a80b2accd1c65d68767d50e98543725a4b8 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Mon, 22 Apr 2024 14:17:58 +0000
Subject: [PATCH 03/10] Set big core to cpu skip mask by default

Also reset the mask for launch and other camera streaming modes that
do not use it.

Bug: 248621289
Test: build pass
Change-Id: I754a12ac7883a4e5da44e587a28dadf0a990da3d
---
 powerhint-comet.json | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 74e136e..da1ae8d 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -221,7 +221,6 @@
         "0x0",
         "0x80"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -865,6 +864,12 @@
       "Duration": 1000,
       "Value": "0-3"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPUSkipMask",
+      "Duration": 5000,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "ReducePreferIdle",
@@ -1125,6 +1130,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUSkipMask",
+      "Duration": 2000,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -1286,6 +1297,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPUSkipMask",
+      "Duration": 1000,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1880,6 +1897,12 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -2300,6 +2323,12 @@
       "Duration": 0,
       "Value": "4-7"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PowerHALCameraRunning",
@@ -2444,6 +2473,12 @@
       "Duration": 0,
       "Value": "30"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",

From be09cda8ba9575e9668f2849ad9c922cc94d825d Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Mon, 22 Apr 2024 13:09:47 +0800
Subject: [PATCH 04/10] thermal: Update VSkin-Model

- Unhide VSkin-Model to ensure thermal recorder can log
- Reduce vskin-model-legacy-diff to align with other devices
- Remove model backupsensor, since model is not used for throttling
  remove backup sensor to collect more field issues.

Bug: 315948438
Test: Push config and verify dumpsys
Change-Id: I4adfcb6a13c58b15f1d97b1130d4bc0f1776f235
---
 thermal/thermal_info_config_comet.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index bb699f5..9659fc0 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -237,14 +237,11 @@
             "Type":"UNKNOWN",
             "Version": "1.0",
             "VirtualSensor":true,
-            "Hidden": true,
             "ModelPath":"vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
             "Combination":["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm",  "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"],
             "Multiplier":0.001,
-            "PreviousSampleCount": 3,
-            "BackupSensor": "VIRTUAL-SKIN-LEGACY",
-            "ValidateInput": true
+            "PreviousSampleCount": 3
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@@ -1144,7 +1141,7 @@
                         },
                         {
                             "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
-                            "TempRange": [-12000, 12000]
+                            "TempRange": [-7000, 7000]
                         }
                     ]
                 },

From 607d6b55a381980d8a5d63fe5ade51dd6e520a34 Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Wed, 24 Apr 2024 13:58:19 +0800
Subject: [PATCH 05/10] thermal: Add VSkin-Speaker Model

- Add linear regression model for VSkin-Speaker
- Setup abnormality monitoring:
	- 0 <= VSkin-Speaker <= 55
	- -15 <= Vskin-Speaker Model - Legacy <= 15
- Residency for Vskin-Speaker Model

Bug: 303547367
Test: Local build and verify lshal
Change-Id: Iadb46c82c2568c2eec31fe2cf7b9fd2cb9a56a04
---
 device-comet.mk                               |   1 +
 thermal/thermal_info_config_comet.json        |  80 +++++++++++++-----
 .../vt_speaker_estimation_model_comet.tflite  | Bin 0 -> 5684 bytes
 3 files changed, 62 insertions(+), 19 deletions(-)
 create mode 100644 thermal/vt_speaker_estimation_model_comet.tflite

diff --git a/device-comet.mk b/device-comet.mk
index 578cd89..2d94122 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -140,6 +140,7 @@ PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_backup_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_backup.json \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
+	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \
 
 PRODUCT_PACKAGES += \
 	init_thermal_config
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 9659fc0..ea2f844 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -253,20 +253,6 @@
             "Coefficient": [1.0, -1.0],
             "Multiplier": 1
         },
-        {
-            "Name": "STATS-UPDATOR",
-            "Type": "UNKNOWN",
-            "VirtualSensor": true,
-            "Hidden": true,
-            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
-            "Coefficient": [0.0, 0.0, 0.0],
-            "Multiplier": 1,
-            "SendPowerHint": true,
-            "PollingDelay": 300000,
-            "PassiveDelay": 7000
-        },
         {
             "Name": "VIRTUAL-SKIN",
             "Type": "SKIN",
@@ -875,17 +861,50 @@
             ]
         },
         {
-            "Name": "VIRTUAL-SKIN-SPEAKER",
+            "Name": "VIRTUAL-SKIN-SPEAKER-LEGACY",
             "Type": "UNKNOWN",
             "Version": "0.1",
+            "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "usb_conn_therm",
             "Formula": "WEIGHTED_AVG",
             "Combination": ["usb_conn_therm", "maxfg_base"],
             "Coefficient": [0.89, 0.01],
+            "Offset": 8426,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
+            "Type": "UNKNOWN",
+            "Version": "1.0",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "ModelPath": "vt_speaker_estimation_model.tflite",
+            "Formula": "USE_ML_MODEL",
+            "Combination": ["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm",  "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"],
+            "Multiplier": 0.001,
+            "PreviousSampleCount": 3
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-LEGACY"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER",
+            "Type": "UNKNOWN",
+            "Version": "1.0",
+            "VirtualSensor": true,
+            "TriggerSensor": "usb_conn_therm",
+            "Formula": "MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL"],
+            "Coefficient": [1.0],
             "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "Offset": 8426,
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000,
@@ -1000,6 +1019,21 @@
             "Type": "NPU",
             "HotThreshold": ["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
             "Multiplier": 0.001
+        },
+        {
+            "Name": "STATS-UPDATOR",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm", "usb_conn_therm"],
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
+                            "VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-LEGACY", "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF"],
+            "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            "Multiplier": 1,
+            "SendPowerHint": true,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         }
     ],
     "CoolingDevices": [
@@ -1124,8 +1158,8 @@
                     ]
                 },
                 {
-                    "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [35, 37]
+                    "Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
+                    "Thresholds": [0, 37, 42, 47, 57, 100]
                 }
             ],
             "Abnormality": {
@@ -1139,9 +1173,17 @@
                             "Monitor": ["VIRTUAL-SKIN-MODEL"],
                             "TempRange": [0.0, 57.0]
                         },
+                        {
+                            "Monitor": ["VIRTUAL-SKIN-SPEAKER-MODEL"],
+                            "TempRange": [0.0, 57.0]
+                        },
                         {
                             "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
                             "TempRange": [-7000, 7000]
+                        },
+                        {
+                            "Monitor": ["VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF"],
+                            "TempRange": [-15000, 15000]
                         }
                     ]
                 },
diff --git a/thermal/vt_speaker_estimation_model_comet.tflite b/thermal/vt_speaker_estimation_model_comet.tflite
new file mode 100644
index 0000000000000000000000000000000000000000..b24da7b6daaea7991a93fc483eeabe970724cf78
GIT binary patch
literal 5684
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

literal 0
HcmV?d00001


From 524abc089f6c5c3533b06f11f47bec03d6e8484e Mon Sep 17 00:00:00 2001
From: Thomas Girardier <girardier@google.com>
Date: Thu, 25 Apr 2024 16:21:39 +0000
Subject: [PATCH 06/10] Revert "[Bluetooth] Disable BT auto on feature"

This reverts commit ef058c241cbb5c19364e4836c4d6daba967de0f5.

Reason for revert: Auto On has been approved for 24Q3

Change-Id: Ic02d1b6438dede9d739e8f60bd66fe07b9531b31
---
 device-comet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-comet.mk b/device-comet.mk
index f26ecd6..7a103b8 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -182,7 +182,7 @@ PRODUCT_PACKAGES_DEBUG += \
 
 # Bluetotoh Auto On feature
 PRODUCT_PRODUCT_PROPERTIES +=\
-    bluetooth.server.automatic_turn_on=false
+    bluetooth.server.automatic_turn_on=true
 
 # Bluetooth AAC VBR
 PRODUCT_PRODUCT_PROPERTIES += \

From daa7974899e745a9032d52fb4b5865b6da4245e2 Mon Sep 17 00:00:00 2001
From: guibing <guibing@google.com>
Date: Thu, 25 Apr 2024 21:58:35 +0000
Subject: [PATCH 07/10] Adpf:comet: revert heuristic boost triggering
 condition.

This reverts previous JankCheckTimeFactor from 1.43 to 1.2.

Since the current reported duration doesn't include the GPU
part, the JankCheckTimeFactor needs to be smaller for matching
jank frame detection.

Bug: 204204746
Test: adb shell dumpsys android.hardware.power.Ipower/default;
      check adpf sessions' traces.
Change-Id: I0539faf785c3a5a7cfd4dbb948b4c1506ed3be5b
---
 powerhint-comet.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 74e136e..4c9e952 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -3196,7 +3196,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3229,7 +3229,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3262,7 +3262,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },

From b76a85208263ba085f8863b3b8fc43fecc76ac95 Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Fri, 26 Apr 2024 03:46:42 +0000
Subject: [PATCH 08/10] thermal: use frequency to define hard limit and cdev
 ceiling

Test: Boot to home and flash on device
Bug: 330780045
Change-Id: I6deaa4de72d289468344c3312ac44e266e225883
Signed-off-by: Peter (YM) <peterym@google.com>
---
 thermal/thermal_info_config_comet.json | 71 +++++++++++++-------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index bb699f5..fe3b648 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -344,7 +344,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S4M_VDD_CPUCL0",
-                    "CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
+                    "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
@@ -352,7 +352,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S2M_VDD_CPUCL1",
-                    "CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
+                    "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -360,7 +360,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
-                    "CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
+                    "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
                 }
             ],
             "Profile": [
@@ -420,21 +420,22 @@
                     "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
-                    "CdevCeiling": [0, 7, 7, 7, 7, 7, 7]
+                    "CdevCeilingFrequency": [1950000, 1098000, 1098000, 1098000, 1098000, 1098000, 1098000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
                     "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
+                    "CdevCeilingFrequency": [2600000, 1221000, 1221000, 1221000, 1221000, 1221000, 1221000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
                     "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
+                    "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
+     
                 }
             ],
             "Profile": [
@@ -511,21 +512,21 @@
                     "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
-                    "CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
+                    "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
                     "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
+                    "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
                     "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
+                    "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
                 }
             ],
             "Profile": [
@@ -559,25 +560,21 @@
                             ],
                             "MaxReleaseStep": 1,
                             "MaxThrottleStep": 1,
-                            "CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
-                        },
-                        {
+                            "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
+                         },
+                         {
                             "CdevRequest": "thermal-cpufreq-1",
-                            "CdevWeightForPID": [
-                                0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428
-                            ],
+                            "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
                             "MaxReleaseStep": 1,
                             "MaxThrottleStep": 2,
-                            "CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
-                        },
-                        {
+                            "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
+                         },
+                         {
                             "CdevRequest": "thermal-cpufreq-2",
-                            "CdevWeightForPID": [
-                                0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225
-                            ],
+                            "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
                             "MaxReleaseStep": 1,
                             "MaxThrottleStep": 2,
-                            "CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
+                            "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
                         }
                     ]
                 }
@@ -615,8 +612,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S4M_VDD_CPUCL0",
-                    "CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
-                    "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+                    "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000],
+                    "LimitInfoFrequency": [1950000, 1950000, 1950000, 1950000, 1950000, 820000, 820000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
@@ -624,8 +621,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S2M_VDD_CPUCL1",
-                    "CdevCeiling": [0, 13, 13, 13, 14, 16, 16],
-                    "LimitInfo": [0, 0, 0, 0, 0, 16, 16]
+                    "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000],
+                    "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -633,8 +630,9 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
-                    "CdevCeiling": [0, 17, 17, 17, 17, 17, 17],
-                    "LimitInfo": [0, 0, 0, 0, 0, 17, 17]
+                    "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000],
+                    "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000]
+         
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -1009,17 +1007,20 @@
         {
             "Name": "thermal-cpufreq-0",
             "Type": "CPU",
-            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
+            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
+            "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies"
         },
         {
-            "Name": "thermal-cpufreq-1",
-            "Type": "CPU",
-            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
+            "Name":"thermal-cpufreq-1",
+            "Type":"CPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
+            "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies"
         },
         {
-            "Name": "thermal-cpufreq-2",
-            "Type": "CPU",
-            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
+            "Name":"thermal-cpufreq-2",
+            "Type":"CPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
+            "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy7/scaling_available_frequencies"
         },
         {
             "Name": "thermal-gpufreq-0",

From ca76952b5a01ef281ffd82bd5bffbad366224aa3 Mon Sep 17 00:00:00 2001
From: Taeju Park <taeju@google.com>
Date: Fri, 26 Apr 2024 18:44:57 +0000
Subject: [PATCH 09/10] powerhint: remove lcpi paramter for PMU limit

PMU-based soft freq limit no longer use lcpi parameter

Bug: 295054083
Change-Id: I196b238b5607774e6ec78b69a49ab6665cdda97c
Signed-off-by: Taeju Park <taeju@google.com>
---
 powerhint-comet.json | 103 -------------------------------------------
 1 file changed, 103 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 2b45652..412af94 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -599,15 +599,6 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "PMU_LIT_LCPI_THRESHOLD",
-      "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold",
-      "Values": [
-        "2",
-        "0"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
@@ -632,14 +623,6 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "PMU_MID_LCPI_THRESHOLD",
-      "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold",
-      "Values": [
-        "3"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
@@ -662,14 +645,6 @@
       ],
       "DefaultIndex": 0
     },
-    {
-      "Name": "PMU_BIG_LCPI_THRESHOLD",
-      "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/lcpi_threshold",
-      "Values": [
-        "3"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold",
@@ -1766,12 +1741,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -1784,12 +1753,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -1802,12 +1765,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -1922,12 +1879,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -1940,12 +1891,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -1958,12 +1903,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -2096,12 +2035,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -2114,12 +2047,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -2132,12 +2059,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -2462,12 +2383,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "2"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -3075,12 +2990,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -3093,12 +3002,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -3111,12 +3014,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_SPC_THRESHOLD",

From 6c0d95703976b6d4e8095facbb6551390aa6a220 Mon Sep 17 00:00:00 2001
From: Taeju Park <taeju@google.com>
Date: Fri, 26 Apr 2024 19:00:37 +0000
Subject: [PATCH 10/10] powerhint: tune default value for PMU limit paramter

Bug: 310237445
Change-Id: Ib7d0876c5f82e81b20b83ff0b96bfed98bff747f
Signed-off-by: Taeju Park <taeju@google.com>
---
 powerhint-comet.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 412af94..c8d1d4d 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -603,6 +603,7 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
+        "76",
         "70",
         "55",
         "42",
@@ -627,6 +628,7 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
+        "59",
         "50",
         "32",
         "30",
@@ -649,6 +651,7 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold",
       "Values": [
+        "62",
         "50",
         "22",
         "20"