lkml.org 
[lkml]   [2022]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 2/6] x86/cpu: Merge Intel and AMD ppin_init() functions
On Fri, Jan 21, 2022 at 09:47:39AM -0800, Tony Luck wrote:
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index 7b8382c11788..b7700a47eadd 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -88,6 +88,80 @@ EXPORT_SYMBOL_GPL(get_llc_id);
> /* L2 cache ID of each logical CPU */
> DEFINE_PER_CPU_READ_MOSTLY(u16, cpu_l2c_id) = BAD_APICID;
>
> +static struct ppin_info {
> + int feature;
> + int msr_ppin_ctl;
> +} ppin_info[] = {
> + [X86_VENDOR_INTEL] = {
> + .feature = X86_FEATURE_INTEL_PPIN,
> + .msr_ppin_ctl = MSR_PPIN_CTL,
> + .msr_ppin = MSR_PPIN
> + },
> + [X86_VENDOR_AMD] = {
> + .feature = X86_FEATURE_AMD_PPIN,
> + .msr_ppin_ctl = MSR_AMD_PPIN_CTL,
> + .msr_ppin = MSR_AMD_PPIN
^^^^^^^^^

You forgot to rebuild after removing that guy here in the struct
definition. I'll fix it up now so that I can continue going through them
but pls fix in the next submission so that all patches build separately.

Thx.

arch/x86/kernel/cpu/common.c:98:4: error: ‘struct ppin_info’ has no member named ‘msr_ppin’; did you mean ‘msr_ppin_ctl’?
98 | .msr_ppin = MSR_PPIN
| ^~~~~~~~
| msr_ppin_ctl
In file included from ./arch/x86/include/asm/msr.h:5,
from ./arch/x86/include/asm/processor.h:22,
from ./arch/x86/include/asm/cpufeature.h:5,
from ./arch/x86/include/asm/thread_info.h:53,
from ./include/linux/thread_info.h:60,
from ./arch/x86/include/asm/preempt.h:7,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:55,
from ./include/linux/mmzone.h:8,
from ./include/linux/gfp.h:6,
from ./include/linux/mm.h:10,
from ./include/linux/memblock.h:12,
from arch/x86/kernel/cpu/common.c:5:
./arch/x86/include/asm/msr-index.h:59:20: warning: excess elements in struct initializer
59 | #define MSR_PPIN 0x0000004f
| ^~~~~~~~~~
arch/x86/kernel/cpu/common.c:98:15: note: in expansion of macro ‘MSR_PPIN’
98 | .msr_ppin = MSR_PPIN
| ^~~~~~~~
./arch/x86/include/asm/msr-index.h:59:20: note: (near initialization for ‘ppin_info[0]’)
59 | #define MSR_PPIN 0x0000004f
| ^~~~~~~~~~
arch/x86/kernel/cpu/common.c:98:15: note: in expansion of macro ‘MSR_PPIN’
98 | .msr_ppin = MSR_PPIN
| ^~~~~~~~
arch/x86/kernel/cpu/common.c:103:4: error: ‘struct ppin_info’ has no member named ‘msr_ppin’; did you mean ‘msr_ppin_ctl’?
103 | .msr_ppin = MSR_AMD_PPIN
| ^~~~~~~~
| msr_ppin_ctl
In file included from ./arch/x86/include/asm/msr.h:5,
from ./arch/x86/include/asm/processor.h:22,
from ./arch/x86/include/asm/cpufeature.h:5,
from ./arch/x86/include/asm/thread_info.h:53,
from ./include/linux/thread_info.h:60,
from ./arch/x86/include/asm/preempt.h:7,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:55,
from ./include/linux/mmzone.h:8,
from ./include/linux/gfp.h:6,
from ./include/linux/mm.h:10,
from ./include/linux/memblock.h:12,
from arch/x86/kernel/cpu/common.c:5:
./arch/x86/include/asm/msr-index.h:455:24: warning: excess elements in struct initializer
455 | #define MSR_AMD_PPIN 0xc00102f1
| ^~~~~~~~~~
arch/x86/kernel/cpu/common.c:103:15: note: in expansion of macro ‘MSR_AMD_PPIN’
103 | .msr_ppin = MSR_AMD_PPIN
| ^~~~~~~~~~~~
./arch/x86/include/asm/msr-index.h:455:24: note: (near initialization for ‘ppin_info[2]’)
455 | #define MSR_AMD_PPIN 0xc00102f1
| ^~~~~~~~~~
arch/x86/kernel/cpu/common.c:103:15: note: in expansion of macro ‘MSR_AMD_PPIN’
103 | .msr_ppin = MSR_AMD_PPIN
| ^~~~~~~~~~~~
make[3]: *** [scripts/Makefile.build:288: arch/x86/kernel/cpu/common.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [scripts/Makefile.build:550: arch/x86/kernel/cpu] Error 2
make[1]: *** [scripts/Makefile.build:550: arch/x86/kernel] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1831: arch/x86] Error 2
make: *** Waiting for unfinished jobs....

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette

\
 
 \ /
  Last update: 2022-01-27 11:24    [W:0.324 / U:0.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site