| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Satya Tangirala <satyat@google.com> |
| Date: Tue, 17 Dec 2019 17:32:46 -0800 |
| Subject: ANDROID: gki_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 <satyat@google.com> |
| --- |
| arch/arm64/configs/gki_defconfig | 1 + |
| arch/x86/configs/gki_defconfig | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| index 156624c5faeb..1e7fccfc07de 100644 |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -80,6 +80,7 @@ CONFIG_MODULES=y |
| CONFIG_MODULE_UNLOAD=y |
| CONFIG_MODVERSIONS=y |
| CONFIG_BLK_INLINE_ENCRYPTION=y |
| +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y |
| CONFIG_GKI_HACKS_TO_FIX=y |
| # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| CONFIG_BINFMT_MISC=m |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| index 5a8f671329a2..d456c9857d6c 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -55,6 +55,7 @@ CONFIG_MODULES=y |
| CONFIG_MODULE_UNLOAD=y |
| CONFIG_MODVERSIONS=y |
| CONFIG_BLK_INLINE_ENCRYPTION=y |
| +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y |
| CONFIG_GKI_HACKS_TO_FIX=y |
| # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| CONFIG_BINFMT_MISC=m |
