From ea09b9954cc40b3088b8b2778b2daab12820a7e6 Mon Sep 17 00:00:00 2001 From: Satya Tangirala Date: Mon, 27 Jan 2020 16:14:18 -0800 Subject: [PATCH] ANDROID: cuttlefish_defconfig: Enable blk-crypto fallback Enable blk-crypto's kernel crypto API fallback, so that devices without inline encryption hardware can continue to use the inlinecrypt mount option and have file content crypto handled by the block layer. Bug: 137270441 Test: xfstests, cuttlefish boot and stress test, pixel 4 boot and stress test Change-Id: I26376479ee38259b8c35732cb3a1d7e15f9b05a3 Signed-off-by: Satya Tangirala --- arch/arm64/configs/cuttlefish_defconfig | 1 + arch/x86/configs/x86_64_cuttlefish_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 99cb9b35a849..89ce97cf812c 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -48,6 +48,7 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PREEMPT=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index a0434800549d..e6874f1f68cf 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -42,6 +42,7 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_PARTITION_ADVANCED=y CONFIG_SMP=y CONFIG_HYPERVISOR_GUEST=y