diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-03 15:47:12 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-03 15:47:12 +0000 |
commit | aebb7e90087919fa081d77ea6d36dabc8f203163 (patch) | |
tree | 0417822dc12146efdee076993ebc2d08c172b771 | |
parent | 2fa2b8ae00f85d846ee14c98c6b4609b0adbcfe7 (diff) | |
parent | ac51c65fa97db81ffe0046ac50c76fdd9886c937 (diff) | |
download | bluejay-android14-mainline-adbd-release.tar.gz |
Snap for 10428683 from ac51c65fa97db81ffe0046ac50c76fdd9886c937 to mainline-adbd-releaseaml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-adbd-release
Change-Id: Ifa447263bfb0941e2e783c907a7d38d0f9089f6b
29 files changed, 1455 insertions, 416 deletions
@@ -0,0 +1,4 @@ +per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com + +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS diff --git a/aosp_bluejay.mk b/aosp_bluejay.mk index d9b8d0f..cf64c38 100644 --- a/aosp_bluejay.mk +++ b/aosp_bluejay.mk @@ -22,3 +22,5 @@ PRODUCT_DEVICE := bluejay PRODUCT_MODEL := AOSP on Bluejay PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google + +PRODUCT_PACKAGES += com.android.vndk.current.on_vendor diff --git a/audio/bluejay/config/audio_platform_configuration.xml b/audio/bluejay/config/audio_platform_configuration.xml index 2b72e61..f1232f6 100644 --- a/audio/bluejay/config/audio_platform_configuration.xml +++ b/audio/bluejay/config/audio_platform_configuration.xml @@ -198,8 +198,8 @@ <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes --> <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/> <!-- for hifi --> - <usecase id="UC_HIFI_PLAYBACK" dev1="25"/> - <usecase id="UC_HIFI_RECORD" dev1="26"/> + <usecase id="UC_HIFI_PLAYBACK" dev1="25" period="20" period_num="4"/> + <usecase id="UC_HIFI_RECORD" dev1="26" period="20" period_num="4"/> </usecase_attr> <dsp_latency> @@ -224,6 +224,8 @@ <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/> + <be_cfg be_id="IN_CAMCORDER_MIC_BE_CFG" latency="160000"/> + <be_cfg be_id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" latency="160000"/> <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/> <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/> <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/> diff --git a/audio/bluejay/config/audio_policy_configuration.xml b/audio/bluejay/config/audio_policy_configuration.xml index d07b023..e19268f 100644 --- a/audio/bluejay/config/audio_policy_configuration.xml +++ b/audio/bluejay/config/audio_policy_configuration.xml @@ -37,7 +37,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> <mixPort name="compressed_offload" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD"> <profile name="" format="AUDIO_FORMAT_MP3" samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> @@ -192,21 +192,21 @@ <route type="mix" sink="Earpiece" sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/> <route type="mix" sink="BT A2DP Out" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT A2DP Headphones" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT A2DP Speaker" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="USB Device Out" sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> <route type="mix" sink="USB Headset Out" sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> <route type="mix" sink="BT SCO" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Headset" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Car Kit" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" /> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> @@ -217,9 +217,9 @@ <route type="mix" sink="voip_tx" sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="mmap_no_irq_in" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/> </routes> diff --git a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml index 54ed107..6a4a2be 100644 --- a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -181,11 +181,11 @@ <route type="mix" sink="USB Headset Out" sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> <route type="mix" sink="BT SCO" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Headset" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Car Kit" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" /> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> @@ -196,9 +196,9 @@ <route type="mix" sink="voip_tx" sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="mmap_no_irq_in" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/> </routes> diff --git a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 9bcfa5f..2c08723 100644 --- a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ <route type="mix" sink="USB Headset Out" sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> <route type="mix" sink="BT SCO" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Headset" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="BT SCO Car Kit" - sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" /> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> @@ -196,9 +196,9 @@ <route type="mix" sink="voip_tx" sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="mmap_no_irq_in" - sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/> </routes> diff --git a/audio/bluejay/config/mixer_paths.xml b/audio/bluejay/config/mixer_paths.xml index 57e261b..790b2c7 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -30,6 +30,9 @@ <ctl name="PCM Stream Wait Time in MSec" value="100"/> <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/> + <!-- Enable it when AOC is ready to trim delay and padding --> + <ctl name="Gapless Offload Enable" value="1"/> + <!-- TDM 0 setting --> <ctl name="TDM_0_RX Chan" value="Four"/> <ctl name="TDM_0_RX Format" value="S32_LE"/> @@ -143,6 +146,7 @@ <ctl name="BT_RX Mixer EP7" value="0"/> <ctl name="BT_RX Mixer NoHost1" value="0"/> <ctl name="BT_RX Mixer VOIP" value="0"/> + <ctl name="BT_RX Mixer RAW" value="0"/> <ctl name="INCALL_RX Mixer EP1" value="0"/> <ctl name="INCALL_RX Mixer EP2" value="0"/> @@ -377,6 +381,10 @@ <ctl name="USB_RX Mixer RAW" value="1"/> </path> + <path name="raw-playbackP bt"> + <ctl name="BT_RX Mixer RAW" value="1"/> + </path> + <path name="raw-playbackP hearing-aid"> </path> @@ -391,6 +399,10 @@ <ctl name="USB_RX Mixer EP1" value="1"/> </path> + <path name="mmap-playbackP bt"> + <ctl name="BT_RX Mixer EP1" value="1"/> + </path> + <path name="mmap-playbackP usb-tty-full"> </path> @@ -585,6 +597,10 @@ <ctl name="EP3 TX Mixer USB_TX" value="1"/> </path> + <path name="low-latency-recordC bt-mic"> + <ctl name="EP3 TX Mixer BT_TX" value="1"/> + </path> + <path name="mmap-recordC"> <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/> </path> @@ -593,6 +609,10 @@ <ctl name="EP2 TX Mixer USB_TX" value="1"/> </path> + <path name="mmap-recordC bt-mic"> + <ctl name="EP2 TX Mixer BT_TX" value="1"/> + </path> + <!-- codec setting -->> <!-- Rx device --> <path name="handset"> diff --git a/audio/bluejay/tuning/fortemedia/HANDSFREE.dat b/audio/bluejay/tuning/fortemedia/HANDSFREE.dat Binary files differindex 1b97ddc..5609b52 100644 --- a/audio/bluejay/tuning/fortemedia/HANDSFREE.dat +++ b/audio/bluejay/tuning/fortemedia/HANDSFREE.dat diff --git a/audio/bluejay/tuning/fortemedia/HANDSFREE.mods b/audio/bluejay/tuning/fortemedia/HANDSFREE.mods index 19fbd36..3648ee1 100644 --- a/audio/bluejay/tuning/fortemedia/HANDSFREE.mods +++ b/audio/bluejay/tuning/fortemedia/HANDSFREE.mods @@ -1,13 +1,13 @@ #PLATFORM_NAME gChip
#EXPORT_FLAG HANDSFREE
#SINGLE_API_VER 1.1.6
-#SAVE_TIME 2022-03-29 15:50:02
+#SAVE_TIME 2022-07-21 12:24:17
#CASE_NAME HANDSFREE-HANDSFREE-RESERVE1-FB
#PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -905,7 +905,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x006C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0004 //RX_SAMPLINGFREQ_SIG
@@ -1761,7 +1761,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -2659,7 +2659,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x006C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0004 //RX_SAMPLINGFREQ_SIG
@@ -3515,7 +3515,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -4413,7 +4413,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x006C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0004 //RX_SAMPLINGFREQ_SIG
@@ -5269,7 +5269,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -5467,10 +5467,10 @@ 194 0x0000 //TX_NORMENERTH
195 0x0000 //TX_NORMENERHIGHTH
196 0x0000 //TX_NORMENERHIGHTHL
-197 0x7FF0 //TX_DTD_THR1_0
-198 0x7FF0 //TX_DTD_THR1_1
+197 0x7210 //TX_DTD_THR1_0
+198 0x7D10 //TX_DTD_THR1_1
199 0x7FF0 //TX_DTD_THR1_2
-200 0x7FF0 //TX_DTD_THR1_3
+200 0x7F00 //TX_DTD_THR1_3
201 0x7FF0 //TX_DTD_THR1_4
202 0x7FF0 //TX_DTD_THR1_5
203 0x7FF0 //TX_DTD_THR1_6
@@ -5553,17 +5553,17 @@ 280 0x1000 //TX_B_POST_FLT_1
281 0x0010 //TX_NS_LVL_CTRL_0
282 0x0012 //TX_NS_LVL_CTRL_1
-283 0x0012 //TX_NS_LVL_CTRL_2
+283 0x0010 //TX_NS_LVL_CTRL_2
284 0x0015 //TX_NS_LVL_CTRL_3
-285 0x0012 //TX_NS_LVL_CTRL_4
+285 0x0010 //TX_NS_LVL_CTRL_4
286 0x0012 //TX_NS_LVL_CTRL_5
287 0x0011 //TX_NS_LVL_CTRL_6
288 0x0011 //TX_NS_LVL_CTRL_7
289 0x000F //TX_MIN_GAIN_S_0
290 0x000F //TX_MIN_GAIN_S_1
-291 0x000D //TX_MIN_GAIN_S_2
+291 0x0008 //TX_MIN_GAIN_S_2
292 0x000F //TX_MIN_GAIN_S_3
-293 0x000F //TX_MIN_GAIN_S_4
+293 0x0008 //TX_MIN_GAIN_S_4
294 0x000F //TX_MIN_GAIN_S_5
295 0x0010 //TX_MIN_GAIN_S_6
296 0x000F //TX_MIN_GAIN_S_7
@@ -5572,9 +5572,9 @@ 299 0x0000 //TX_NMOS_SUP_MENSA
300 0x7FFF //TX_SNRI_SUP_0
301 0x4000 //TX_SNRI_SUP_1
-302 0x3000 //TX_SNRI_SUP_2
+302 0x6000 //TX_SNRI_SUP_2
303 0x4000 //TX_SNRI_SUP_3
-304 0x2400 //TX_SNRI_SUP_4
+304 0x6000 //TX_SNRI_SUP_4
305 0x4000 //TX_SNRI_SUP_5
306 0x4000 //TX_SNRI_SUP_6
307 0x7FFF //TX_SNRI_SUP_7
@@ -5596,7 +5596,7 @@ 323 0x1000 //TX_B_POST_FILT_1
324 0x1000 //TX_B_POST_FILT_2
325 0x1000 //TX_B_POST_FILT_3
-326 0x5000 //TX_B_POST_FILT_4
+326 0x4000 //TX_B_POST_FILT_4
327 0x3000 //TX_B_POST_FILT_5
328 0x1000 //TX_B_POST_FILT_6
329 0x2000 //TX_B_POST_FILT_7
@@ -5613,7 +5613,7 @@ 340 0x7900 //TX_LAMBDA_PFILT_S_1
341 0x7C00 //TX_LAMBDA_PFILT_S_2
342 0x7900 //TX_LAMBDA_PFILT_S_3
-343 0x7000 //TX_LAMBDA_PFILT_S_4
+343 0x7C00 //TX_LAMBDA_PFILT_S_4
344 0x7D00 //TX_LAMBDA_PFILT_S_5
345 0x7D00 //TX_LAMBDA_PFILT_S_6
346 0x7D00 //TX_LAMBDA_PFILT_S_7
@@ -6167,7 +6167,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x043C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0000 //RX_SAMPLINGFREQ_SIG
@@ -7023,7 +7023,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -7921,7 +7921,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x043C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0001 //RX_SAMPLINGFREQ_SIG
@@ -8777,7 +8777,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -9675,7 +9675,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x043C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
@@ -10531,7 +10531,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -11429,7 +11429,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x042C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0004 //RX_SAMPLINGFREQ_SIG
@@ -12285,7 +12285,7 @@ #PARAM_MODE FULL
#PARAM_TYPE TX+RX
#TOTAL_CUSTOM_STEP 7
-#TX
+#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x0033 //TX_PATCH_REG
@@ -13183,7 +13183,7 @@ 894 0xC000 //TX_FASTNS_SSA_THHFL
895 0xCCCC //TX_FASTNS_SSA_THLFH
896 0xD999 //TX_FASTNS_SSA_THHFH
-#RX
+#RX
0 0x042C //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0004 //RX_SAMPLINGFREQ_SIG
diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 6c80b2d..ae13ab0 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -13,10 +13,26 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +ifdef PHONE_CAR_BOARD_PRODUCT + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +else + TARGET_SCREEN_DENSITY := 420 +endif + +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 +BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := bluejay -TARGET_SCREEN_DENSITY := 420 USES_DEVICE_GOOGLE_BLUEJAY := true +BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk diff --git a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml index 3222ec0..aa79a3a 100644 --- a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml @@ -73,7 +73,7 @@ <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation"> M 480,0 h 145 - v 118 + v 132 h -145 Z @left @@ -152,7 +152,7 @@ when adapting to brighter or darker environments. This parameter controls how quickly brightness changes occur in response to an observed change in light level that exceeds the hysteresis threshold. --> - <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer> + <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer> <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer> <!-- Type of the udfps long press sensor. Empty if long press is not supported. --> @@ -166,78 +166,112 @@ <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. --> <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string> - <!-- the number of the max cached processes in the system. --> - <integer name="config_customizedMaxCachedProcesses">64</integer> + <!-- The max vibration strength allowed in audio haptic channels. --> + <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item> - <integer-array name="config_ambientThresholdLevels"> - <item>1</item> - <item>2</item> - <item>3</item> - <item>4</item> - <item>5</item> - <item>6</item> - <item>7</item> - <item>8</item> - <item>9</item> - <item>10</item> - <item>20</item> - <item>30</item> - <item>40</item> - <item>50</item> - <item>60</item> - <item>70</item> - <item>80</item> - <item>90</item> - <item>100</item> - </integer-array> +<integer-array name="config_ambientThresholdLevels"> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>8</item> + <item>9</item> + <item>10</item> + <item>20</item> + <item>30</item> + <item>40</item> + <item>50</item> + <item>60</item> + <item>70</item> + <item>80</item> + <item>90</item> + <item>100</item> + <item>200</item> + <item>300</item> + <item>400</item> + <item>500</item> + <item>1000</item> + <item>2000</item> + <item>3000</item> + <item>4000</item> +</integer-array> - <integer-array name="config_ambientBrighteningThresholds"> - <item>11373</item> - <item>5000</item> - <item>4333</item> - <item>3666</item> - <item>3000</item> - <item>2760</item> - <item>2520</item> - <item>2280</item> - <item>2040</item> - <item>1800</item> - <item>800</item> - <item>527</item> - <item>500</item> - <item>470</item> - <item>396</item> - <item>322</item> - <item>248</item> - <item>174</item> - <item>99</item> - <item>99</item> - </integer-array> +<integer-array name="config_ambientBrighteningThresholds"> + <item>5186</item> + <item>4333</item> + <item>3666</item> + <item>2999</item> + <item>2759</item> + <item>2519</item> + <item>2279</item> + <item>2039</item> + <item>1799</item> + <item>799</item> + <item>527</item> + <item>499</item> + <item>470</item> + <item>517</item> + <item>565</item> + <item>612</item> + <item>660</item> + <item>708</item> + <item>742</item> + <item>636</item> + <item>582</item> + <item>549</item> + <item>369</item> + <item>294</item> + <item>269</item> + <item>220</item> + <item>220</item> +</integer-array> - <integer-array name="config_ambientDarkeningThresholds"> - <item>853</item> - <item>700</item> - <item>683</item> - <item>666</item> - <item>650</item> - <item>640</item> - <item>630</item> - <item>620</item> - <item>610</item> - <item>600</item> - <item>500</item> - <item>500</item> - <item>440</item> - <item>385</item> - <item>348</item> - <item>311</item> - <item>274</item> - <item>237</item> - <item>200</item> - <item>200</item> - </integer-array> +<integer-array name="config_ambientDarkeningThresholds"> + <item>525</item> + <item>683</item> + <item>666</item> + <item>650</item> + <item>640</item> + <item>630</item> + <item>620</item> + <item>610</item> + <item>600</item> + <item>500</item> + <item>500</item> + <item>440</item> + <item>385</item> + <item>382</item> + <item>379</item> + <item>376</item> + <item>373</item> + <item>371</item> + <item>367</item> + <item>387</item> + <item>397</item> + <item>403</item> + <item>380</item> + <item>345</item> + <item>333</item> + <item>283</item> + <item>283</item> +</integer-array> <!-- Boolean indicating if restoring network selection should be skipped --> <!-- The restoring is handled by modem if it is true --> <bool translatable="false" name="skip_restoring_network_selection">true</bool> + + <!-- A string config in svg path format for the main display shape. + (@see https://www.w3.org/TR/SVG/paths.html#PathData). + + This config must be set unless: + 1. {@link Configuration#isScreenRound} is true which means the display shape is circular + and the system will auto-generate a circular shape. + 2. The display has no rounded corner and the system will auto-generate a rectangular shape. + (@see DisplayShape#createDefaultDisplayShape) + + Note: If the display supports multiple resolutions, please define the path config based on + the highest resolution so that it can be scaled correctly in each resolution. --> + <string name="config_mainDisplayShape">M 50 0 C 42.768298 0.20918843 40.38325 0.67140492 36.839844 1.4492188 C 32.88207 2.499408 31.55228 2.9412067 27.529297 4.6933594 C 22.757243 6.7717586 20.051023 9.0487475 17.677734 10.873047 C 14.896398 13.14348 12.520098 15.642526 10.375 18.316406 C 7.8943843 21.48606 6.0935469 24.386022 4.3515625 28.15625 C 1.8145748 33.95665 1.4214109 36.446413 0.90625 38.939453 C 0.29310087 41.906691 0.090606668 43.961689 0 50 L 0 2350 C 0.083036414 2356.0047 0.27049146 2357.7278 0.70507812 2360.4961 C 1.0552946 2362.727 1.7787856 2366.4728 4.1152344 2372.0391 C 5.8274884 2375.87 7.608122 2378.6647 10.011719 2381.8281 C 12.156817 2384.5019 14.6796 2387.128 17.460938 2389.3984 C 19.82277 2391.2952 22.788288 2393.4515 27.306641 2395.5898 C 30.772461 2397.23 33.05157 2397.9241 37.181641 2398.8828 C 41.654968 2399.8035 43.840728 2399.9069 50 2400 L 1030 2400 C 1036.1593 2399.9069 1038.345 2399.8035 1042.8184 2398.8828 C 1046.9485 2397.9241 1049.2276 2397.23 1052.6934 2395.5898 C 1057.2118 2393.4515 1060.1773 2391.2952 1062.5391 2389.3984 C 1065.3205 2387.128 1067.8432 2384.5019 1069.9883 2381.8281 C 1072.3919 2378.6647 1074.1725 2375.87 1075.8848 2372.0391 C 1078.2212 2366.4728 1078.9466 2362.727 1079.2969 2360.4961 C 1079.7314 2357.7278 1079.917 2356.0047 1080 2350 L 1080 50 C 1079.909 43.961692 1079.7068 41.906687 1079.0938 38.939453 C 1078.5787 36.446409 1078.1854 33.956648 1075.6484 28.15625 C 1073.9064 24.386018 1072.1057 21.48606 1069.625 18.316406 C 1067.4799 15.642522 1065.1037 13.143473 1062.3223 10.873047 C 1059.949 9.0487409 1057.2428 6.7717652 1052.4707 4.6933594 C 1048.4477 2.9412128 1047.118 2.4994066 1043.1602 1.4492188 C 1039.6168 0.67140026 1037.2317 0.20918958 1030 0 L 50 0 z </string> </resources> diff --git a/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml b/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml index 9051ca3..011c49d 100644 --- a/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -30,7 +30,7 @@ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. --> <dimen name="status_bar_height_default">28dp</dimen> - <dimen name="status_bar_height_portrait">118px</dimen> + <dimen name="status_bar_height_portrait">132px</dimen> <dimen name="status_bar_height_landscape">28dp</dimen> <!-- Adjustment for software rounded corners since corners aren't perfectly round. --> diff --git a/bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..6686c1b --- /dev/null +++ b/bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2023, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License") +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<irq-device-map> + <device name="rtc-alarm0"> + <subsystem>Alarm</subsystem> + </device> + <device name="dhdpcie_host_wake"> + <subsystem>Wifi</subsystem> + </device> + <device name="cp2ap_wakeup"> + <subsystem>Cellular_data</subsystem> + </device> + <device name="MAILBOX_AOC2APxE00"> + <subsystem>Sound_trigger</subsystem> + </device> + <device name="MAILBOX_AOC2APx100"> + <subsystem>Sensor</subsystem> + </device> +</irq-device-map> + diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 992a8f6..5e4f716 100644 --- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -46,5 +46,10 @@ <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen> <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen> - </resources> + <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> + <dimen name="lock_icon_padding">56px</dimen> + + <!-- Offset should not be more than 1mm --> + <dimen name="udfps_burn_in_offset_y">16px</dimen> +</resources> diff --git a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml index 84169a0..5610991 100644 --- a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml +++ b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,15 @@ <item>GX7AS</item> <item>GB17L</item> </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">70</integer> + <integer name="device_height">150</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>36</item> + </integer-array> + <integer-array name="antenna_y"> + <item>83</item> + </integer-array> </resources> diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index ffd8574..7378c6e 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -3,7 +3,7 @@ import /vendor/etc/init/hw/init.gs101.rc import /vendor/etc/init/hw/init.blueport.rc # Start the twoshay touch service -on late-init && property:vendor.device.modules.ready=1 +on property:vendor.device.modules.ready=1 start twoshay # Toggle glove_mode according to touch_sensitivity_mode @@ -14,10 +14,6 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet write /sys/class/spi_master/spi11/spi11.0/glove_mode 01 on post-fs-data - # Fingerprint - chown system system /dev/goodix_fp - exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app - # Speaker amp permission chmod 644 /mnt/vendor/persist/audio/speaker.cal @@ -30,3 +26,24 @@ 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 + +# Haptics +on property:vendor.all.modules.ready=1 + mkdir /mnt/vendor/persist/haptics 0770 system system + chmod 770 /mnt/vendor/persist/haptics + chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal + chown system system /mnt/vendor/persist/haptics + chown system system /mnt/vendor/persist/haptics/cs40l26.cal + + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + + enable vendor.vibrator.cs40l26 diff --git a/conf/init.blueport.rc b/conf/init.blueport.rc index 75adb5a..bd69d18 100644 --- a/conf/init.blueport.rc +++ b/conf/init.blueport.rc @@ -20,20 +20,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_blueport -# Overrides fingerprint antispoof if following persist sysprops are set -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=0 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=1 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=100 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -service insmod_sh_blueport /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/device-bluejay.mk b/device-bluejay.mk index 30a3e30..0322079 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -34,7 +34,8 @@ include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/stm/stm11.mk ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk @@ -42,6 +43,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) @@ -60,7 +63,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 += \ @@ -98,7 +102,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -110,7 +114,6 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ - device/google/bluejay/nfc/manifest_nfc.xml \ device/google/bluejay/nfc/manifest_se_bluejay.xml # PowerStats HAL @@ -120,17 +123,19 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=19 + ro.vendor.build.svn=42 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts -# Display LBE +# Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=0 # Bluetooth Hal Extension test tools PRODUCT_PACKAGES_DEBUG += \ @@ -152,15 +157,12 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true - -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf + persist.bluetooth.a2dp_aac.vbr_supported=true \ + persist.bluetooth.firmware.selection=BCM.hcd # Set zram size PRODUCT_VENDOR_PROPERTIES += \ - vendor.zram.size=2g + vendor.zram.size=3g # Enable camera 1080P 60FPS binning mode PRODUCT_VENDOR_PROPERTIES += \ @@ -220,8 +222,16 @@ endif PRODUCT_SHIPPING_API_LEVEL := 32 # Vibrator HAL +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 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 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=40 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Device features PRODUCT_COPY_FILES += \ @@ -230,4 +240,9 @@ PRODUCT_COPY_FILES += \ # Keyboard bottom padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=6.4 \ + +PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 + +# UFS: the script is used to select the corresponding firmware to run FFU. +PRODUCT_PACKAGES += ufs_firmware_update.sh @@ -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" @@ -33,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" @@ -57,9 +60,11 @@ CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" + PpsDevice="/sys/class/pps/pps0/assert_elapsed" /> <gll + PpsEnable="true" LogPriMask="LOG_INFO" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" @@ -80,6 +85,7 @@ EnableOnChipStopNotification="2" PowerMode="3" MinGpsWeekNumber="2216" + OnChipAccMask="50" /> <gll_features diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index b3cdd0d..8a96dc9 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" @@ -32,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" @@ -56,9 +59,11 @@ CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" + PpsDevice="/sys/class/pps/pps0/assert_elapsed" /> <gll + PpsEnable="true" LogPriMask="LOG_INFO" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" @@ -79,6 +84,7 @@ EnableOnChipStopNotification="false" PowerMode="3" MinGpsWeekNumber="2216" + OnChipAccMask="50" /> <gll_features diff --git a/init.insmod.bluejay.cfg b/init.insmod.bluejay.cfg index 1191877..26297a5 100644 --- a/init.insmod.bluejay.cfg +++ b/init.insmod.bluejay.cfg @@ -8,11 +8,12 @@ # Modules here will be loaded *after* all common modules modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-i2c.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|ftm5.ko modprobe|sec_touch.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready diff --git a/nfc/libnfc-hal-st-GB17L.conf b/nfc/libnfc-hal-st-GB17L.conf index ed77586..ef1a858 100644 --- a/nfc/libnfc-hal-st-GB17L.conf +++ b/nfc/libnfc-hal-st-GB17L.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/powerhint.json b/powerhint.json index 6dda63d..51f0df9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -125,7 +125,17 @@ "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", - "1100" + "1100 1078 1024" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -143,10 +153,8 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", - "185", - "1", - "55" + "692", + "1" ], "ResetOnInit": true }, @@ -154,42 +162,23 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "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", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true }, { - "Name": "UClampThreshold", - "Path": "/proc/vendor_sched/uclamp_threshold", - "Values": [ - "0", - "8" - ], - "ResetOnInit": true - }, - { - "Name": "ReduceRreferIdle", + "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", "Values": [ "0", @@ -210,24 +199,17 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ + "0-3", "4-7", "0-7" ], "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", "Values": [ + "0-3", "6-7", "0-7" ], @@ -237,6 +219,7 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ + "0-3", "4-5", "0-7" ], @@ -246,6 +229,7 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ + "0-3", "4-7", "0-7" ], @@ -317,6 +301,16 @@ "Type": "Property" }, { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, + { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", "Values": [ @@ -474,24 +468,68 @@ "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" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" }, { - "PowerHint": "LAUNCH", - "Node": "UClampThreshold", - "Duration": 5000, - "Value": "0" + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" }, { "PowerHint": "LAUNCH", - "Node": "ReduceRreferIdle", + "Node": "ReducePreferIdle", "Duration": 5000, "Value": "0" }, @@ -503,12 +541,6 @@ }, { "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, - { - "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", "Duration": 5000, "Value": "9999999" @@ -529,13 +561,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -556,6 +588,59 @@ "Value": "0" }, { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_EXTEND" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, + { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", "Duration": 1000, @@ -815,6 +900,12 @@ }, { "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterMaxFreq", "Duration": 0, "Value": "1401000" @@ -893,9 +984,21 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -977,6 +1080,12 @@ }, { "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", "Duration": 0, "Value": "1" @@ -1049,6 +1158,12 @@ }, { "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", "Duration": 0, "Value": "1" @@ -1126,6 +1241,26 @@ "Value": "0" }, { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { "PowerHint": "CAMERA_FIXED_FPS", "Node": "MemFreq", "Duration": 4000, @@ -1279,7 +1414,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1288,32 +1423,6 @@ "Value": "1" }, { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", "Duration": 0, @@ -1328,11 +1437,6 @@ { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "INTERACTION" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, { @@ -1366,226 +1470,448 @@ "Value": "400000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, "Value": "1" }, { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" }, { - "PowerHint": "FP_BOOST", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" }, { - "PowerHint": "FP_BOOST", - "Node": "TRUSTY_VIRTIO_HIGH", - "Duration": 1000, - "Value": "1" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" }, { - "PowerHint": "FP_BOOST", - "Node": "TRUSTY_HIGH", - "Duration": 1000, + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "PMU_POLL", + "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "ML_ACC", - "Node": "MLUclampBoost", - "Duration": 2000, - "Value": "512" + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" }, { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "MidControlTempSet", "Duration": 0, - "Value": "0-3" + "Value": "80000" }, { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "LittleControlTempSet", "Duration": 0, - "Value": "0-3" + "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", "Duration": 0, + "Value": "0" + }, + { + "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" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_VIRTIO_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "ML_ACC", + "Node": "MLUclampBoost", + "Duration": 2000, + "Value": "640" } ], "AdpfConfig": [ @@ -1601,8 +1927,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1625,8 +1951,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1649,8 +1975,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1676,9 +2002,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1700,9 +2026,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1724,7 +2050,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/storage/Android.bp b/storage/Android.bp new file mode 100644 index 0000000..595857a --- /dev/null +++ b/storage/Android.bp @@ -0,0 +1,27 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: [ + "//device/google/bluejay:device_google_bluejay_license", + ], +} + +sh_binary { + name: "ufs_firmware_update.sh", + src: "ufs_firmware_update.sh", + init_rc: ["storage.bluejay.rc"], + vendor: true, +} diff --git a/storage/storage.bluejay.rc b/storage/storage.bluejay.rc new file mode 100644 index 0000000..9873325 --- /dev/null +++ b/storage/storage.bluejay.rc @@ -0,0 +1,7 @@ +on property:sys.boot_completed=1 + # Copy ufs firmware to disk + start ufs_firmware_update + +service ufs_firmware_update /vendor/bin/ufs_firmware_update.sh + disabled + oneshot diff --git a/storage/ufs_firmware_update.sh b/storage/ufs_firmware_update.sh new file mode 100755 index 0000000..d118115 --- /dev/null +++ b/storage/ufs_firmware_update.sh @@ -0,0 +1,19 @@ +#!/vendor/bin/sh +# +# The script belongs to the feature of UFS FFU via OTA: go/p23-ffu-ota +# Its purpose is to copy the corresponding firmware into partition for UFS FFU. + +ufs_dev="/dev/sys/block/bootdevice" +fw_dir="/vendor/firmware" +blk_dev="/dev/block/by-name/fips" + +vendor=$(cat ${ufs_dev}/vendor | tr -d "[:space:]") +model=$(cat ${ufs_dev}/model | tr -d "[:space:]") +rev=$(cat ${ufs_dev}/rev | tr -d "[:space:]") + +file=$(find ${fw_dir} -name "*${vendor}${model}${rev}*" | head -n 1) +if [ -n "$file" ]; then + # The first 4KB block at fips partition has been occupied, and unused space begins from 4 KB + # Refer to: go/pixel-mp-ffu-ota-1p + dd if="$file" of=$blk_dev bs=4k seek=1 +fi diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index 92c197d..6d90a20 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -238,91 +238,155 @@ "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", - "43.0", - "45.0", - "47.0", - "52.0", - "55.0" - ], - "HotHysteresis":[ - "0.0", - "1.9", - "1.9", - "1.9", - "1.9", - "1.9", - "1.9" - ], + "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":["1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "VrThreshold":"NAN", "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "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", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "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", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "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", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1500, 750, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 2000, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.085, 0.085, 0.085, 0.064, 0.085, 0.085, 0.085], - "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 0, 8, 10, 10], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.08, 0.08, 0.08, 0.060, 0.08, 0.08, 0.08], - "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], - "LimitInfo": [0, 0, 0, 0, 11, 13, 13], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S3M_VDD_CPUCL1", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.38, 0.38, 0.38, 0.285, 0.38, 0.38, 0.38], - "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 14, 16, 16], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2M_VDD_CPUCL2", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.455, 0.455, 0.455, 0.591, 0.455, 0.455, 0.455], - "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], - "LimitInfo": [0, 0, 0, 0, 10, 11, 11], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + "CdevCeiling": [10, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] } ] }, @@ -1021,7 +1085,7 @@ "NAN", "NAN", "NAN", - 115.0 + "NAN" ], "VrThreshold":"NAN", "Multiplier":0.001 @@ -1076,23 +1140,23 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -1122,8 +1186,28 @@ "1.0", "1.0" ], - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 + } + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [2.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } } - ] -} + } +}
\ No newline at end of file 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 + } + ] +} |