From d7c0f70e41bb7bf542092f2882b062ff52f5ae44 Mon Sep 17 00:00:00 2001
From: Serge Logvinov <serge.logvinov@sinextra.dev>
Date: Mon, 10 May 2021 11:51:31 +0300
Subject: [PATCH] feat: add AES-NI support for amd64

This PR adds:
- use AES extension on CPU (dm-crypt use it)
- speed up kernel build on OSX

Signed-off-by: Serge Logvinov <serge.logvinov@sinextra.dev>
---
 Makefile                   | 2 +-
 kernel/kernel/config-amd64 | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1dfc4e97..a4588c39 100644
--- a/Makefile
+++ b/Makefile
@@ -46,5 +46,5 @@ kernel-%: ## Updates the kernel configs: e.g. make kernel-olddefconfig; make ker
 	for platform in $(subst $(,),$(space),$(PLATFORM)); do \
 		arch=`basename $$platform` ; \
 		$(MAKE) docker-kernel-prepare PLATFORM=$$platform TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/kernel:$(TAG)-$$arch --load"; \
-		docker run --rm -it --entrypoint=/toolchain/bin/bash -e PATH=/toolchain/bin:/bin -w /src -v $$PWD/kernel/kernel/config-$$arch:/src/.hostconfig $(REGISTRY)/$(USERNAME)/kernel:$(TAG)-$$arch -c 'cp .hostconfig .config && make $* && cp .config .hostconfig'; \
+		docker run --rm -it --entrypoint=/toolchain/bin/bash -e PATH=/toolchain/bin:/bin -w /src -v $$PWD/kernel/kernel/config-$$arch:/host/.hostconfig $(REGISTRY)/$(USERNAME)/kernel:$(TAG)-$$arch -c 'cp /host/.hostconfig .config && make $* && cp .config /host/.hostconfig'; \
 	done
diff --git a/kernel/kernel/config-amd64 b/kernel/kernel/config-amd64
index 2740ad52..32e13a2b 100644
--- a/kernel/kernel/config-amd64
+++ b/kernel/kernel/config-amd64
@@ -5157,9 +5157,11 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_PCRYPT is not set
-# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=y
 CONFIG_CRYPTO_ENGINE=y
 
 #
@@ -5250,7 +5252,7 @@ CONFIG_CRYPTO_SHA512=y
 #
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
-# CONFIG_CRYPTO_AES_NI_INTEL is not set
+CONFIG_CRYPTO_AES_NI_INTEL=y
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set