lkml.org 
[lkml]   [2019]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/14] tools arch x86: Sync asm/cpufeatures.h with the with the kernel
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    To pick up the changes in:

    ed5194c2732c ("x86/speculation/mds: Add basic bug infrastructure for MDS")
    e261f209c366 ("x86/speculation/mds: Add BUG_MSBDS_ONLY")

    That don't affect anything in tools/.

    This silences this perf build warning:

    Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h'
    diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: https://lkml.kernel.org/n/tip-jp1afecx3ql1jkuirpgkqfad@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/arch/x86/include/asm/cpufeatures.h | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
    index 981ff9479648..75f27ee2c263 100644
    --- a/tools/arch/x86/include/asm/cpufeatures.h
    +++ b/tools/arch/x86/include/asm/cpufeatures.h
    @@ -344,6 +344,7 @@
    /* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
    #define X86_FEATURE_AVX512_4VNNIW (18*32+ 2) /* AVX-512 Neural Network Instructions */
    #define X86_FEATURE_AVX512_4FMAPS (18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */
    +#define X86_FEATURE_MD_CLEAR (18*32+10) /* VERW clears CPU buffers */
    #define X86_FEATURE_TSX_FORCE_ABORT (18*32+13) /* "" TSX_FORCE_ABORT */
    #define X86_FEATURE_PCONFIG (18*32+18) /* Intel PCONFIG */
    #define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */
    @@ -382,5 +383,7 @@
    #define X86_BUG_SPECTRE_V2 X86_BUG(16) /* CPU is affected by Spectre variant 2 attack with indirect branches */
    #define X86_BUG_SPEC_STORE_BYPASS X86_BUG(17) /* CPU is affected by speculative store bypass attack */
    #define X86_BUG_L1TF X86_BUG(18) /* CPU is affected by L1 Terminal Fault */
    +#define X86_BUG_MDS X86_BUG(19) /* CPU is affected by Microarchitectural data sampling */
    +#define X86_BUG_MSBDS_ONLY X86_BUG(20) /* CPU is only affected by the MSDBS variant of BUG_MDS */

    #endif /* _ASM_X86_CPUFEATURES_H */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-28 19:52    [W:2.502 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site