diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config b/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config
index 9be596db6bc9..8717d29e717e 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_GKI.config
@@ -86,3 +86,4 @@ CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_SM6150_LLCC=m
 CONFIG_MSM_SERVICE_LOCATOR=m
 CONFIG_MSM_SERVICE_NOTIFIER=m
+CONFIG_MSM_CORE_HANG_DETECT=m
diff --git a/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config b/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
index 0e41f546d5b6..8d59bfa61a08 100644
--- a/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
+++ b/arch/arm64/configs/vendor/sdmsteppeauto_QGKI.config
@@ -33,3 +33,9 @@ CONFIG_ION_POOL_AUTO_REFILL=y
 CONFIG_QCOM_MINIDUMP=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_QCOM_BIMC_BWMON=y
+CONFIG_ARM_MEMLAT_MON=y
+CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y
+CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON=y
+CONFIG_DEVFREQ_GOV_MEMLAT=y
+CONFIG_QCOM_DEVFREQ_ICC=y