diff --git a/audio/caiman/aidl_config/audio_policy_volumes.xml b/audio/caiman/aidl_config/audio_policy_volumes.xml index fe0fd2ac..36fc2c7c 100644 --- a/audio/caiman/aidl_config/audio_policy_volumes.xml +++ b/audio/caiman/aidl_config/audio_policy_volumes.xml @@ -52,14 +52,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -184,14 +184,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -207,13 +207,13 @@ volume index from 0 to 100. 1,-6600 - 14,-6000 - 29,-5180 - 43,-4300 - 57,-3950 - 71,-3340 - 85,-2750 - 100,-2300 + 14,-5280 + 29,-4480 + 43,-3820 + 57,-3710 + 71,-3160 + 85,-2480 + 100,-2086 diff --git a/audio/tokay/aidl_config/audio_policy_volumes.xml b/audio/tokay/aidl_config/audio_policy_volumes.xml index fe0fd2ac..36fc2c7c 100644 --- a/audio/tokay/aidl_config/audio_policy_volumes.xml +++ b/audio/tokay/aidl_config/audio_policy_volumes.xml @@ -52,14 +52,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -184,14 +184,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -207,13 +207,13 @@ volume index from 0 to 100. 1,-6600 - 14,-6000 - 29,-5180 - 43,-4300 - 57,-3950 - 71,-3340 - 85,-2750 - 100,-2300 + 14,-5280 + 29,-4480 + 43,-3820 + 57,-3710 + 71,-3160 + 85,-2480 + 100,-2086 diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf index 1f5eb93c..c784f0ed 100644 --- a/bluetooth/bt_vendor_overlay_caiman.conf +++ b/bluetooth/bt_vendor_overlay_caiman.conf @@ -38,3 +38,5 @@ BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # supported by BT firmware. HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1 + +ThreadDispatcherEnabled = true diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf index 1f5eb93c..c784f0ed 100644 --- a/bluetooth/bt_vendor_overlay_komodo.conf +++ b/bluetooth/bt_vendor_overlay_komodo.conf @@ -38,3 +38,5 @@ BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # supported by BT firmware. HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1 + +ThreadDispatcherEnabled = true diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf index 1f5eb93c..c784f0ed 100644 --- a/bluetooth/bt_vendor_overlay_tokay.conf +++ b/bluetooth/bt_vendor_overlay_tokay.conf @@ -38,3 +38,5 @@ BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # supported by BT firmware. HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1 + +ThreadDispatcherEnabled = true diff --git a/device-caiman.mk b/device-caiman.mk index 9845e0a5..ae844ab5 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -14,8 +14,23 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)) + +ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif LOCAL_PATH := device/google/caimito @@ -414,3 +429,12 @@ PRODUCT_PACKAGES += \ #Component Override for Pixel Troubleshooting App PRODUCT_COPY_FILES += \ device/google/caimito/caiman/caiman-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/caiman-component-overrides.xml + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork +endif diff --git a/device-komodo.mk b/device-komodo.mk index e167a1fb..75d1a585 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -14,8 +14,23 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)) + +ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif LOCAL_PATH := device/google/caimito @@ -415,3 +430,12 @@ PRODUCT_PACKAGES += \ #Component Override for Pixel Troubleshooting App PRODUCT_COPY_FILES += \ device/google/caimito/komodo/komodo-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/komodo-component-overrides.xml + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork +endif diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index a7b09bed..b0e6b854 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -14,8 +14,23 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR)) + +ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-ripcurrent24.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 858b377a..1b517e6d 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -14,8 +14,23 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR)) + +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif USE_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false diff --git a/device-tokay.mk b/device-tokay.mk index ef9bd4af..72d2d780 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -14,8 +14,23 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)) + +ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) @@ -379,3 +394,11 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/google/caimito/tokay/tokay-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tokay-component-overrides.xml +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork +endif diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index cdef97f7..f756cfeb 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 -Chip_Configuration_FeatureCfg_MTPL = 0 -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index cd2c428f..523b35b9 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 -# Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 - # L1 + L5 MCW -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index c678ba6f..189a0986 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 -Chip_Configuration_FeatureCfg_MTPL = 0 -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index d4d70cf4..cae080f1 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 -# Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 - # L1 + L5 MCW -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index b0b1821f..9ee0f5cc 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 -Chip_Configuration_FeatureCfg_MTPL = 0 -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -41,6 +42,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 989b98a6..d21c4474 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 -# Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 - # L1 + L5 MCW -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -167,6 +169,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index b0b1821f..9ee0f5cc 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 -Chip_Configuration_FeatureCfg_MTPL = 0 -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -41,6 +42,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 989b98a6..d21c4474 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 -# Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 - # L1 + L5 MCW -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -167,6 +169,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 96dc360c..a4ffcb57 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 -Chip_Configuration_FeatureCfg_MTPL = 0 -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 5911e0c8..dff542f6 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 -# Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 - # L1 + L5 MCW -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index e7b6d89f..5e06b548 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -845,6 +844,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -992,6 +997,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1266,6 +1277,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1842,6 +1859,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2232,6 +2255,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2370,6 +2399,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 31b55684..e8ee520a 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -845,6 +844,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -992,6 +997,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1266,6 +1277,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1842,6 +1859,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2232,6 +2255,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2370,6 +2399,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 4ed5a55f..f2f09949 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -275,7 +275,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -834,6 +833,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -981,6 +986,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1255,6 +1266,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1831,6 +1848,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2221,6 +2244,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2359,6 +2388,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index aaf5e00f..d3b54d21 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -845,6 +844,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -992,6 +997,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1266,6 +1277,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1842,6 +1859,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2232,6 +2255,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2370,6 +2399,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint",