diff --git a/arch/arm64/configs/vendor/neo_la_GKI.config b/arch/arm64/configs/vendor/neo_la_GKI.config
index 3c9727873f7a..cf290eea73bb 100644
--- a/arch/arm64/configs/vendor/neo_la_GKI.config
+++ b/arch/arm64/configs/vendor/neo_la_GKI.config
@@ -7,6 +7,17 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_SELFTEST=y
 CONFIG_CFG80211=m
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_CORESIGHT=m
+CONFIG_CORESIGHT_CSR=m
+CONFIG_CORESIGHT_CTI=m
+CONFIG_CORESIGHT_DUMMY=m
+CONFIG_CORESIGHT_LINKS_AND_SINKS=m
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=m
+CONFIG_CORESIGHT_REMOTE_ETM=m
+CONFIG_CORESIGHT_STM=m
+CONFIG_CORESIGHT_TGU=m
+CONFIG_CORESIGHT_TPDA=m
+CONFIG_CORESIGHT_TPDM=m
 CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
 CONFIG_EDAC_KRYO_ARM64=m
 # CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE is not set
@@ -74,6 +85,7 @@ CONFIG_QCOM_CLK_RPMH=m
 CONFIG_QCOM_COMMAND_DB=m
 CONFIG_QCOM_CPUSS_SLEEP_STATS=m
 CONFIG_QCOM_CPU_VENDOR_HOOKS=m
+CONFIG_QCOM_DCC_V2=m
 CONFIG_QCOM_DCVS=m
 CONFIG_QCOM_DCVS_FP=m
 CONFIG_QCOM_DEBUG_SYMBOL=m
@@ -171,6 +183,12 @@ CONFIG_SLIM_QCOM_NGD_CTRL=m
 CONFIG_SPI_MSM_GENI=m
 CONFIG_SPS=m
 CONFIG_SPS_SUPPORT_NDP_BAM=y
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_OST=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_FTRACE=m
 CONFIG_SXR_CAMCC_NEO=m
 CONFIG_SXR_DEBUGCC_NEO=m
 CONFIG_SXR_DISPCC_NEO=m
diff --git a/arch/arm64/configs/vendor/neo_la_consolidate.config b/arch/arm64/configs/vendor/neo_la_consolidate.config
index 6f00e1c67963..9270f76643d8 100644
--- a/arch/arm64/configs/vendor/neo_la_consolidate.config
+++ b/arch/arm64/configs/vendor/neo_la_consolidate.config
@@ -1,4 +1,5 @@
 CONFIG_CMDLINE="stack_depot_disable=off kasan.stacktrace=off cgroup_disable=pressure cgroup.memory=nokmem page_owner=on no_hash_pointers panic_on_taint=0x20"
+CONFIG_CORESIGHT_SOURCE_ETM4X=m
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
 CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y
diff --git a/modules.list.msm.neo-la b/modules.list.msm.neo-la
index 69757123b6be..462aae2bca87 100644
--- a/modules.list.msm.neo-la
+++ b/modules.list.msm.neo-la
@@ -39,6 +39,7 @@ minidump.ko
 deferred-free-helper.ko
 mem-offline.ko
 mem-hooks.ko
+dcc_v2.ko
 memory_dump_v2.ko
 msm_dma_iommu_mapping.ko
 qcom_wdt_core.ko
diff --git a/neo_la.bzl b/neo_la.bzl
index ba3a08957be3..55af551b8245 100644
--- a/neo_la.bzl
+++ b/neo_la.bzl
@@ -32,6 +32,25 @@ def define_neo_la():
         "drivers/edac/qcom_edac.ko",
         "drivers/firmware/qcom-scm.ko",
         "drivers/hwspinlock/qcom_hwspinlock.ko",
+        "drivers/hwtracing/coresight/coresight.ko",
+        "drivers/hwtracing/coresight/coresight-csr.ko",
+        "drivers/hwtracing/coresight/coresight-cti.ko",
+        "drivers/hwtracing/coresight/coresight-dummy.ko",
+        "drivers/hwtracing/coresight/coresight-funnel.ko",
+        "drivers/hwtracing/coresight/coresight-remote-etm.ko",
+        "drivers/hwtracing/coresight/coresight-replicator.ko",
+        "drivers/hwtracing/coresight/coresight-stm.ko",
+        "drivers/hwtracing/coresight/coresight-tgu.ko",
+        "drivers/hwtracing/coresight/coresight-tmc.ko",
+        "drivers/hwtracing/coresight/coresight-tmc-sec.ko",
+        "drivers/hwtracing/coresight/coresight-tpda.ko",
+        "drivers/hwtracing/coresight/coresight-tpdm.ko",
+        "drivers/hwtracing/stm/stm_console.ko",
+        "drivers/hwtracing/stm/stm_core.ko",
+        "drivers/hwtracing/stm/stm_ftrace.ko",
+        "drivers/hwtracing/stm/stm_p_basic.ko",
+        "drivers/hwtracing/stm/stm_p_ost.ko",
+        "drivers/hwtracing/stm/stm_p_sys-t.ko",
         "drivers/i2c/busses/i2c-msm-geni.ko",
         "drivers/interconnect/qcom/icc-bcm-voter.ko",
         "drivers/interconnect/qcom/icc-debug.ko",
@@ -76,6 +95,7 @@ def define_neo_la():
         "drivers/soc/qcom/cdsprm.ko",
         "drivers/soc/qcom/cmd-db.ko",
         "drivers/soc/qcom/core_hang_detect.ko",
+        "drivers/soc/qcom/dcc_v2.ko",
         "drivers/soc/qcom/dcvs/bwmon.ko",
         "drivers/soc/qcom/dcvs/bwprof.ko",
         "drivers/soc/qcom/dcvs/dcvs_fp.ko",
@@ -147,6 +167,7 @@ def define_neo_la():
 
     _neo_consolidate_in_tree_modules = _neo_in_tree_modules + [
         # keep sorted
+        "drivers/hwtracing/coresight/coresight-etm4x.ko",
         "drivers/misc/lkdtm/lkdtm.ko",
         "kernel/sched/walt/sched-walt-debug.ko",
     ]