diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index a45fa698..ce82965 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -76,6 +76,10 @@
 CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
+CONFIG_NVHE_EL2_DEBUG=y
+CONFIG_PROTECTED_NVHE_STACKTRACE=y
+CONFIG_KVM_ARM_HYP_DEBUG_UART=y
+CONFIG_KVM_ARM_HYP_DEBUG_UART_ADDR=0x10A00000
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_SHADOW_CALL_STACK=y