diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 058f8b3ea096..93853791f10c 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -680,6 +680,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_TRACE_MMIO_ACCESS=y
 CONFIG_CRC_CCITT=y
 CONFIG_XZ_DEC=y
+CONFIG_SWIOTLB_DYNAMIC=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y
diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index e9aa70c39034..bf752ecac34f 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -621,6 +621,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC8=y
 CONFIG_XZ_DEC=y
+CONFIG_SWIOTLB_DYNAMIC=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index d29dee4058d3..509ec2ea2125 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -632,6 +632,7 @@ CONFIG_CRYPTO_SHA512_SSSE3=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC8=y
 CONFIG_XZ_DEC=y
+CONFIG_SWIOTLB_DYNAMIC=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG_CORE=y