From a517043f44cbc30c70769be8858a83b6d10b09a6 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 6 Mar 2024 14:24:38 -0800 Subject: [PATCH 1/6] comet: add etm modules in userdebug/eng builds Bug: 321061072 Test: build and run comet Change-Id: I7d1775c8b8b86964f1610cedc8191f2fdcb96fd2 --- comet/BoardConfig.mk | 4 ++++ device-comet.mk | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk index 8b4b17d..dbaf783 100644 --- a/comet/BoardConfig.mk +++ b/comet/BoardConfig.mk @@ -30,6 +30,10 @@ include device/google/zumapro/BoardConfig-common.mk include device/google/comet-sepolicy/comet-sepolicy.mk include device/google/comet/wifi/BoardConfig-wifi.mk +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/6_1/BoardUserdebugModules.mk +endif + else include device/google/comet23/comet23/BoardConfig.mk diff --git a/device-comet.mk b/device-comet.mk index 8d5423b..0bd12d5 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -389,3 +389,8 @@ SUPPORT_RIL_DOMAIN_SELECTION := true # Thread HAL PRODUCT_PACKAGES += \ com.google.comet.hardware.threadnetwork + +# ETM +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif From dc9a841666b479c550db1c73a60898ad6cdc5351 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Sat, 9 Mar 2024 05:57:55 +0800 Subject: [PATCH 2/6] gps: update SUPL TLS version for SBM Bug: 323097930 Test: confirm config and SUPL TLS version Change-Id: I46ec056b4f2715231a65fb8f8757c86c6cffdcfd Merged-In: I46ec056b4f2715231a65fb8f8757c86c6cffdcfd --- location/user/gps.cfg | 1 - location/userdebug/gps.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 626270f..6a0712c 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -127,7 +127,6 @@ ENABLE_LPP_CP=0 ENABLE_LPPE_CP=0 ENABLE_5G_CP_CAPS_MSA=0 ENABLE_5G_CP_CAPS_MSB=0 -SUPL_SSL_METHOD=TLSv1 USE_EMER_PDN_FOR_EMER_SUPL=0 GNSS_CARRIER_ID=8 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index f0d4438..2ae1f26 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -260,7 +260,6 @@ ENABLE_LPP_CP=0 ENABLE_LPPE_CP=0 ENABLE_5G_CP_CAPS_MSA=0 ENABLE_5G_CP_CAPS_MSB=0 -SUPL_SSL_METHOD=TLSv1 USE_EMER_PDN_FOR_EMER_SUPL=0 # DOCOMO GNSS_CARRIER_ID=8 From 40165cd3d90f711ee9ec9c0abf4b268d9770db56 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 12 Mar 2024 08:32:25 +0800 Subject: [PATCH 3/6] gps: update GPS configurations - enable GNSS FW DFVS - use uncalibrated Accel Bug: 326437941 Bug: 326031975 Test: verify config pass Change-Id: I11e6d870dc6903cd3ee817ccdfa82b7acfce5328 Merged-In: I11e6d870dc6903cd3ee817ccdfa82b7acfce5328 --- location/user/gps.cfg | 6 +++--- location/userdebug/gps.cfg | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 6a0712c..1e40b7b 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -28,8 +28,8 @@ bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -61,7 +61,7 @@ RfPathLossDb_L5_Ap=4300 RfPathLossDb_L5_Cp=4300 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 2ae1f26..480bf79 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -115,8 +115,8 @@ navicUsedInUSPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -193,7 +193,7 @@ IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN # DEFAULT From 61031de38420f4a6e6c4e502bc233b0acb42f832 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 13 Mar 2024 08:37:16 +0800 Subject: [PATCH 4/6] gps: update GPS configurations - disable debug during CHRE request - request SGEE from framework Bug: 328858595 Bug: 328347965 Test: verify pass Change-Id: I419d80b61eb89880216035a51d4d966320298731 --- location/user/gps.cfg | 2 +- location/userdebug/gps.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 1e40b7b..33da69e 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -34,7 +34,7 @@ mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 additional_rtc_uncertainty_ms=10 -Sif_UseFwXtraInterface=0 +Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 480bf79..3d631ad 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -12,7 +12,7 @@ uni_log_max_file_count=5 uni_log_max_size_mb=20 uni_log_total_max_size_mb=100 -debug_enable=1 +debug_enable=4 mem_dump_to_node=1 gnss_device_type=K042 @@ -145,7 +145,7 @@ UseRtcForAiding=1 additional_rtc_uncertainty_ms=10 # set to 1 for FW SGEE download - Requires Android FW to be properly configured -Sif_UseFwXtraInterface=0 +Sif_UseFwXtraInterface=1 # ChipCfg_GetGpsWeekFloor variable allows testing of old GPS weeks. # Used here to adjust the GPS week for carrier testing. From 15237e5f87c6e9993e18f15f74775033639caf0c Mon Sep 17 00:00:00 2001 From: Jeremy DeHaan Date: Wed, 13 Mar 2024 09:25:17 -0700 Subject: [PATCH 5/6] display: enable xrr 2.1 by default Bug: 329326269 Change-Id: Ica9e7734a12172d7dc57378265b4cdb758cc5465 Signed-off-by: Jeremy DeHaan --- device-comet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index 208c85d..13dc93e 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -74,7 +74,7 @@ PRODUCT_COPY_FILES += \ device/google/comet/comet/panel_config_google-ct3e_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3e_cal1.pb ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1@202504:1.2@202404 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 endif From 13544a217ccd7b4fab51794d61fdc87ad84101fd Mon Sep 17 00:00:00 2001 From: Sam Paradis Date: Thu, 1 Feb 2024 01:23:58 +0000 Subject: [PATCH 6/6] Change FACE_UNLOCK_BOOST to Maximize CPU Frequency This is part of an optimization that limits the length and prevelance of this power hint. Strict, ultra-agression minimizes power and latency versus always-on mid aggression. Bug: 297964952 Change-Id: I90163242987e98523f61a7d6d74fc6e6c3e3abe7 --- powerhint-comet.json | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/powerhint-comet.json b/powerhint-comet.json index 1fc4523..c5fe44a 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -2617,25 +2617,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "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" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, {