Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: x86/poly1305 - Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
authored by
Tony Luck
and committed by
Herbert Xu
adc5167b
b2d3d797
+2
-2
+2
-2
arch/x86/crypto/poly1305_glue.c
+2
-2
arch/x86/crypto/poly1305_glue.c
···
12
12
#include <linux/kernel.h>
13
13
#include <linux/module.h>
14
14
#include <linux/sizes.h>
15
-
#include <asm/intel-family.h>
15
+
#include <asm/cpu_device_id.h>
16
16
#include <asm/simd.h>
17
17
18
18
asmlinkage void poly1305_init_x86_64(void *ctx,
···
269
269
boot_cpu_has(X86_FEATURE_AVX2) && boot_cpu_has(X86_FEATURE_AVX512F) &&
270
270
cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | XFEATURE_MASK_AVX512, NULL) &&
271
271
/* Skylake downclocks unacceptably much when using zmm, but later generations are fast. */
272
-
boot_cpu_data.x86_model != INTEL_FAM6_SKYLAKE_X)
272
+
boot_cpu_data.x86_vfm != INTEL_SKYLAKE_X)
273
273
static_branch_enable(&poly1305_use_avx512);
274
274
return IS_REACHABLE(CONFIG_CRYPTO_HASH) ? crypto_register_shash(&alg) : 0;
275
275
}