From 7b37c424fb8207be3db1a86a85b78f49c4718836 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Mon, 8 Aug 2022 05:25:52 +0000 Subject: [PATCH 01/20] gps: Enable SI SUPL over Wifi Test: - - SI SUPL Wifi on + mobile network off - SI SUPL Wifi on + mobile network on - SI SUPL Wifi off + mobile network on - SI SUPL Wifi on + airplane mode on Bug: 238043664 Change-Id: If09294c19bfd42da737c589be992c802e0b008de --- gps.xml.b3 | 4 +++- gps_user.xml.b3 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gps.xml.b3 b/gps.xml.b3 index a9d4598..128f98d 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -20,7 +20,9 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" - SuplUseApn="true" + SuplUseApn="false" + SuplUseApnNI="true" + SuplDummyCellInfo="true" SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index b3cdd0d..80e26be 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -19,7 +19,9 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" - SuplUseApn="true" + SuplUseApn="false" + SuplUseApnNI="true" + SuplDummyCellInfo="true" SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" From 3ab3d62d9b848088161f5908e68490b070d53916 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 23:08:35 -0700 Subject: [PATCH 02/20] Remove FPS boost Bug: 241312961 Test: Build Change-Id: I5fbdc1063d2ac0c468d2a8c5b00293adac7d4179 Signed-off-by: Wei Wang --- powerhint.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index 560a6f8..035c4c8 100644 --- a/powerhint.json +++ b/powerhint.json @@ -144,8 +144,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1278,7 +1277,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", From 2784ce12aa77a9de730b3c36565897de5f953edd Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:29:07 +0000 Subject: [PATCH 03/20] Update bluejay SVN to 16 Bug: 242323332 Change-Id: Ibdc6b9a5e7e5891c8d3694b843acba3e8e732fcc --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 34e965b..b5d588e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=15 + ro.vendor.build.svn=16 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 1211bd84ff118d80f45fbf45ffe405bee1225fd9 Mon Sep 17 00:00:00 2001 From: pointerkung Date: Tue, 5 Jul 2022 14:03:10 +0800 Subject: [PATCH 04/20] Change util threshold of camera streaming high Fine-tune the util threshold to "1100 1078 1024" Bug: 234407965 Test: Camera CTS, ITS. 60 fps recording test. Change-Id: I57d7d63ebe44ce31ee00e347c403c33c292ee98e --- powerhint.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerhint.json b/powerhint.json index c28665e..8b7801c 100644 --- a/powerhint.json +++ b/powerhint.json @@ -124,7 +124,7 @@ "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", - "1100" + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -894,7 +894,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", From c5af65074f6e5d557272a1fbe4fbde298a3184e0 Mon Sep 17 00:00:00 2001 From: David Chao Date: Mon, 15 Aug 2022 19:04:05 +0800 Subject: [PATCH 05/20] thermal: seperate thermal config for charging - Separate thermal config for charger mode and remove the unused thermal throttling. Bug: 240897207 Test: usbc overheating protection and charging throttling worked properly in charger. Change-Id: Ieec7e1403456b5d878c1dfb48576ab6d5bde9908 --- device-bluejay.mk | 3 +- thermal_info_config_charge_bluejay.json | 414 ++++++++++++++++++++++++ 2 files changed, 416 insertions(+), 1 deletion(-) create mode 100644 thermal_info_config_charge_bluejay.json diff --git a/device-bluejay.mk b/device-bluejay.mk index 6e9a199..28ed77b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -60,7 +60,8 @@ PRODUCT_COPY_FILES += \ # Thermal Config PRODUCT_COPY_FILES += \ - device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json + device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/bluejay/thermal_info_config_charge_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/thermal_info_config_charge_bluejay.json b/thermal_info_config_charge_bluejay.json new file mode 100644 index 0000000..2ee436f --- /dev/null +++ b/thermal_info_config_charge_bluejay.json @@ -0,0 +1,414 @@ +{ + "Sensors":[ + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"skin_therm1", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"skin_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "39.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + "0.0", + "0.9", + "0.0", + "0.0", + "0.0", + "0.0", + "0.0" + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"charger_skin_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-NEUTRAL", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "quiet_therm", + "neutral_therm" + ], + "Coefficient":[ + "0.7", + "0.3" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-SKIN2", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "skin_therm2" + ], + "Coefficient":[ + "0.7", + "0.3" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "skin_therm1", + "disp_therm", + "skin_therm2", + "gnss_tcxo_therm" + ], + "Coefficient":[ + "0.35", + "0.2", + "0.1", + "0.15", + "0.2" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"neutral_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-NEUTRAL-SKIN2", + "VIRTUAL-NEUTRAL", + "VIRTUAL-QUIET-NEUTRAL" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "39.0", + "41.0", + "43.0", + "45.0", + "47.0", + "55.0" + ], + "HotHysteresis":[ + 0.0, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 4, 6, 6, 8, 8, 8], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 3, 6, 6 ,8 ,8], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"USB2-MINUS-CHG", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "charger_skin_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor":"usb_pwr_therm2", + "Combination":[ + "usb_pwr_therm2", + "USB2-MINUS-CHG" + ], + "Coefficient":[ + "39000", + "7000" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "2.0", + "NAN", + "NAN" + ], + "BindedCdevInfo":[ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } + ], + "VrThreshold":"NAN", + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + } + ], + "CoolingDevices":[ + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + } + ], + "PowerRails":[ + { + "Name":"VSYS_PWR_DISPLAY" + }, + { + "Name":"S2M_VDD_CPUCL2", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S3M_VDD_CPUCL1", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S4M_VDD_CPUCL0", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S2S_VDD_G3D", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S5M_VDD_INT" + }, + { + "Name":"S1M_VDD_MIF" + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_DISPLAY", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 + } + ] +} From 86f174cee5aec54756e18ba40013d796087aab62 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 23 Aug 2022 17:48:22 +0000 Subject: [PATCH 06/20] Update bluejay SVN to 17 Bug: 242323332 Change-Id: I56d7896f25218778e8a5e2b85e858b4f2f62fd93 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b5d588e..bcbc23c 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=16 + ro.vendor.build.svn=17 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 73cd02795be0ece2eef822b4b5a60bac2e46494b Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Thu, 14 Jul 2022 21:43:56 +0000 Subject: [PATCH 07/20] Remove existing surfaceflinger uclamp boost configuration Remove existing surfaceflinger uclamp settings to not interfere with new adpf cpu hints for surfaceflinger Bug: 195990840 Test: manual Change-Id: I763f1baec65f0cad341074f461a086776f7a5f5d --- conf/init.bluejay.rc | 8 ++++++++ powerhint.json | 22 ---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index d2a278d..1ee067c 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -30,3 +30,11 @@ on property:ro.boot.hardware.sku=GB17L on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 + +# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints +on property:sys.boot_completed=1 + trigger override-sf-uclamp + +on override-sf-uclamp + write /proc/vendor_sched/rt_uclamp_min 0 + write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/powerhint.json b/powerhint.json index 70768b1..dd8eb09 100644 --- a/powerhint.json +++ b/powerhint.json @@ -157,16 +157,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -475,12 +465,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -499,12 +483,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From e07cbc757a39c2d31676267adc0e409f6dfbdae6 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 22 Jul 2022 06:36:58 +0000 Subject: [PATCH 08/20] Enable adpf cpu hints for SurfaceFlinger in device mk file Bug: 195990840 Test: manual Change-Id: Ia41debdeedbec34c3d4b38eed509fd2d78ffdc88 --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index b3e6da6..e59e7df 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -232,3 +232,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=6.4 \ ro.com.google.ime.height_ratio=1.05 + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true From 7dc600e5f73ab30dae3999279d2b628d72618f75 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 30 Aug 2022 03:15:42 +0000 Subject: [PATCH 09/20] Config dex2oat according to thermal status Config dex2oat cpuset and thread count according to thermal status. LIGHT cpuset = 0,1,2,3,4,5 thread = 6 MODERATE cpuset = 0,1,2,3 thread = 4 SEVERE cpuset = 0,1,2,3 thread = 4 CRITICAL cpuset = 0,1,2,3 thread = 2 EMERGENCY cpuset = 0,1,2,3 thread = 1 Bug: 242948832 Test: build pass Change-Id: I29c77aaa97a26254aa598e1dfbdcbaeae1aa2521 --- powerhint.json | 394 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 316 insertions(+), 78 deletions(-) diff --git a/powerhint.json b/powerhint.json index dd8eb09..21e0f21 100644 --- a/powerhint.json +++ b/powerhint.json @@ -462,6 +462,28 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" } ], "Actions": [ @@ -1315,6 +1337,138 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", @@ -1369,6 +1523,168 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1441,78 +1757,6 @@ "Duration": 1000, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", @@ -1530,12 +1774,6 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" } ], "AdpfConfig": [ From a94fab2d9972f071b2ef974d23312bb969b76271 Mon Sep 17 00:00:00 2001 From: juyuchen Date: Wed, 31 Aug 2022 12:36:09 +0800 Subject: [PATCH 10/20] audio: enable gapless offload for trimming data Bug: 233723867 Test: manual audio tests Signed-off-by: juyuchen Change-Id: I98e477f00c731ecebcacc5d633192e20bc55c021 --- audio/bluejay/config/mixer_paths.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/bluejay/config/mixer_paths.xml b/audio/bluejay/config/mixer_paths.xml index c0991ce..af4517c 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -31,7 +31,7 @@ - + From 7fb9a39f3e72a55b0b9d4e05a2af4ada3f747706 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Thu, 1 Sep 2022 21:30:28 +0800 Subject: [PATCH 11/20] Adjust zram size to 3G According to the test result, turn zram size to 3G. Bug: 240372982 Test: boot Signed-off-by: Martin Liu Change-Id: Ibafae43d860316188b71507b6207378d9221e456 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b3e6da6..2262bb2 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -161,7 +161,7 @@ PRODUCT_PACKAGES += \ # Set zram size PRODUCT_VENDOR_PROPERTIES += \ - vendor.zram.size=2g + vendor.zram.size=3g # Enable camera 1080P 60FPS binning mode PRODUCT_VENDOR_PROPERTIES += \ From 08dcbe98895afef7afd294939533c99368fc5bfd Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 18 Aug 2022 03:01:37 +0000 Subject: [PATCH 12/20] Remove RestrictedCpuset hint With systemui now changed its cpuset in early stage, we no longer need RestrictedCpuset hint as workaround. Bug: 242775562 Test: build pass Change-Id: I44477860126809487bb960eb1a0b037734357975 --- powerhint.json | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/powerhint.json b/powerhint.json index 21e0f21..f1794a0 100644 --- a/powerhint.json +++ b/powerhint.json @@ -203,15 +203,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1762,18 +1753,6 @@ "Node": "MLUclampBoost", "Duration": 2000, "Value": "512" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ From 68db06671256e7c31a895b5944367dc1ce01c0cc Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:19:51 +0000 Subject: [PATCH 13/20] Update bluejay SVN to 18 Bug: 244460991 Change-Id: Ia13d9039e409fe1d66ef8d167c90e12e69f9323d --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index bcbc23c..2f9e699 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=17 + ro.vendor.build.svn=18 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From bd97cfde6bea74f5314e10ba294e2008db72775a Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Tue, 13 Sep 2022 17:13:34 +0800 Subject: [PATCH 14/20] gps: enable GNSS PPS feature Bug: 244398743 Test: extensive tests with PPS enabled in b/235270127 Change-Id: Idce3155ad73537a15023864ed57758c3fb1484c7 --- gps.xml.b3 | 2 ++ gps_user.xml.b3 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 128f98d..99e3b58 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -59,9 +59,11 @@ CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" + PpsDevice="/sys/class/pps/pps0/assert_elapsed" /> Date: Thu, 15 Sep 2022 22:13:20 +0800 Subject: [PATCH 15/20] Remove frequency boost of big cores for FACE_UNLOCK Bug: 245619770 Test: build Change-Id: I1ee5d3ad670de959eb1321926d1d739d6e12207d --- powerhint.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/powerhint.json b/powerhint.json index f1794a0..97081c6 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1676,18 +1676,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", From 34998e3264b7fda5c09b8a831ff07a211067fe2f Mon Sep 17 00:00:00 2001 From: Chase Wu Date: Mon, 12 Sep 2022 20:34:33 +0800 Subject: [PATCH 16/20] vibrator: disable f0 and redc compensation Since those feature was enabled in android T, disabling these features as android S version. Bug: 241353178 Test: check the value after device boot up Test: update PtsHapticsTestCases and run it Signed-off-by: Chase Wu Change-Id: I1b363136147beff334fba0ca1e065729dcfb57e4 Merged-In: I1b363136147beff334fba0ca1e065729dcfb57e4 --- device-bluejay.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 2ef5611..bc7d573 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -222,7 +222,9 @@ PRODUCT_SHIPPING_API_LEVEL := 32 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.supported_primitives=243 + ro.vendor.vibrator.hal.supported_primitives=243 \ + ro.vendor.vibrator.hal.f0.comp.enabled=0 \ + ro.vendor.vibrator.hal.redc.comp.enabled=0 # Device features PRODUCT_COPY_FILES += \ From 027014dc8c4f1da8cec85edd012317ff090d2d51 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Fri, 16 Sep 2022 07:47:20 +0000 Subject: [PATCH 17/20] powerhint: clean up unused hints in B3 INTERACTION is removed but some actions still use it. Bug: 246738037 Test: pts-tradefed run commandAndExit pts -m PtsPerformanceTestCases -t com.google.android.perf.pts.PowerHintJsonVerifyTest Change-Id: Iaecddf37361eeda9697dd6324a4de9cc33511f5c --- powerhint.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/powerhint.json b/powerhint.json index f1794a0..bb0ae06 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1288,11 +1288,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From d9df6ed1b5dc52e05ec912415b526cef75233b67 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 20 Sep 2022 07:23:23 +0000 Subject: [PATCH 18/20] audio: extand the period number of hifi usecase extend this to prevent alsa trigger stop playback and causing pop Bug: 238056484 Signed-off-by: vincenttew Change-Id: I1c4bf46a51893717b8d184a0919073eafcdc1e50 --- audio/bluejay/config/audio_platform_configuration.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/bluejay/config/audio_platform_configuration.xml b/audio/bluejay/config/audio_platform_configuration.xml index 2b72e61..f510d08 100644 --- a/audio/bluejay/config/audio_platform_configuration.xml +++ b/audio/bluejay/config/audio_platform_configuration.xml @@ -198,8 +198,8 @@ - - + + From 0b27db35f289f41c05f0994a90999fcdfdb29365 Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Wed, 21 Sep 2022 18:26:14 -0700 Subject: [PATCH 19/20] Add Ownership to powerhint files Bug: 248115959 Signed-off-by: Taeju Park Change-Id: Id6ad6d8d4b49e4c82bb43d2358f93c65ba957701 --- OWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..1451bd8 --- /dev/null +++ b/OWNERS @@ -0,0 +1 @@ +per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com From 1d3082b5f44aab6185d9b051ebbec38f05f3ac44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:55:04 +0000 Subject: [PATCH 20/20] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: I11ad27a5ef5c1b5e0aa39c73c45ce6de7e429282 Merged-In: I11ad27a5ef5c1b5e0aa39c73c45ce6de7e429282 --- device-bluejay.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 87e5f1b..ddf86c6 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -42,6 +42,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,bluejay) $(call soong_config_set,lyric,tuning_product,bluejay) $(call soong_config_set,google3a_config,target_device,bluejay)