Received: by 10.223.176.46 with SMTP id f43csp994880wra; Wed, 24 Jan 2018 09:00:56 -0800 (PST) X-Google-Smtp-Source: AH8x225VfjLmj+8uyuMeKRWKPgtSH0sKZ9QB2pZXMdDMiMFpWjaC62RvuFKW7H+QDst2fl+LuZo9 X-Received: by 2002:a17:902:bd8e:: with SMTP id q14-v6mr3679320pls.123.1516813255990; Wed, 24 Jan 2018 09:00:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516813255; cv=none; d=google.com; s=arc-20160816; b=loPPk8taZL0/zjF1W/O37a3HIy4EGBYpJvxVnSZInog6OvAdr2c8JD/a6WSHiA6nwp zr/IK5CTuTHXg33yBKt45NIT8qY+Mq6S1KPKPwlcSjq+XpT7S0t5SnFbVx+qK12p4+nV 2Q+733DBg3sisl6SdN2Q5L1yE9gEZL+wZbiQn7vHPR9hkdB9J9NENJhT3fVgIzaXx3tU 5+5VvNYxCscaQe+q8Js9ueHTqJsClcQn3zO7B9zzd3U3fIri7QGYzsUitxOjdhMQVVpT RTvBFhkQy4AVBODjKahc3Z2U0uYiGqqL4URGsPAp7l64UhiowKgyBQqr6UcUrZc37J7h 36VA== 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=r3Gp1ZPks7fw0NDaYuxgFrT285OeS9gYBw+Qz2aWxw4=; b=CY+dIyp/EG8W41LS3U0r58pTKhd9xZifTh43zaIwR5IRYprxk3kT1DtlxtNQR4XJE0 GvlJLhVTUnWeKHY1H9I2lYoKn0NxO0SrGs5kFYyYSj6xo4EZM5Z62ofnTSbMHLnbkd32 VdS9Q+nLdTGcRnMgFMKUWhfX8moVv8ELub9/lOS7U5kVjMg54oFqSWDAoh5IovMgcK1/ 7APApKmKxW2FNo4wiiNangVLoFV4diztPTs/ymZn+JAqK9kWP7+JHtYMzlp6yLjE0VVu 5OryioKSLXdgSUREWUmcLk9tCZ4Weq5osLX8QmRPK60ewD4O3mfn23AiZ249GBpQwUUW bXSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=A1jvYXBz; 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 f19-v6si445341plj.502.2018.01.24.09.00.41; Wed, 24 Jan 2018 09:00:55 -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=A1jvYXBz; 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 S934435AbeAXQ6f (ORCPT + 99 others); Wed, 24 Jan 2018 11:58:35 -0500 Received: from smtp-fw-33001.amazon.com ([207.171.190.10]:3141 "EHLO smtp-fw-33001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934340AbeAXQ6c (ORCPT ); Wed, 24 Jan 2018 11:58:32 -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=1516813112; x=1548349112; h=from:to:subject:date:message-id:in-reply-to:references; bh=r3Gp1ZPks7fw0NDaYuxgFrT285OeS9gYBw+Qz2aWxw4=; b=A1jvYXBzhe94CUkrXU/ZdU6I9mQgf+oBchqV2I4KjH2FflOmjjZ50xNS 3cEhj8zZIMuFf+aXWce6N0SsldlX3qURWaiFoziADEVTeuPH7FvEsBPjo 7fig3SxAUoUvoj6Y0+cusFH7hbJ0Sxml5N8wX5VjoUGhrJzLfrxkk9zqX s=; X-IronPort-AV: E=Sophos;i="5.46,408,1511827200"; d="scan'208";a="716958679" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1a-16acd5e0.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 24 Jan 2018 16:57:32 +0000 Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (iad1-ws-svc-lb91-vlan2.amazon.com [10.0.103.146]) by email-inbound-relay-1a-16acd5e0.us-east-1.amazon.com (8.14.7/8.14.7) with ESMTP id w0OGvIoB038288 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 24 Jan 2018 16:57:20 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 w0OGvH7e011178; Wed, 24 Jan 2018 16:57:17 GMT Received: (from dwmw@localhost) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Submit) id w0OGvGO4011177; Wed, 24 Jan 2018 16:57:16 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 Subject: [PATCH v3 3/6] x86/cpufeatures: Add AMD feature bits for Speculation Control Date: Wed, 24 Jan 2018 16:57:02 +0000 Message-Id: <1516813025-10794-4-git-send-email-dwmw@amazon.co.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516813025-10794-1-git-send-email-dwmw@amazon.co.uk> References: <1516813025-10794-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 --- 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