From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2253gp76jhtWWY/gMovrPTHH6qxx4WpDkSlkN3xMCwIWSIFwrSZNQoR1dx6lcdeZHrgh5v18 ARC-Seal: i=1; a=rsa-sha256; t=1516528178; cv=none; d=google.com; s=arc-20160816; b=pytPEmTLUatSJZd7F3GbIOO3ZVF3p1BG58EpHQCVIwLJCM1GyUKoSyvMtIAA+I2T5N +w4LXOw6Tdw8OKeM3OnC34qZ4unXbxfJtkAeJmk/Vof2FnEcV03Vb6GI0jEU3PiN6nNV jR0UQkqHw+MFn+RmU+WGIcM3xXZNSS5S3WTUJQAVOwGOKqcUZ9415wZp8fsLpEeuPZ8C Cn7K7XdBQNLGjV79/q4PtDXGKo5hEGwVs/q60gpmir/9N0dq1ZBcmdht7ws4iimvWjDC abP82qTED0mkVfyQCuoz08WGzLBerQrA2TvrobJfwqR6UebSdNTSynANA/utjSogmNjI J/OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:arc-authentication-results; bh=s0jQ0Kk9JZdDOyaIpAtMFvWGN73e1qEw+eQRhhCqlKo=; b=Mw0PcuppiN99yh/tySrQFTXs43VfCX9pS3AwQuHEO3Oncei3vHFzejNhyOoBUJgZyY R4HXoV7DyWlFAN15K38YbkMeJtkambO/5YdxBLcxOV01ivVeegIm5lffZoS63ClOhFOq BthmUz/0CNT3Fz4V6mrSSMRh/4mH+BFcF8MnYiJ1GbwAm589rBjN/VLdfC4GRvox4fPo DMwAgB0H1qe6ZmcBKB+wj3QuQoqYbyV+GnD7aHXRUYaLykpGZVOo5lwcut7I+JWWVKBG xTWHRtempDue2F4vbdTphniZ/YlNZ5Grr+LL/YUGvoQqlxZJYdaiG0p35fSHHBzdvQa4 hUQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=BhkHHma6; spf=pass (google.com: domain of prvs=552b621e3=dwmw@amazon.com designates 52.95.49.90 as permitted sender) smtp.mailfrom=prvs=552b621e3=dwmw@amazon.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.uk Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=BhkHHma6; spf=pass (google.com: domain of prvs=552b621e3=dwmw@amazon.com designates 52.95.49.90 as permitted sender) smtp.mailfrom=prvs=552b621e3=dwmw@amazon.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.uk X-IronPort-AV: E=Sophos;i="5.46,390,1511827200"; d="scan'208";a="328376378" From: David Woodhouse To: arjan@linux.intel.com, tglx@linutronix.de, karahmed@amazon.de, x86@kernel.org, linux-kernel@vger.kernel.org, tim.c.chen@linux.intel.com, bp@alien8.de, peterz@infradead.org, pbonzini@redhat.com, ak@linux.intel.com, torvalds@linux-foundation.org, gregkh@linux-foundation.org Subject: [PATCH v2 3/8] x86/msr: Add definitions for new speculation control MSRs Date: Sun, 21 Jan 2018 09:49:04 +0000 Message-Id: <1516528149-9370-4-git-send-email-dwmw@amazon.co.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516528149-9370-1-git-send-email-dwmw@amazon.co.uk> References: <1516528149-9370-1-git-send-email-dwmw@amazon.co.uk> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590195051986587278?= X-GMAIL-MSGID: =?utf-8?q?1590195051986587278?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- arch/x86/include/asm/msr-index.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index fa11fb1..3e50463 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -42,6 +42,13 @@ #define MSR_PPIN_CTL 0x0000004e #define MSR_PPIN 0x0000004f +#define MSR_IA32_SPEC_CTRL 0x00000048 /* Speculation Control */ +#define SPEC_CTRL_IBRS (1 << 0) /* Indirect Branch Restricted Speculation */ +#define SPEC_CTRL_STIBP (1 << 1) /* Single Thread Indirect Branch Predictors */ + +#define MSR_IA32_PRED_CMD 0x00000049 /* Prediction Command */ +#define PRED_CMD_IBPB (1 << 0) /* Indirect Branch Prediction Barrier */ + #define MSR_IA32_PERFCTR0 0x000000c1 #define MSR_IA32_PERFCTR1 0x000000c2 #define MSR_FSB_FREQ 0x000000cd @@ -60,6 +67,10 @@ #define MSR_IA32_BBL_CR_CTL 0x00000119 #define MSR_IA32_BBL_CR_CTL3 0x0000011e +#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_SYSENTER_CS 0x00000174 #define MSR_IA32_SYSENTER_ESP 0x00000175 #define MSR_IA32_SYSENTER_EIP 0x00000176 -- 2.7.4