From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756080AbbHYUMJ (ORCPT ); Tue, 25 Aug 2015 16:12:09 -0400 Received: from mga01.intel.com ([192.55.52.88]:50860 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755060AbbHYUMD (ORCPT ); Tue, 25 Aug 2015 16:12:03 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,747,1437462000"; d="scan'208";a="548413998" Subject: [PATCH 02/11] x86, fpu: rename xfeature_bit To: dave@sr71.net Cc: dave.hansen@linux.intel.com, mingo@redhat.com, x86@kernel.org, bp@alien8.de, fenghua.yu@intel.com, tim.c.chen@linux.intel.com, linux-kernel@vger.kernel.org From: Dave Hansen Date: Tue, 25 Aug 2015 13:12:02 -0700 References: <20150825201201.CF766C1B@viggo.jf.intel.com> In-Reply-To: <20150825201201.CF766C1B@viggo.jf.intel.com> Message-Id: <20150825201202.61B614D6@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen The '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_nr'. These also happen to be what the Intel documentation calls a "state component". Signed-off-by: Dave Hansen Cc: Ingo Molnar Cc: x86@kernel.org Cc: Borislav Petkov Cc: Fenghua Yu Cc: Tim Chen Cc: linux-kernel@vger.kernel.org --- b/arch/x86/include/asm/fpu/types.h | 38 ++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff -puN arch/x86/include/asm/fpu/types.h~x86-fpu-rename-xfeature_bit arch/x86/include/asm/fpu/types.h --- a/arch/x86/include/asm/fpu/types.h~x86-fpu-rename-xfeature_bit 2015-08-25 12:49:58.393504548 -0700 +++ b/arch/x86/include/asm/fpu/types.h 2015-08-25 12:49:58.396504684 -0700 @@ -95,27 +95,31 @@ struct swregs_state { /* * List of XSAVE features Linux knows about: */ -enum xfeature_bit { - XSTATE_BIT_FP, - XSTATE_BIT_SSE, - XSTATE_BIT_YMM, - XSTATE_BIT_BNDREGS, - XSTATE_BIT_BNDCSR, - XSTATE_BIT_OPMASK, - XSTATE_BIT_ZMM_Hi256, - XSTATE_BIT_Hi16_ZMM, +enum xfeature_nr { + XFEATURE_NR_FP, + XFEATURE_NR_SSE, + /* + * Values above here are "legacy states". + * Those below are "extended states". + */ + XFEATURE_NR_YMM, + XFEATURE_NR_BNDREGS, + XFEATURE_NR_BNDCSR, + XFEATURE_NR_OPMASK, + XFEATURE_NR_ZMM_Hi256, + XFEATURE_NR_Hi16_ZMM, XFEATURES_NR_MAX, }; -#define XSTATE_FP (1 << XSTATE_BIT_FP) -#define XSTATE_SSE (1 << XSTATE_BIT_SSE) -#define XSTATE_YMM (1 << XSTATE_BIT_YMM) -#define XSTATE_BNDREGS (1 << XSTATE_BIT_BNDREGS) -#define XSTATE_BNDCSR (1 << XSTATE_BIT_BNDCSR) -#define XSTATE_OPMASK (1 << XSTATE_BIT_OPMASK) -#define XSTATE_ZMM_Hi256 (1 << XSTATE_BIT_ZMM_Hi256) -#define XSTATE_Hi16_ZMM (1 << XSTATE_BIT_Hi16_ZMM) +#define XSTATE_FP (1 << XFEATURE_NR_FP) +#define XSTATE_SSE (1 << XFEATURE_NR_SSE) +#define XSTATE_YMM (1 << XFEATURE_NR_YMM) +#define XSTATE_BNDREGS (1 << XFEATURE_NR_BNDREGS) +#define XSTATE_BNDCSR (1 << XFEATURE_NR_BNDCSR) +#define XSTATE_OPMASK (1 << XFEATURE_NR_OPMASK) +#define XSTATE_ZMM_Hi256 (1 << XFEATURE_NR_ZMM_Hi256) +#define XSTATE_Hi16_ZMM (1 << XFEATURE_NR_Hi16_ZMM) #define XSTATE_FPSSE (XSTATE_FP | XSTATE_SSE) #define XSTATE_AVX512 (XSTATE_OPMASK | XSTATE_ZMM_Hi256 | XSTATE_Hi16_ZMM) _