Received: by 10.223.176.46 with SMTP id f43csp4399874wra; Tue, 23 Jan 2018 08:54:57 -0800 (PST) X-Google-Smtp-Source: AH8x224ixS6uct9OKSbVCW7znVyfnnTo7T97U4QLkzq1/VWntHrYGLeGX4FTDzrH2hvocQBugHYs X-Received: by 10.107.11.105 with SMTP id v102mr4438606ioi.272.1516726497207; Tue, 23 Jan 2018 08:54:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516726497; cv=none; d=google.com; s=arc-20160816; b=H/BTMwU1ln9Vk5NJFCl59zIpD5A/SRliZKoMxNeyuBczNSmz6bwBowZN2sSpRZltQw 7myeCdRB1LchbNKJGQU8cRSsUPVfMb4lSiEe4iGUxLgH/xYHqvTWyucSV6VNLODrT1/7 6+01dUwxrI7m7WAUwIeH3DvLSmO21OIcCPdgFUzA1TdG3aFmJcMhWJIdC6tpU6m5oG4k hUy16M5qmK/+Qn3rb2nhBPqrjbv8lP9qmeIFWwU+J6jG0BYkQpuALD7gs0JqtxSDKVpK ppjDfYPSFqLpz7h7RU5XWJPU59B8mWc6Xe1YjNaaQMaZgStTynxm9icDd6pWKqQjGBt/ EIzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:arc-authentication-results; bh=QzxX/fmA7Ox19vMPzEaCo8YU1h7cNZtMdXNIG5z+S7w=; b=QXZ9D8P7yQhlteCNuISl4WSZRxDJlB0C122exu6mHntJYn6XYjbfBBHsuVtf10Tl89 aE8RkvK9pcwB2q0J+RoQq6T9bN0gwEdZYZPn21+SVt+X8nh5cLe0hUYwQA5gmNZzUij5 5qhLgUJsLLyGXs9b6PWb5ZaLNK9/OJ2U79qo6ekUe1T9cIkA4XFOsN2pecRj90j0pRDi tB9Z0jiD4luBGDtC2xSSPvVargSvba6oyUvGCDm9hkTIoiJ29/MbVHYM1TTIOl4zEdfK qM5xGvGcb+xZ1ADPe5S5BhsEo6iNMmUgVlm1mOhTE9c+soWEQ7FXRaebUZrLl2yIfYFr 6tyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=fPBaVEW4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.uk Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 98si15742074iok.197.2018.01.23.08.54.44; Tue, 23 Jan 2018 08:54:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=fPBaVEW4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751895AbeAWQxp (ORCPT + 99 others); Tue, 23 Jan 2018 11:53:45 -0500 Received: from smtp-fw-33001.amazon.com ([207.171.190.10]:2935 "EHLO smtp-fw-33001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751401AbeAWQxn (ORCPT ); Tue, 23 Jan 2018 11:53:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazon201209; t=1516726423; x=1548262423; h=from:to:subject:date:message-id:in-reply-to:references; bh=QzxX/fmA7Ox19vMPzEaCo8YU1h7cNZtMdXNIG5z+S7w=; b=fPBaVEW4ekLS1HY6Fdbmc1Z4nI4h3Khut9CB9REDX+U/XkFjTF4ajaM4 sCKoa4+EPWCOxesCHwjT0R1h9V0yetTE2Z/ad+802aRk+g1JBYw+9bmGL sc104nR1+sIsKJnI04xGmM4f2kikKu0I4YzT2wCx+kp/KmHYScJ7Squ5E 8=; X-IronPort-AV: E=Sophos;i="5.46,402,1511827200"; d="scan'208";a="716825781" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-2b-a7fdc47a.us-west-2.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 23 Jan 2018 16:53:22 +0000 Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (pdx2-ws-svc-lb17-vlan3.amazon.com [10.247.140.70]) by email-inbound-relay-2b-a7fdc47a.us-west-2.amazon.com (8.14.7/8.14.7) with ESMTP id w0NGrCUs052050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 23 Jan 2018 16:53:14 GMT Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (localhost [127.0.0.1]) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Debian-3) with ESMTP id w0NGrAC2025581; Tue, 23 Jan 2018 16:53:10 GMT Received: (from dwmw@localhost) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Submit) id w0NGr9Nj025579; Tue, 23 Jan 2018 16:53:09 GMT 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, thomas.lendacky@amd.com Subject: [PATCH v2 3/5] x86/cpufeatures: Add AMD feature bits for Speculation Control Date: Tue, 23 Jan 2018 16:52:53 +0000 Message-Id: <1516726375-25168-4-git-send-email-dwmw@amazon.co.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516726375-25168-1-git-send-email-dwmw@amazon.co.uk> References: <1516726375-25168-1-git-send-email-dwmw@amazon.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org AMD exposes the PRED_CMD/SPEC_CTRL MSRs slightly differently to Intel. Documented at https://lkml.org/lkml/2018/1/21/112 Signed-off-by: David Woodhouse --- arch/x86/include/asm/cpufeatures.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 0a51070..ae3212f 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -269,6 +269,9 @@ #define X86_FEATURE_CLZERO (13*32+ 0) /* CLZERO instruction */ #define X86_FEATURE_IRPERF (13*32+ 1) /* Instructions Retired Count */ #define X86_FEATURE_XSAVEERPTR (13*32+ 2) /* Always save/restore FP error pointers */ +#define X86_FEATURE_AMD_PRED_CMD (13*32+12) /* Prediction Command MSR (AMD) */ +#define X86_FEATURE_AMD_SPEC_CTRL (13*32+14) /* Speculation Control MSR only (AMD) */ +#define X86_FEATURE_AMD_STIBP (13*32+15) /* Single Thread Indirect Branch Predictors (AMD) */ /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */ #define X86_FEATURE_DTHERM (14*32+ 0) /* Digital Thermal Sensor */ -- 2.7.4