From: David Woodhouse Date: Thu, 25 Jan 2018 16:14:12 +0000 (+0000) Subject: x86/msr: Add definitions for new speculation control MSRs X-Git-Tag: v4.1.12-124.31.3~1158 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0e73fb90078889a68c70ccf4ab575d84761de668;p=users%2Fjedix%2Flinux-maple.git x86/msr: Add definitions for new speculation control MSRs Add MSR and bit definitions for SPEC_CTRL, PRED_CMD and ARCH_CAPABILITIES. See Intel's 336996-Speculative-Execution-Side-Channel-Mitigations.pdf Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Reviewed-by: Greg Kroah-Hartman Cc: gnomes@lxorguk.ukuu.org.uk Cc: ak@linux.intel.com Cc: ashok.raj@intel.com Cc: dave.hansen@intel.com Cc: karahmed@amazon.de Cc: arjan@linux.intel.com Cc: torvalds@linux-foundation.org Cc: peterz@infradead.org Cc: bp@alien8.de Cc: pbonzini@redhat.com Cc: tim.c.chen@linux.intel.com Cc: gregkh@linux-foundation.org Link: https://lkml.kernel.org/r/1516896855-7642-5-git-send-email-dwmw@amazon.co.uk (cherry picked from commit 1e340c60d0dd3ae07b5bedc16a0469c14b9f3410) Signed-off-by: Konrad Rzeszutek Wilk Orabug: 27477743 CVE: CVE-2017-5715 Conflicts: arch/x86/include/asm/msr-index.h [File does not exist, and more importantly we have most of the MSRs, except two of the bits] Reviewed-by: Pavel Tatashin --- diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index eb183c40dff2..eff37e0bb3ca 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -47,6 +47,9 @@ #define MSR_PLATFORM_INFO 0x000000ce #define MSR_MTRRcap 0x000000fe #define MSR_IA32_ARCH_CAPABILITIES 0x0000010a +#define ARCH_CAP_RDCL_NO (1 << 0) /* Not susceptible to Meltdown */ +#define ARCH_CAP_IBRS_ALL (1 << 1) /* Enhanced IBRS support */ + #define MSR_IA32_BBL_CR_CTL 0x00000119 #define MSR_IA32_BBL_CR_CTL3 0x0000011e