x86/fpu: Use XFEATURE_FP/SSE enum values instead of hardcoded numbers

When setting up sizes and offsets for legacy header entries the code uses
hardcoded 0/1 instead of the corresponding enum values XFEATURE_FP and
XFEATURE_SSE.

Replace the hardcoded numbers which enhances readability of the code and
also makes this code the first user of those enum values..

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20191101130153.GG1615@uranus.lan

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index a8bd5c01c796e1d289f25634a029dadaa41f1465..319be936c348ef1f0c09ed99d243e4d04efb8005 100644 (file)
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -254,10 +254,13 @@ static void __init setup_xstate_features(void)
         * in the fixed offsets in the xsave area in either compacted form
         * or standard form.
         */
-       xstate_offsets[0] = 0;
-       xstate_sizes[0] = offsetof(struct fxregs_state, xmm_space);
-       xstate_offsets[1] = xstate_sizes[0];
-       xstate_sizes[1] = FIELD_SIZEOF(struct fxregs_state, xmm_space);
+       xstate_offsets[XFEATURE_FP]     = 0;
+       xstate_sizes[XFEATURE_FP]       = offsetof(struct fxregs_state,
+                                                  xmm_space);
+
+       xstate_offsets[XFEATURE_SSE]    = xstate_sizes[XFEATURE_FP];
+       xstate_sizes[XFEATURE_SSE]      = FIELD_SIZEOF(struct fxregs_state,
+                                                      xmm_space);
 
        for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
                if (!xfeature_enabled(i))
@@ -350,8 +353,9 @@ static void __init setup_xstate_comp(void)
         * in the fixed offsets in the xsave area in either compacted form
         * or standard form.
         */
-       xstate_comp_offsets[0] = 0;
-       xstate_comp_offsets[1] = offsetof(struct fxregs_state, xmm_space);
+       xstate_comp_offsets[XFEATURE_FP] = 0;
+       xstate_comp_offsets[XFEATURE_SSE] = offsetof(struct fxregs_state,
+                                                    xmm_space);
 
        if (!boot_cpu_has(X86_FEATURE_XSAVES)) {
                for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {