提交 ce38f038 编写于 作者: T Thomas Gleixner 提交者: Borislav Petkov

x86/fpu: Get rid of fpu__get_supported_xfeatures_mask()

This function is really not doing what the comment advertises:

 "Find supported xfeatures based on cpu features and command-line input.
  This must be called after fpu__init_parse_early_param() is called and
  xfeatures_mask is enumerated."

fpu__init_parse_early_param() does not exist anymore and the function just
returns a constant.

Remove it and fix the caller and get rid of further references to
fpu__init_parse_early_param().
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NBorislav Petkov <bp@suse.de>
Reviewed-by: NBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210623121451.816404717@linutronix.de
上级 4e8e4313
...@@ -45,7 +45,6 @@ extern void fpu__init_cpu_xstate(void); ...@@ -45,7 +45,6 @@ extern void fpu__init_cpu_xstate(void);
extern void fpu__init_system(struct cpuinfo_x86 *c); extern void fpu__init_system(struct cpuinfo_x86 *c);
extern void fpu__init_check_bugs(void); extern void fpu__init_check_bugs(void);
extern void fpu__resume_cpu(void); extern void fpu__resume_cpu(void);
extern u64 fpu__get_supported_xfeatures_mask(void);
/* /*
* Debugging facility: * Debugging facility:
......
...@@ -1715,9 +1715,8 @@ void print_cpu_info(struct cpuinfo_x86 *c) ...@@ -1715,9 +1715,8 @@ void print_cpu_info(struct cpuinfo_x86 *c)
} }
/* /*
* clearcpuid= was already parsed in fpu__init_parse_early_param. * clearcpuid= was already parsed in cpu_parse_early_param(). This dummy
* But we need to keep a dummy __setup around otherwise it would * function prevents it from becoming an environment variable for init.
* show up as an environment variable for init.
*/ */
static __init int setup_clearcpuid(char *arg) static __init int setup_clearcpuid(char *arg)
{ {
......
...@@ -216,17 +216,6 @@ static void __init fpu__init_system_xstate_size_legacy(void) ...@@ -216,17 +216,6 @@ static void __init fpu__init_system_xstate_size_legacy(void)
fpu_user_xstate_size = fpu_kernel_xstate_size; fpu_user_xstate_size = fpu_kernel_xstate_size;
} }
/*
* Find supported xfeatures based on cpu features and command-line input.
* This must be called after fpu__init_parse_early_param() is called and
* xfeatures_mask is enumerated.
*/
u64 __init fpu__get_supported_xfeatures_mask(void)
{
return XFEATURE_MASK_USER_SUPPORTED |
XFEATURE_MASK_SUPERVISOR_SUPPORTED;
}
/* Legacy code to initialize eager fpu mode. */ /* Legacy code to initialize eager fpu mode. */
static void __init fpu__init_system_ctx_switch(void) static void __init fpu__init_system_ctx_switch(void)
{ {
......
...@@ -868,7 +868,9 @@ void __init fpu__init_system_xstate(void) ...@@ -868,7 +868,9 @@ void __init fpu__init_system_xstate(void)
xfeatures_mask_all &= ~BIT_ULL(i); xfeatures_mask_all &= ~BIT_ULL(i);
} }
xfeatures_mask_all &= fpu__get_supported_xfeatures_mask(); xfeatures_mask_all &= XFEATURE_MASK_USER_SUPPORTED |
XFEATURE_MASK_SUPERVISOR_SUPPORTED;
/* Store it for paranoia check at the end */ /* Store it for paranoia check at the end */
xfeatures = xfeatures_mask_all; xfeatures = xfeatures_mask_all;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册