Received: by 10.223.176.46 with SMTP id f43csp2329802wra; Thu, 25 Jan 2018 08:15:31 -0800 (PST) X-Google-Smtp-Source: AH8x224R7TTWQJ/L5rYtia8gUfNI74DOhH9g1N3U5Cff/K6HD0eUtwugnvF0DVJH0Jtuw1A0QeUR X-Received: by 10.101.80.69 with SMTP id k5mr2704799pgo.425.1516896931008; Thu, 25 Jan 2018 08:15:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516896931; cv=none; d=google.com; s=arc-20160816; b=LBpbrNuGf3VgkgwO6D73e+tSepNSTbZqt44I15rZBlpAqgM42pBVWL+4AxzO/3n1r1 6WbmXeKd3toTaxS7Y9KDGG7adzSJHDTAzMZQpaK5yAfTpqsbuCIjWB6MjYEug9aHcagu vL6smrWHzukljebo9VoO1wnPcOZU0/BkmOt54AdabpOlrfSHbmEjAthHi1QzjFY2HOC5 diROziNs9AZHTJQlhYjQI9/lXCs6emqSQOx8o6w1eNUphAV5hGcq4uQqQqoBATI/TS4v fWZhi9fHfVgt0KEdBrGUL9N8LkAfKmeNaEdQcqQSd/RopAwxpZj6u3wrUNeTALHwtTaI TeZQ== 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=C4k0L+16qv9f8gu34YJZS5nqCBs+ElTbJMSmTxfZrzg=; b=FT1V5BALyVIeSovapeCzGtuuvptdMchPuc9I1DDsQjgLCyptv2xDpE6KoxMu+4mmqB piWBaeZMIOZ71L1JhhlhqE7gh7mN2YHs+ImhjRPtrXrnBvF6wnL+yX6W45FOeRGgxtFP GetShPzitS+Iag6BRaegPs1Umg7vUqRbC46ZGpPH4H1s2edijJDXoB6dg+xo9x+miS+F 2FTcOEV1KW+gg5PR9RdPrilr/C0lUNwwR8MfpRVjseE500WrBgTUa0cqlN9Rr0r7o9lx tKecv/upw+8oy/QCbvw7dP8DMQzBd/WUugHb8klUAyzFYEbClJxLzHdWk5VTfRmdg9Ry et8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=Q8iz5q9b; 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 e12-v6si1179437plj.600.2018.01.25.08.15.16; Thu, 25 Jan 2018 08:15:30 -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=Q8iz5q9b; 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 S1751321AbeAYQOo (ORCPT + 99 others); Thu, 25 Jan 2018 11:14:44 -0500 Received: from smtp-fw-4101.amazon.com ([72.21.198.25]:43462 "EHLO smtp-fw-4101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992AbeAYQOk (ORCPT ); Thu, 25 Jan 2018 11:14:40 -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=1516896880; x=1548432880; h=from:to:subject:date:message-id:in-reply-to:references; bh=C4k0L+16qv9f8gu34YJZS5nqCBs+ElTbJMSmTxfZrzg=; b=Q8iz5q9bj3I+tCcfulfRIsocfuQ/kGqQynRjhOH2DV9ENWmeq4qHw2Nc 9BfJMt/SXneTfNrp9vdskdUC498JWw0sjnsd3WpOrCyyE+ZoTe38Im+DS SBQYrhyQ9Em4uGJBJc3HwLOCrx4Znt7vhR+IcpiDgWS7WuuPzHs0EMXXU w=; X-IronPort-AV: E=Sophos;i="5.46,412,1511827200"; d="scan'208";a="705292092" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-af6a10df.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Jan 2018 16:14:40 +0000 Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (iad1-ws-svc-lb91-vlan3.amazon.com [10.0.103.150]) by email-inbound-relay-1a-af6a10df.us-east-1.amazon.com (8.14.7/8.14.7) with ESMTP id w0PGEU5A006872 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Jan 2018 16:14:32 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 w0PGES3N008055; Thu, 25 Jan 2018 16:14:28 GMT Received: (from dwmw@localhost) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Submit) id w0PGERcv008049; Thu, 25 Jan 2018 16:14:27 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, dave.hansen@intel.com, gnomes@lxorguk.ukuu.org.uk, ashok.raj@intel.com, mingo@kernel.org Subject: [PATCH v5 3/7] x86/cpufeatures: Add AMD feature bits for Speculation Control Date: Thu, 25 Jan 2018 16:14:11 +0000 Message-Id: <1516896855-7642-4-git-send-email-dwmw@amazon.co.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516896855-7642-1-git-send-email-dwmw@amazon.co.uk> References: <1516896855-7642-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. See http://lkml.kernel.org/r/2b3e25cc-286d-8bd0-aeaf-9ac4aae39de8@amd.com Signed-off-by: David Woodhouse Reviewed-by: Greg Kroah-Hartman --- 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