crypto: add CONFIG_CRYPTO_SUNXI_CE_ADAPTER

scpcom · Nov 14, 2021 · 5c23267 · 5c23267
1 parent a2d269a
commit 5c23267
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
@@ -34,8 +34,6 @@
 #include <linux/net.h>
 #include <net/sock.h>
 
-#define SUNXI_CE_ADAPTER
-
 static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg,
 			    size_t size)
 {
@@ -102,7 +100,7 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
 		goto free;
 	}
 	sg_init_table(areq->tsgl, areq->tsgl_entries);
-#ifndef SUNXI_CE_ADAPTER
+#ifndef CONFIG_CRYPTO_SUNXI_CE_ADAPTER
 	af_alg_pull_tsgl(sk, len, areq->tsgl, 0);
 #else
 	af_alg_pull_tsgl(sk, ctx->used, areq->tsgl, 0);
@@ -245,7 +243,7 @@ static int skcipher_sendmsg_nokey(struct socket *sock, struct msghdr *msg,
 	int err;
 
 	err = skcipher_check_key(sock);
-#ifndef SUNXI_CE_ADAPTER
+#ifndef CONFIG_CRYPTO_SUNXI_CE_ADAPTER
 	if (err)
 		return err;
 #endif
@@ -259,7 +257,7 @@ static ssize_t skcipher_sendpage_nokey(struct socket *sock, struct page *page,
 	int err;
 
 	err = skcipher_check_key(sock);
-#ifndef SUNXI_CE_ADAPTER
+#ifndef CONFIG_CRYPTO_SUNXI_CE_ADAPTER
 	if (err)
 		return err;
 #endif
@@ -273,7 +271,7 @@ static int skcipher_recvmsg_nokey(struct socket *sock, struct msghdr *msg,
 	int err;
 
 	err = skcipher_check_key(sock);
-#ifndef SUNXI_CE_ADAPTER
+#ifndef CONFIG_CRYPTO_SUNXI_CE_ADAPTER
 	if (err)
 		return err;
 #endif

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
@@ -23,8 +23,6 @@
 
 #include "internal.h"
 
-#define SUNXI_CE_ADAPTER
-
 enum {
 	SKCIPHER_WALK_PHYS = 1 << 0,
 	SKCIPHER_WALK_SLOW = 1 << 1,
@@ -852,7 +850,7 @@ int crypto_skcipher_encrypt(struct skcipher_request *req)
 
 	crypto_stats_get(alg);
 	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
-#ifndef SUNXI_CE_ADAPTER
+#ifndef CONFIG_CRYPTO_SUNXI_CE_ADAPTER
 		ret = -ENOKEY;
 #else
 		ret = tfm->encrypt(req);
@@ -873,7 +871,7 @@ int crypto_skcipher_decrypt(struct skcipher_request *req)
 
 	crypto_stats_get(alg);
 	if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
-#ifndef SUNXI_CE_ADAPTER
+#ifndef CONFIG_CRYPTO_SUNXI_CE_ADAPTER
 		ret = -ENOKEY;
 #else
 		ret = tfm->decrypt(req);

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
@@ -697,6 +697,15 @@ config CRYPTO_DEV_SUNXI
 	  CryptoEngine. It support some SoC of sun8i/sun50i series.
 	  Select this if you want to use it.
 
+config CRYPTO_SUNXI_CE_ADAPTER
+	bool "Support for Allwinner Sunxi CryptoEngine Adapter"
+	depends on ARCH_SUNXI
+	default y if ARCH_SUNXI
+	help
+	  Allwinner Sunxi SoC have a crypto accelerator named
+	  CryptoEngine Adapter.
+	  Select this if you want to use it.
+
 config CRYPTO_DEV_ROCKCHIP
 	tristate "Rockchip's Cryptographic Engine driver"
 	depends on OF && ARCH_ROCKCHIP