Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d91cab78 authored Sep 02, 2015 by Dave Hansen Committed by Ingo Molnar Sep 14, 2015

x86/fpu: Rename XSAVE macros



There are two concepts that have some confusing naming:
 1. Extended State Component numbers (currently called
    XFEATURE_BIT_*)
 2. Extended State Component masks (currently called XSTATE_*)

The numbers are (currently) from 0-9.  State component 3 is the
bounds registers for MPX, for instance.

But when we want to enable "state component 3", we go set a bit
in XCR0.  The bit we set is 1<<3.  We can check to see if a
state component feature is enabled by looking at its bit.

The current 'xfeature_bit's are at best xfeature bit _numbers_.
Calling them bits is at best inconsistent with ending the enum
list with 'XFEATURES_NR_MAX'.

This patch renames the enum to be 'xfeature'.  These also
happen to be what the Intel documentation calls a "state
component".

We also want to differentiate these from the "XSTATE_*" macros.
The "XSTATE_*" macros are a mask, and we rename them to match.

These macros are reasonably widely used so this patch is a
wee bit big, but this really is just a rename.

The only non-mechanical part of this is the

	s/XSTATE_EXTEND_MASK/XFEATURE_MASK_EXTEND/

We need a better name for it, but that's another patch.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: dave@sr71.net
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/20150902233126.38653250@viggo.jf.intel.com


[ Ported to v4.3-rc1. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 75933433

arch/x86/crypto/camellia_aesni_avx2_glue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,8 @@ static int __init camellia_aesni_init(void)
		return -ENODEV;
		}

		if (!cpu_has_xfeatures(XSTATE_SSE \| XSTATE_YMM, &feature_name)) {
		if (!cpu_has_xfeatures(XFEATURE_MASK_SSE \| XFEATURE_MASK_YMM,
		&feature_name)) {
		pr_info("CPU feature '%s' is not supported.\n", feature_name);
		return -ENODEV;
		}

arch/x86/crypto/camellia_aesni_avx_glue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -554,7 +554,8 @@ static int __init camellia_aesni_init(void)
		{
		const char *feature_name;

		if (!cpu_has_xfeatures(XSTATE_SSE \| XSTATE_YMM, &feature_name)) {
		if (!cpu_has_xfeatures(XFEATURE_MASK_SSE \| XFEATURE_MASK_YMM,
		&feature_name)) {
		pr_info("CPU feature '%s' is not supported.\n", feature_name);
		return -ENODEV;
		}

arch/x86/crypto/cast5_avx_glue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -469,7 +469,8 @@ static int __init cast5_init(void)
		{
		const char *feature_name;

		if (!cpu_has_xfeatures(XSTATE_SSE \| XSTATE_YMM, &feature_name)) {
		if (!cpu_has_xfeatures(XFEATURE_MASK_SSE \| XFEATURE_MASK_YMM,
		&feature_name)) {
		pr_info("CPU feature '%s' is not supported.\n", feature_name);
		return -ENODEV;
		}

arch/x86/crypto/cast6_avx_glue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -591,7 +591,8 @@ static int __init cast6_init(void)
		{
		const char *feature_name;

		if (!cpu_has_xfeatures(XSTATE_SSE \| XSTATE_YMM, &feature_name)) {
		if (!cpu_has_xfeatures(XFEATURE_MASK_SSE \| XFEATURE_MASK_YMM,
		&feature_name)) {
		pr_info("CPU feature '%s' is not supported.\n", feature_name);
		return -ENODEV;
		}

arch/x86/crypto/chacha20_glue.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ static int __init chacha20_simd_mod_init(void)

		#ifdef CONFIG_AS_AVX2
		chacha20_use_avx2 = cpu_has_avx && cpu_has_avx2 &&
		cpu_has_xfeatures(XSTATE_SSE \| XSTATE_YMM, NULL);
		cpu_has_xfeatures(XFEATURE_MASK_SSE \| XFEATURE_MASK_YMM, NULL);
		#endif
		return crypto_register_alg(&alg);
		}