[coastguard skipped] Merge sparse cherrypicks from sparse-12342007-L29200030006336399 into 24Q4-release.
COASTGUARD_SKIP: I328f6571e81cc1a3fd4c9616a0382c320cf63a71
COASTGUARD_SKIP: I538d02210cb9196c395f91a44d32aba2916b3a50
Change-Id: I792df8d407e02712d83998d82d0483207e53bd68
diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk
index 90f1034..ced9ead 100644
--- a/akita/BoardConfig.mk
+++ b/akita/BoardConfig.mk
@@ -39,6 +39,7 @@
include device/google/zuma/BoardConfig-common.mk
-include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/akita/proprietary/BoardConfigVendor.mk
include device/google/akita-sepolicy/akita-sepolicy.mk
include device/google/akita/wifi/BoardConfig-wifi.mk
diff --git a/device-akita.mk b/device-akita.mk
index 51502a8..d31406e 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -437,5 +437,6 @@
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
# Bluetooth device id
+# Akita: 0x410F
PRODUCT_PRODUCT_PROPERTIES += \
- bluetooth.device_id.product_id=20495
+ bluetooth.device_id.product_id=16655
diff --git a/powerhint-akita.json b/powerhint-akita.json
index b5ae7fb..0f0ac7b 100644
--- a/powerhint-akita.json
+++ b/powerhint-akita.json
@@ -219,7 +219,6 @@
"0",
"1"
],
- "DefaultIndex": 0,
"ResetOnInit": true
},
{
@@ -286,6 +285,15 @@
"ResetOnInit": true
},
{
+ "Name": "CPUSkipMask",
+ "Path": "/proc/vendor_sched/cpu_skip_mask",
+ "Values": [
+ "0x0",
+ "0x100"
+ ],
+ "ResetOnInit": true
+ },
+ {
"Name": "BGUClampMaxBoost",
"Path": "/proc/vendor_sched/groups/bg/uclamp_max",
"Values": [
@@ -430,7 +438,6 @@
"1",
"0"
],
- "DefaultIndex": 0,
"ResetOnInit": true
},
{
@@ -461,13 +468,21 @@
"ResetOnInit": true
},
{
+ "Name": "SysGroupCfsSkipMask",
+ "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+ "Values": [
+ "0x0",
+ "0x100"
+ ],
+ "ResetOnInit": true
+ },
+ {
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
"Values": [
"1",
"0"
],
- "DefaultIndex": 0,
"ResetOnInit": true
},
{
@@ -860,6 +875,12 @@
},
{
"PowerHint": "LAUNCH",
+ "Node": "CPUSkipMask",
+ "Duration": 5000,
+ "Value": "0x0"
+ },
+ {
+ "PowerHint": "LAUNCH",
"Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
@@ -1001,6 +1022,12 @@
},
{
"PowerHint": "LAUNCH_EXTEND",
+ "Node": "CPUSkipMask",
+ "Duration": 2000,
+ "Value": "0x0"
+ },
+ {
+ "PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
"Value": "9999999"
@@ -1262,6 +1289,12 @@
},
{
"PowerHint": "CAMERA_LAUNCH",
+ "Node": "CPUSkipMask",
+ "Duration": 1000,
+ "Value": "0x0"
+ },
+ {
+ "PowerHint": "CAMERA_LAUNCH",
"Node": "CPU_BIG_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
@@ -1735,6 +1768,12 @@
"Value": "camera"
},
{
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1897,6 +1936,12 @@
"Value": "camera"
},
{
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle",
"Duration": 0,
@@ -2047,6 +2092,12 @@
"Value": "camera"
},
{
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle",
"Duration": 0,
@@ -2137,6 +2188,12 @@
"Value": "4-8"
},
{
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -2281,6 +2338,12 @@
"Value": "30"
},
{
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
+ {
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
@@ -2937,6 +3000,12 @@
},
{
"PowerHint": "CAMERA_PROJECT11",
+ "Node": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x0"
+ },
+ {
+ "PowerHint": "CAMERA_PROJECT11",
"Node": "MIFTargetLoad",
"Duration": 0,
"Value": "20 80"
diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json
index 2600889..66b2901 100644
--- a/thermal_info_config_akita.json
+++ b/thermal_info_config_akita.json
@@ -510,8 +510,8 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
"Coefficient":[1.0, 1.0],
- "HotThreshold":["NAN", 37.0, 41.0, 45.0, 47.0, 52.0, 55.0],
- "HotHysteresis":[0.0, 1.9, 3.9, 3.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000,
@@ -530,7 +530,7 @@
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [0.1, 0.1, 0.05, 0.2, 0.2, 0.2, 0.2]
+ "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
}
],
"BindedCdevInfo": [
@@ -539,8 +539,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 21, 21, 26, 26, 26, 26],
- "LimitInfo": [0, 0, 0, 0, 26, 26, 26]
+ "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
+ "LimitInfo": [0, 0, 0, 0, 0, 26, 26]
}
]
},
diff --git a/thermal_info_config_charge_akita.json b/thermal_info_config_charge_akita.json
index 736c7b6..6c4a296 100644
--- a/thermal_info_config_charge_akita.json
+++ b/thermal_info_config_charge_akita.json
@@ -83,8 +83,8 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"],
"Coefficient":[1.0, 1.0],
- "HotThreshold":["NAN", 37.0, 41.0, 45.0, 47.0, 52.0, 55.0],
- "HotHysteresis":[0.0, 1.9, 3.9, 3.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000,
@@ -103,7 +103,7 @@
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [0.1, 0.1, 0.05, 0.2, 0.2, 0.2, 0.2]
+ "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
}
],
"BindedCdevInfo": [
@@ -112,8 +112,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 21, 21, 26, 26, 26, 26],
- "LimitInfo": [0, 0, 0, 0, 26, 26, 26]
+ "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
+ "LimitInfo": [0, 0, 0, 0, 0, 26, 26]
}
]
},
