From patchwork Thu Oct 3 14:25:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11172749 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4378815AB for ; Thu, 3 Oct 2019 14:27:22 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FBC821783 for ; Thu, 3 Oct 2019 14:27:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="dwb/0o24" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FBC821783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iG23M-0007J8-HX; Thu, 03 Oct 2019 14:26:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iG23L-0007J3-4D for xen-devel@lists.xenproject.org; Thu, 03 Oct 2019 14:25:59 +0000 X-Inumbo-ID: b704f19c-e5e9-11e9-9bee-bc764e2007e4 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b704f19c-e5e9-11e9-9bee-bc764e2007e4; Thu, 03 Oct 2019 14:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570112757; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=awPnh9Uqk+60nTpp7Xb+4vIJ6IYShBEhQ5MIOa6nqmU=; b=dwb/0o24B+vVxUtBet3Ejz3NqrvBBzC1M4meNfRY3MgLtcdRGzqg0Wzh HlOdCsC1rABxtgVULDfyxizmfDSHqbbIDX4PaOLQ6pBGk5OaEWos3171n y2P4gnoTG17J4E9okEYSzcjUoL2rOox7VyBPhEm/XyopQv38oyqusP+b2 0=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 6P8mQPUeGd3NXml685AXPr5gDH1Nl4xdUmjTBNZN3eBr2/I1zDbUdarv1m7XYyS1Ose3fO6gWz rq3v87n4RPYx7P4Hz9lkksUGwwza5BHH+2Ap/oXhYMUD4ioBzO70H0i1Hye8XJeMis5JTktwfU R7hm5d2jj+sDOaF8ASzj3GXJFwnOylFj3NtUv7Mbfu/s7p6pmkubpPncAXdt5c4UXmpprFzclH RHVaIMfCPAEaqvA0se9ISFsNvsmhHC17hP6Lgz/ncUTEJrTDQ2Lw/oAHjzHqFqRqbbRGtBOyxX OEI= X-SBRS: 2.7 X-MesageID: 6718917 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,252,1566878400"; d="scan'208";a="6718917" From: Andrew Cooper To: Xen-devel Date: Thu, 3 Oct 2019 15:25:44 +0100 Message-ID: <20191003142544.16323-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13] x86/spec-ctrl: Annotate remaining model names X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The names in retpoline_safe() are copied from should_use_eager_fpu(). The names in mds_calculations() come partly from Linux's intel-family.h, and partly from conversations with Intel. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné CC: Juergen Gross Only comment changes. 0 risk for 4.13 --- xen/arch/x86/spec_ctrl.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 4761be81bd..731d5a767b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -505,13 +505,13 @@ static bool __init retpoline_safe(uint64_t caps) /* * Skylake, Kabylake and Cannonlake processors are not retpoline-safe. */ - case 0x4e: - case 0x55: - case 0x5e: - case 0x66: - case 0x67: - case 0x8e: - case 0x9e: + case 0x4e: /* Skylake M */ + case 0x55: /* Skylake X */ + case 0x5e: /* Skylake D */ + case 0x66: /* Cannonlake */ + case 0x67: /* Cannonlake? */ + case 0x8e: /* Kabylake M */ + case 0x9e: /* Kabylake D */ return false; /* @@ -842,10 +842,10 @@ static __init void mds_calculations(uint64_t caps) case 0x4c: /* Cherrytrail / Brasswell */ case 0x4d: /* Avaton / Rangely (Silvermont) */ case 0x5a: /* Moorefield */ - case 0x5d: - case 0x65: - case 0x6e: - case 0x75: + case 0x5d: /* SoFIA 3G Granite/ES2.1 */ + case 0x65: /* SoFIA LTE AOSP */ + case 0x6e: /* Cougar Mountain */ + case 0x75: /* Lightning Mountain */ /* * Knights processors (which are based on the Silvermont/Airmont * microarchitecture) are similarly only affected by the Store Buffer