From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/arch/arm/crypto/chacha-glue.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/arch/arm/crypto/chacha-glue.c b/kernel/arch/arm/crypto/chacha-glue.c
index f8eee0f..59da6c0 100644
--- a/kernel/arch/arm/crypto/chacha-glue.c
+++ b/kernel/arch/arm/crypto/chacha-glue.c
@@ -9,6 +9,7 @@
#include <crypto/algapi.h>
#include <crypto/internal/chacha.h>
+#include <crypto/internal/simd.h>
#include <crypto/internal/skcipher.h>
#include <linux/jump_label.h>
#include <linux/kernel.h>
@@ -33,7 +34,7 @@
static inline bool neon_usable(void)
{
- return static_branch_likely(&use_neon) && may_use_simd();
+ return static_branch_likely(&use_neon) && crypto_simd_usable();
}
static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
@@ -295,7 +296,7 @@
{
int err = 0;
- if (IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER)) {
+ if (IS_REACHABLE(CONFIG_CRYPTO_SKCIPHER)) {
err = crypto_register_skciphers(arm_algs, ARRAY_SIZE(arm_algs));
if (err)
return err;
@@ -319,7 +320,7 @@
static_branch_enable(&use_neon);
}
- if (IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER)) {
+ if (IS_REACHABLE(CONFIG_CRYPTO_SKCIPHER)) {
err = crypto_register_skciphers(neon_algs, ARRAY_SIZE(neon_algs));
if (err)
crypto_unregister_skciphers(arm_algs, ARRAY_SIZE(arm_algs));
@@ -330,7 +331,7 @@
static void __exit chacha_simd_mod_fini(void)
{
- if (IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER)) {
+ if (IS_REACHABLE(CONFIG_CRYPTO_SKCIPHER)) {
crypto_unregister_skciphers(arm_algs, ARRAY_SIZE(arm_algs));
if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && (elf_hwcap & HWCAP_NEON))
crypto_unregister_skciphers(neon_algs, ARRAY_SIZE(neon_algs));
--
Gitblit v1.6.2