Re: [PATCH] x86/cpu: Reinitialize IA32_FEAT_CTL MSR on BSP during wakeup

Brad Campbell
2020-06-08T13:21:27Z

G'day Sean,

With the addition of this patch on a vanilla v5.7 :
Tested-by: Brad Campbell <lists2009@fnarfbargle.com>

On 8/6/20 12:34 am, Sean Christopherson wrote:
> On Sat, Jun 06, 2020 at 05:08:38AM +0800, kernel test robot wrote:
> arch/x86/kernel/cpu/centaur.c: In function 'init_centaur':
>>>> arch/x86/kernel/cpu/centaur.c:219:2: error: implicit declaration of function 'init_ia32_feat_ctl' [-Werror=implicit-function-declaration]
>> 219 | init_ia32_feat_ctl(c);
>> | ^~~~~~~~~~~~~~~~~~
>> cc1: some warnings being treated as errors
>> --
>> arch/x86/kernel/cpu/zhaoxin.c: In function 'init_zhaoxin':
>>>> arch/x86/kernel/cpu/zhaoxin.c:110:2: error: implicit declaration of function 'init_ia32_feat_ctl' [-Werror=implicit-function-declaration]
>> 110 | init_ia32_feat_ctl(c);
>> | ^~~~~~~~~~~~~~~~~~
>> cc1: some warnings being treated as errors
>
> Blech, zhaoxin.c an centaur.c don't include asm/cpu.h, and I (obviously)
> don't have them enabled in my configs. I'll wait a day or two more before
> sending v2.
> diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
> index 426792565d86..c5cf336e5077 100644
> --- a/arch/x86/kernel/cpu/centaur.c
> +++ b/arch/x86/kernel/cpu/centaur.c
> @@ -3,6 +3,7 @@
> #include <linux/sched.h>
> #include <linux/sched/clock.h>
>
> +#include <asm/cpu.h>
> #include <asm/cpufeature.h>
> #include <asm/e820/api.h>
> #include <asm/mtrr.h>
> diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c
> index df1358ba622b..05fa4ef63490 100644
> --- a/arch/x86/kernel/cpu/zhaoxin.c
> +++ b/arch/x86/kernel/cpu/zhaoxin.c
> @@ -2,6 +2,7 @@
> #include <linux/sched.h>
> #include <linux/sched/clock.h>
>
> +#include <asm/cpu.h>
> #include <asm/cpufeature.h>
>
> #include "cpu.h"
>
>