Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: x86/twofish - 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
b2d3d797
1613e604
+5
-4
+5
-4
arch/x86/crypto/twofish_glue_3way.c
+5
-4
arch/x86/crypto/twofish_glue_3way.c
···
5
5
* Copyright (c) 2011 Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
6
6
*/
7
7
8
+
#include <asm/cpu_device_id.h>
8
9
#include <crypto/algapi.h>
9
10
#include <crypto/twofish.h>
10
11
#include <linux/crypto.h>
···
108
107
if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
109
108
return false;
110
109
111
-
if (boot_cpu_data.x86 == 0x06 &&
112
-
(boot_cpu_data.x86_model == 0x1c ||
113
-
boot_cpu_data.x86_model == 0x26 ||
114
-
boot_cpu_data.x86_model == 0x36)) {
110
+
switch (boot_cpu_data.x86_vfm) {
111
+
case INTEL_ATOM_BONNELL:
112
+
case INTEL_ATOM_BONNELL_MID:
113
+
case INTEL_ATOM_SALTWELL:
115
114
/*
116
115
* On Atom, twofish-3way is slower than original assembler
117
116
* implementation. Twofish-3way trades off some performance in