From ffcc6401988e40e47682c52c2dff28652d63236a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 9 Oct 2019 13:00:58 -0700 Subject: [PATCH] ANDROID: gki_defconfig: enable accelerated AES and SHA-256 Enable AES and SHA-256 accelerated with the ARM Cryptography Extensions or with AES-NI, as recommended by kernel-configs/android-4.19/android-recommended-{arm64,x86}.config. These are ~10x faster than the other software implementations of AES and SHA-256 on most devices, and often are required to get acceptable fscrypt and dm-verity performance. Bug: 142410832 Change-Id: Ia2794f47711132d5caa9021e6e81fb625e02be8d Signed-off-by: Eric Biggers --- arch/arm64/configs/gki_defconfig | 3 ++- arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 29cc5898a871..98520ebdd4d6 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -69,7 +69,8 @@ CONFIG_ARM_SCPI_PROTOCOL=y # CONFIG_ARM_SCPI_POWER_DOMAIN is not set # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_AES_ARM64=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_KPROBES=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 0e23b0cc3a8c..931fcbdced69 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -381,6 +381,8 @@ CONFIG_SECURITY_NETWORK=y CONFIG_HARDENED_USERCOPY=y CONFIG_SECURITY_SELINUX=y CONFIG_CRYPTO_ADIANTUM=y +CONFIG_CRYPTO_SHA256_SSSE3=y +CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_LZ4=y CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_ANSI_CPRNG=y