diff --git a/arch/arm64/configs/vendor/kalama_GKI.config b/arch/arm64/configs/vendor/kalama_GKI.config
index 69a30c6a131d..3a032f90e8e0 100644
--- a/arch/arm64/configs/vendor/kalama_GKI.config
+++ b/arch/arm64/configs/vendor/kalama_GKI.config
@@ -57,6 +57,7 @@ CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_MISC=y
 CONFIG_MHI_SATELLITE=m
 CONFIG_MHI_UCI=m
+CONFIG_MINIDUMP_MAX_ENTRIES=200
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MSM_ADSPRPC=m
 CONFIG_MSM_BOOT_STATS=m
@@ -106,6 +107,7 @@ CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
 CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
 CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y
 # CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_UNCACHED is not set
+CONFIG_QCOM_DYN_MINIDUMP_STACK=y
 CONFIG_QCOM_EUD=m
 CONFIG_QCOM_FSA4480_I2C=m
 CONFIG_QCOM_GDSC_REGULATOR=m
@@ -120,6 +122,7 @@ CONFIG_QCOM_LAZY_MAPPING=m
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LLCC_PERFMON=m
 CONFIG_QCOM_LLCC_PMU=m
+CONFIG_QCOM_LOGBUF_VENDOR_HOOKS=m
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_MEMLAT=m
 CONFIG_QCOM_MEMORY_DUMP_V2=m
@@ -130,6 +133,11 @@ CONFIG_QCOM_MEM_BUF_MSGQ=m
 CONFIG_QCOM_MEM_HOOKS=m
 CONFIG_QCOM_MEM_OFFLINE=m
 # CONFIG_QCOM_MICRODUMP is not set
+CONFIG_QCOM_MINIDUMP=m
+CONFIG_QCOM_MINIDUMP_FTRACE=y
+CONFIG_QCOM_MINIDUMP_PANIC_CPU_CONTEXT=y
+CONFIG_QCOM_MINIDUMP_PANIC_DUMP=y
+CONFIG_QCOM_MINIDUMP_PSTORE=y
 CONFIG_QCOM_MSM_IPCC=m
 CONFIG_QCOM_PANEL_EVENT_NOTIFIER=m
 CONFIG_QCOM_PDC=m
diff --git a/arch/arm64/configs/vendor/waipio_GKI.config b/arch/arm64/configs/vendor/waipio_GKI.config
index f70adbc8e08d..1eb523aaa715 100644
--- a/arch/arm64/configs/vendor/waipio_GKI.config
+++ b/arch/arm64/configs/vendor/waipio_GKI.config
@@ -29,6 +29,7 @@ CONFIG_INTERCONNECT_QCOM_RPMH_POSSIBLE=m
 CONFIG_INTERCONNECT_QCOM_WAIPIO=m
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_MFD_SPMI_PMIC=m
+CONFIG_MINIDUMP_MAX_ENTRIES=200
 CONFIG_MSM_BOOT_STATS=m
 CONFIG_MSM_CORE_HANG_DETECT=m
 CONFIG_MSM_DEBUGCC_WAIPIO=m
@@ -59,6 +60,7 @@ CONFIG_QCOM_DMABUF_HEAPS_CMA=y
 CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
 CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
 CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y
+CONFIG_QCOM_DYN_MINIDUMP_STACK=y
 CONFIG_QCOM_EUD=m
 CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QCOM_GDSC_REGULATOR=m
@@ -73,6 +75,7 @@ CONFIG_QCOM_IRQ_STAT=y
 CONFIG_QCOM_LAZY_MAPPING=m
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LLCC_PMU=m
+CONFIG_QCOM_LOGBUF_VENDOR_HOOKS=m
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_MEMLAT=m
 CONFIG_QCOM_MEM_BUF=m
@@ -81,6 +84,10 @@ CONFIG_QCOM_MEM_BUF_GH=y
 CONFIG_QCOM_MEM_BUF_MSGQ=m
 CONFIG_QCOM_MEM_HOOKS=m
 CONFIG_QCOM_MEM_OFFLINE=m
+CONFIG_QCOM_MINIDUMP=m
+CONFIG_QCOM_MINIDUMP_FTRACE=y
+CONFIG_QCOM_MINIDUMP_PANIC_DUMP=y
+CONFIG_QCOM_MINIDUMP_PSTORE=y
 CONFIG_QCOM_PDC=m
 CONFIG_QCOM_PDR_HELPERS=m
 CONFIG_QCOM_PIL_INFO=m
diff --git a/modules.list.msm.kalama b/modules.list.msm.kalama
index c47cf31d018b..f9274f3387b7 100644
--- a/modules.list.msm.kalama
+++ b/modules.list.msm.kalama
@@ -39,6 +39,7 @@ mem_buf_dev.ko
 mem_buf_msgq.ko
 mem_buf.ko
 memory_dump_v2.ko
+minidump.ko
 msm_dma_iommu_mapping.ko
 pinctrl-kalama.ko
 qnoc-kalama.ko
@@ -54,6 +55,7 @@ qcom-dcvs.ko
 qcom-dload-mode.ko
 qcom_dma_heaps.ko
 qcom_hwspinlock.ko
+qcom_logbuf_vh.ko
 qcom_iommu_util.ko
 qcom_llcc_pmu.ko
 qcom-pmu-lib.ko
diff --git a/modules.list.msm.waipio b/modules.list.msm.waipio
index 586fbd14a19a..caf8bfafcb09 100644
--- a/modules.list.msm.waipio
+++ b/modules.list.msm.waipio
@@ -67,6 +67,7 @@ qcom-spmi-pmic.ko
 qcom_dma_heaps.ko
 qcom_gic_intr_routing.ko
 qcom_hwspinlock.ko
+qcom_logbuf_vh.ko
 qcom_iommu_util.ko
 qcom_llcc_pmu.ko
 qcom_rpmh.ko