Received: by 10.223.176.46 with SMTP id f43csp1885684wra; Thu, 25 Jan 2018 01:27:28 -0800 (PST) X-Google-Smtp-Source: AH8x2252Ktc/JJYEvrg9iMI+g9TsNPHkQxWqPIUjlWT0Op0cLzSLTOcUmcBDtbJSnTEM4kv9VPZr X-Received: by 10.99.116.20 with SMTP id p20mr13164748pgc.340.1516872447939; Thu, 25 Jan 2018 01:27:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516872447; cv=none; d=google.com; s=arc-20160816; b=jaiUI9rHegKsy9W8gZtLsQsJc1ESYNhTZvqo1NpzdKyVKJwYubM6qwUZfxhKk7Yjqc gt+nRyuQZEGLU8CePeMwzTRn7a+RrOFBWDt7WXXrzt+LBmMjFFntO21suO+t2ObA6sCo hN18QKRymcWh7T2a76qHtdlbbR+t5DFSZ0jTSwx8nEukkWd2wAXV4UlYiAE5ZGHlRvUN bqB0eEu4/opMPPzbgWVvLzF1yrOfMIyHR1dh7iVWM+KZ1FHlMnfTw4v6d5V3ilx7VuO9 svTuqMFtrR01+Bwz0mqAzUs5so7vU9z0Dvm+KlHOor3wj9U8pb6URsmxNqz8E+xI4d5V pg8A== 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=UQefEbeZWKCYtKjJiC8eJG8fG3g7a41lg92aYFY0K5S/5CR2HvLk2tD8+yq3eaQpTo ruuRuwM7Gq0zxMoGzhWySMD0qWrpAfOWYxvYnAqHw1dirzSW+Chfc5N9SondPDanVvmJ 20Qg+kRhYj6+SLodN2g4uJ8UwSBOhHLGc8cRxewaGANzR5gfi1l//BKtTtf4MIbSiX4E LRLrrLVXEN0plhq2DlNEEHzmeacy0lB0mwo2Xo/+XR2DibbJpVbFFhXQbAdAhDF9xvYb L+C/qoVi5VTAlqlbeJy+4NJ+50Yg8woeaLwB7+L/pelmUWVa7OXi9ZxGiTp2O7gRATVP R7vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=vOQ71fDa; 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 a5-v6si1669756plp.416.2018.01.25.01.27.14; Thu, 25 Jan 2018 01:27:27 -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=vOQ71fDa; 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 S1751608AbeAYJ0G (ORCPT + 99 others); Thu, 25 Jan 2018 04:26:06 -0500 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:48192 "EHLO smtp-fw-9102.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751538AbeAYJXx (ORCPT ); Thu, 25 Jan 2018 04:23:53 -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=1516872233; x=1548408233; h=from:to:subject:date:message-id:in-reply-to:references; bh=C4k0L+16qv9f8gu34YJZS5nqCBs+ElTbJMSmTxfZrzg=; b=vOQ71fDaSzrsqbUZ+f6689JO0CMiJD0UyEr7ICA0xN878Bq9+ebiaCjQ eCQpUM3VkX0PPSpncyJMZ5mOzQrht1sjxulav+7pxuKi9a4tq4QXSAKTP Pbe3S8f7l430Oj93c2CR72YA2OB0h5+T+Xcjkri6b9/6OGOi/Sqbf7ZOu c=; X-IronPort-AV: E=Sophos;i="5.46,411,1511827200"; d="scan'208";a="589777988" Received: from sea3-co-svc-lb6-vlan3.sea.amazon.com (HELO email-inbound-relay-2c-397e131e.us-west-2.amazon.com) ([10.47.22.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Jan 2018 09:23:52 +0000 Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (pdx2-ws-svc-lb17-vlan2.amazon.com [10.247.140.66]) by email-inbound-relay-2c-397e131e.us-west-2.amazon.com (8.14.7/8.14.7) with ESMTP id w0P9NicG128583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Jan 2018 09:23:47 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 w0P9NaRU017491; Thu, 25 Jan 2018 09:23:36 GMT Received: (from dwmw@localhost) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Submit) id w0P9NYc0017489; Thu, 25 Jan 2018 09:23:34 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 v4 3/7] x86/cpufeatures: Add AMD feature bits for Speculation Control Date: Thu, 25 Jan 2018 09:23:05 +0000 Message-Id: <1516872189-16577-4-git-send-email-dwmw@amazon.co.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516872189-16577-1-git-send-email-dwmw@amazon.co.uk> References: <1516872189-16577-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