Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C551C433E0 for ; Fri, 5 Jun 2020 07:51:31 +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 45B2F206E6 for ; Fri, 5 Jun 2020 07:51:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45B2F206E6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass 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.92) (envelope-from ) id 1jh78L-0001Ca-DX; Fri, 05 Jun 2020 07:51:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jh78J-0001CQ-TB for xen-devel@lists.xenproject.org; Fri, 05 Jun 2020 07:51:19 +0000 X-Inumbo-ID: 555ba286-a701-11ea-af7f-12813bfff9fa Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 555ba286-a701-11ea-af7f-12813bfff9fa; Fri, 05 Jun 2020 07:51:16 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7B094AB7D; Fri, 5 Jun 2020 07:51:18 +0000 (UTC) To: "xen-devel@lists.xenproject.org" From: Jan Beulich Subject: [PATCH] x86/Intel: insert Ice Lake and Comet Lake model numbers Message-ID: Date: Fri, 5 Jun 2020 09:51:09 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Paul Durrant , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Both match prior generation processors as far as LBR and C-state MSRs go (SDM rev 072) as well as applicability of the if_pschange_mc erratum (recent spec updates). Signed-off-by: Jan Beulich --- Such changes having been subject to backporting in the past, this change may want considering for 4.14. --- I'm leaving alone spec_ctrl.c, albeit there's a scary looking erratum for Ice Lake indicating that MDS_NO may wrongly be set. But this is apparently addressed by ucode update, so we may not need to deal with it in software. --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -180,9 +180,15 @@ static void do_get_hw_residencies(void * case 0x4E: case 0x55: case 0x5E: + /* Ice Lake */ + case 0x7D: + case 0x7E: /* Kaby Lake */ case 0x8E: case 0x9E: + /* Comet Lake */ + case 0xA5: + case 0xA6: GET_PC2_RES(hw_res->pc2); GET_CC7_RES(hw_res->cc7); /* fall through */ --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2438,8 +2438,12 @@ static bool __init has_if_pschange_mc(vo case 0x4e: /* Skylake M */ case 0x5e: /* Skylake D */ case 0x55: /* Skylake-X / Cascade Lake */ + case 0x7d: /* Ice Lake */ + case 0x7e: /* Ice Lake */ case 0x8e: /* Kaby / Coffee / Whiskey Lake M */ case 0x9e: /* Kaby / Coffee / Whiskey Lake D */ + case 0xa5: /* Comet Lake H/S */ + case 0xa6: /* Comet Lake U */ return true; /* @@ -2781,10 +2785,14 @@ static const struct lbr_info *last_branc case 0x66: /* Goldmont Plus */ case 0x7a: + /* Ice Lake */ + case 0x7d: case 0x7e: /* Tremont */ case 0x86: /* Kaby Lake */ case 0x8e: case 0x9e: + /* Comet Lake */ + case 0xa5: case 0xa6: return sk_lbr; /* Atom */ case 0x1c: case 0x26: case 0x27: case 0x35: case 0x36: