From 20feb7883135e6fb0fc2c6ad10f706b3ac246fc0 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 4 Mar 2024 12:16:39 +0000 Subject: [PATCH 01/10] Enable Thread HAL on CT3 1. Add Thread HAL service 2. Turn on BT property Bug: 318601784 Test: manual Change-Id: I074c68054a1a64c354b9fa44b87c011dfbb20743 --- bluetooth/bt_vendor_overlay.conf | 2 ++ device-comet.mk | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 41e2f19..d565ec0 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.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-comet.mk b/device-comet.mk index 402f16e..4a00af7 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -431,3 +431,12 @@ endif # Connectivity Resources Overlay PRODUCT_PACKAGES += \ ConnectivityResourcesOverlayCometOverride + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.comet.hardware.threadnetwork +endif From 5c6040d54e9e32f245859f4188b68e7539a1d3c6 Mon Sep 17 00:00:00 2001 From: James Huang Date: Sun, 5 May 2024 23:25:33 +0800 Subject: [PATCH 02/10] gps: Update gps: Update GNSS FW 4.15.1_7_P2_R3 + config for CT3 Enable Navic (Chip_Configuration_GNSSConstConstraintDef = 0x60FF) Disable 1PPS feature by default (Is1PPSTimeSyncEnable=0) Bug: 336693604 Bug: 321020637 Test: Verify CTS/VTS, sanity test and SST in b/338492673 Change-Id: Ibcd6d5999f4aaec0bdafdc3ffd281749a301523e --- location/user/gps.cfg | 7 ++++--- location/userdebug/gps.cfg | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index ef1f718..6080ae8 100644 --- a/location/user/gps.cfg +++ b/location/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/userdebug/gps.cfg b/location/userdebug/gps.cfg index 665358c..24da018 100644 --- a/location/userdebug/gps.cfg +++ b/location/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 From 4e6ab28b1ea64eb4208086ba6cf250b5e5829b84 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 7 May 2024 07:41:28 +0000 Subject: [PATCH 03/10] Revert^2 "Set big core to cpu skip mask by default" This reverts commit bc8ed4b77532c7aef18912d495a4bf7e5a493145. Reason for revert: regression fixed Bug: 248621289 Change-Id: Icd7ca992b12b3e0ba1cd968aa56c847e2ed0cc9b Test: build pass --- powerhint-comet.json | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/powerhint-comet.json b/powerhint-comet.json index 74e136e..da1ae8d 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -865,6 +864,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1125,6 +1130,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1286,6 +1297,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1880,6 +1897,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2300,6 +2323,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2444,6 +2473,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From 66a3277a3161ae73b28d16704c6756faa40bcffe Mon Sep 17 00:00:00 2001 From: Pointer Kung Date: Fri, 26 Apr 2024 06:13:06 +0000 Subject: [PATCH 04/10] Disable CDPreferIdle, set DSUMin to 610MHz for 60fps With MulticamRoutingNode on RT, the performance is no longer impacted by having CDPreferIdle disabled. Additionally, this CL reduces DSUMin to 610MHz, saving overall up to 50mW in CPU power. Refer to ag/27091363 Bug: 339154889 Test: Build pass Change-Id: I4d4d8dd64832dabd7fc60b0dfe7a0b69b5b76df4 --- powerhint-comet.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/powerhint-comet.json b/powerhint-comet.json index 2b45652..c954a14 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -785,6 +785,7 @@ "1800000", "1548000", "820000", + "610000", "0" ], "ResetOnInit": true @@ -1914,7 +1915,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "DsuMinFreq", "Duration": 0, - "Value": "820000" + "Value": "610000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2024,6 +2025,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", From dee2be2e93ee08eac27a06b21e5cf0fdc41c879a Mon Sep 17 00:00:00 2001 From: Weizhung Ding Date: Mon, 6 May 2024 11:29:08 +0000 Subject: [PATCH 05/10] display: low-light blocking zone support Bug: 320804821 Test: dumpsys SurfaceFlinger|grep blocking Merged-In: I995cbe1e1bb05d2e3ff5e85d7395e6ec1a9eec16 Change-Id: I995cbe1e1bb05d2e3ff5e85d7395e6ec1a9eec16 --- device-comet.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-comet.mk b/device-comet.mk index d694769..6a7be7a 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -74,6 +74,7 @@ PRODUCT_COPY_FILES += \ 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.blocking_zone.min_refresh_rate_by_nits=20:120,30:60,: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 1d8c328f4b3244f513e826b3cb32bace266846e6 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 30 Apr 2024 13:42:45 +0000 Subject: [PATCH 06/10] Switch kernel directory to control by build flag Bug: 337161745 Change-Id: I48c8a9863ea57591ab5ce9dfc294a5274567d46c Merged-In: I6d8e981b2756964dd7b1df38de13fc6a0ae04428 --- device-comet.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/device-comet.mk b/device-comet.mk index 6a7be7a..7c4c89a 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -14,8 +14,14 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/comet-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/comet-kernel/kernel-headers +ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers +endif + TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 2a77c3f5de1f5545f9c000ded84284a6bb04f4c6 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 May 2024 04:12:56 +0000 Subject: [PATCH 07/10] Switch bootloader and radio directory to control by build flag Bug: 337163126 Change-Id: Ic9d96526d1c80db35de856d76f2012b3a96da68f Merged-In: I6d8e981b2756964dd7b1df38de13fc6a0ae04428 --- device-comet.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index 7c4c89a..701f884 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -14,6 +14,17 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_COMET_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_COMET_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR) +$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) + + ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers From 766d3ac53563e94cb4c138566d6610852c5767d5 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 30 Apr 2024 13:42:45 +0000 Subject: [PATCH 08/10] Switch kernel directory to control by build flag Bug: 337161745 Change-Id: I48c8a9863ea57591ab5ce9dfc294a5274567d46c --- device-comet.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/device-comet.mk b/device-comet.mk index 16492e9..eedd846 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -14,8 +14,14 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/comet-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernel/kernel-headers +ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers +endif + TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT LOCAL_PATH := device/google/comet From ff02d4d92c478c23859cda5aa45549d794f0a658 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 May 2024 04:12:56 +0000 Subject: [PATCH 09/10] Switch bootloader and radio directory to control by build flag Bug: 337163126 Change-Id: Ic9d96526d1c80db35de856d76f2012b3a96da68f --- device-comet.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index eedd846..64b3fe4 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -14,6 +14,17 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_COMET_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_COMET_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR) +$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) + + ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers From 7aa9a69f960745da9a782eff1cd5106fbe7cdf56 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Wed, 8 May 2024 08:52:31 +0000 Subject: [PATCH 10/10] Update IDisplay to V11-V12 V12 is not frozen yet. We should still allow V11 for `next` build. Test: trigger test build Bug: 309897479 Bug: 303162192 Change-Id: Iab3332ac9bc4ddd388ab7e3b79a8fef788ff8456 Signed-off-by: Leo Chen --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 90d0ac0..89d6ae9 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 11 + 11-12 IDisplay secondary