From 95099d4622f8cb224d94e314c7a8e0df60b13f87 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Sat, 09 Dec 2023 08:38:01 +0000
Subject: [PATCH] enable docker ppp
---
kernel/arch/arm64/crypto/chacha-neon-glue.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/kernel/arch/arm64/crypto/chacha-neon-glue.c b/kernel/arch/arm64/crypto/chacha-neon-glue.c
index 531567a..af2bbca 100644
--- a/kernel/arch/arm64/crypto/chacha-neon-glue.c
+++ b/kernel/arch/arm64/crypto/chacha-neon-glue.c
@@ -21,6 +21,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>
@@ -63,7 +64,7 @@
void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds)
{
- if (!static_branch_likely(&have_neon) || !may_use_simd()) {
+ if (!static_branch_likely(&have_neon) || !crypto_simd_usable()) {
hchacha_block_generic(state, stream, nrounds);
} else {
kernel_neon_begin();
@@ -83,7 +84,7 @@
int nrounds)
{
if (!static_branch_likely(&have_neon) || bytes <= CHACHA_BLOCK_SIZE ||
- !may_use_simd())
+ !crypto_simd_usable())
return chacha_crypt_generic(state, dst, src, bytes, nrounds);
do {
@@ -118,7 +119,7 @@
nbytes = rounddown(nbytes, walk.stride);
if (!static_branch_likely(&have_neon) ||
- !may_use_simd()) {
+ !crypto_simd_usable()) {
chacha_crypt_generic(state, walk.dst.virt.addr,
walk.src.virt.addr, nbytes,
ctx->nrounds);
@@ -213,18 +214,18 @@
static int __init chacha_simd_mod_init(void)
{
- if (!(elf_hwcap & HWCAP_ASIMD))
+ if (!cpu_have_named_feature(ASIMD))
return 0;
static_branch_enable(&have_neon);
- return IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER) ?
+ return IS_REACHABLE(CONFIG_CRYPTO_SKCIPHER) ?
crypto_register_skciphers(algs, ARRAY_SIZE(algs)) : 0;
}
static void __exit chacha_simd_mod_fini(void)
{
- if (IS_REACHABLE(CONFIG_CRYPTO_BLKCIPHER) && (elf_hwcap & HWCAP_ASIMD))
+ if (IS_REACHABLE(CONFIG_CRYPTO_SKCIPHER) && cpu_have_named_feature(ASIMD))
crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
}
--
Gitblit v1.6.2