From patchwork Tue Oct 19 07:07:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12568775 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5325C433F5 for ; Tue, 19 Oct 2021 07:07:55 +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 5F02561264 for ; Tue, 19 Oct 2021 07:07:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5F02561264 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.212797.370813 (Exim 4.92) (envelope-from ) id 1mcjDv-0005hX-58; Tue, 19 Oct 2021 07:07:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212797.370813; Tue, 19 Oct 2021 07:07:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcjDv-0005hQ-1x; Tue, 19 Oct 2021 07:07:47 +0000 Received: by outflank-mailman (input) for mailman id 212797; Tue, 19 Oct 2021 07:07:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcjDt-0005hI-FZ for xen-devel@lists.xenproject.org; Tue, 19 Oct 2021 07:07:45 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bc409989-b4cd-49f0-b490-c1d62260e4fb; Tue, 19 Oct 2021 07:07:44 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2106.outbound.protection.outlook.com [104.47.18.106]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-24-z47IlcbzMImtJOKQMPbZDg-1; Tue, 19 Oct 2021 09:07:42 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB6861.eurprd04.prod.outlook.com (2603:10a6:803:13c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Tue, 19 Oct 2021 07:07:41 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4608.018; Tue, 19 Oct 2021 07:07:41 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR0201CA0015.eurprd02.prod.outlook.com (2603:10a6:203:3d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 07:07:41 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bc409989-b4cd-49f0-b490-c1d62260e4fb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634627263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2z360L9um9kv6KI2fQQvUHzI9KCJe9yeHC5hFK8unxY=; b=jqko8vRBtlTAE8XcEqCGNatojP79Zzb7bp0zP0YV1wnPYpFaDunjQP7Sqf57QCul3VSUoS 1xr2lPUWR9omV1RYXRR7MmILHLAuTk3l8xEpEh0QKfDzoxSuZcwMTIRr/0X/sfDgI6nqBa 1thvisKalcUViXRA7iREWSUrGgOgudQ= X-MC-Unique: z47IlcbzMImtJOKQMPbZDg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ka9FAXPddY2etMqWqvrRcY/LMIlTXW2VnoTuW8kSaR2Mu3NfwbrZg18I3kApYItMYHDPMVR34OWf6HOn5AAmf8dxKpjQ3Qmc3iVNNhFDlv56AEPDpdVDg6Ry32DeU9ImM24uo81kdDFVv/osNI5V08SD7Ga22nU7GWwHjXIOgoC28QhaNDXTttnwwjj0mM9lkaXbQ1KpkU8+4SYoz9Wfchcbq2//JDcHkJVpIfqYAliWffOM+3KcV0A9TxLoDTZIBtlT3DJt33lZjDsq4j6glwkqwaxN2xsu88/golTdAd5tytoEyTI5y+xq97mLcFsJkgLhYlLBhoh8gZXuWaWupg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2z360L9um9kv6KI2fQQvUHzI9KCJe9yeHC5hFK8unxY=; b=Y+4Oa9Do/D8Qf4vbSC5xtLwIv7kBpjS2hBpLtaegty1owgyxteGKoJgvwYHPbNhwitUEJ5OB64WOLz7SIjSEPKU9N0V4qh5yGGaqTN3dNoLgHUD22SDXATxhW/6KHzZbqauC+xzTCpxytuhNNCNQk6z7kCgHMk7V/WJA/YM/8utBKONUnVwMz4pSoSsh8vvCYbcJ8JeCD6aEVrSSr7VzqRduGFcvpSwicg+3aVZZpXtmcYVqaFPuTXXQN+obaf+edI1U1FHfS3iz7KEBwn84NB0yBfHrmiPoKUtJIllpBoz/8wBwCL7K8VPd5qagjFPFNrvZsFtrHBZh7c9cgvvTUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 1/2] x86/hpet: Use another crystalball to evaluate HPET usability From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <9963c7a2-f880-66fc-8f12-b1ddd0619c91@suse.com> Message-ID: Date: Tue, 19 Oct 2021 09:07:39 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 In-Reply-To: <9963c7a2-f880-66fc-8f12-b1ddd0619c91@suse.com> Content-Language: en-US X-ClientProxiedBy: AM5PR0201CA0015.eurprd02.prod.outlook.com (2603:10a6:203:3d::25) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5484f71e-84e3-45e3-72de-08d992cf2449 X-MS-TrafficTypeDiagnostic: VI1PR04MB6861: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T9DtYz6Iaktmpg0NJhLXptTRizHfhY9sVvacihpmuPq3tq0WKrBQAKvqfvXMkc9z1m16JrueVruM5ptPj77wzWS4C53DSMIMFbKCDNkLAlnI2mQZjKxy0kfl256lmQk3+0pUgtXTHfDZX979cIPE2iumOWdOjuPYrtAeXVgp6XsGnmgC0oc5RJtsTAxCWBKbm6wk2rGpJUao++PoT5StlPgLlTdLysgbbnKQQ/0E92Tyw2LUjKerVjxA/eSOSO6MX/g2f0L3QsMjSq7XabKkNhBKF6osYeUwx5GwxX0cJavzKvt7fGb9eAIQttv4dAXoWae1OYXM6zHs4izZ0eS9PdCLOHHmg4ZT41235hJPHZefQlqQk0XaBL0rnW1Oj7d6fBvrBzNVYFy5mauz0PG5lGwXMXdS89BOvvO/J2g9lc+bgMB3B3GYlv2DVNDCOPlNBFFg+BA0tBWVWY+EZVaUGO2hdefS8o8KFBMv10UZvlvw4YlY9gEX1sdMJ+SAXGd41ap0CZwdxz2BFTthq1SI6ztHjSf7ecJ8Hp3eaWr5mlTMsN1jhqu5VCFUluxcCgxk+FtMvkD+NNKTrX0M+9hIwW+rcZeuFRI5xhDKyayH32GG4hWoBS7iHZjc1NS6RcTwIU3WjkIS05otLPyc0NEdNTWp9F54TamAmJqrYrKULrq1pJLLnsCqNXcqOQm/N+xO6kNgT2bdwYmDJLIOg6MjRU5DXHpDPgH8Rfpv8D7PkT5gwWbaBe2Ane+2iPkTI786 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(508600001)(86362001)(8936002)(66476007)(16576012)(36756003)(66946007)(66556008)(38100700002)(956004)(31686004)(2906002)(26005)(83380400001)(316002)(186003)(31696002)(6916009)(6486002)(2616005)(54906003)(8676002)(4326008)(5660300002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3gFBGOh3ee+NgfJN6Z4H0K3lpBYa?= =?utf-8?q?SaZ+5ufOxqF9LB0Xb91lsrjAf40E86A0Htk7dT3yfwuBnRDBcOiUyvC8XrfBRUP3c?= =?utf-8?q?ONwtYuRV8ErUCqNndglYNmLB60PYtHUQDHY7miWT3Yu65p99l2jgRuBxkrnCY3Vqe?= =?utf-8?q?taYUB0A57r1DaeeTJSP+d/tsRg8GJdnrtOzXRa37VXdYP4Ba2VoJfqt44zLOPX4IA?= =?utf-8?q?eubuz7KTLEBOImNAFHrX5fnDwdsJcMMANnLMOpX7kQ+AnWNJhtd5BausscbCRFg0r?= =?utf-8?q?puYoLo2DOWnL7eMArTK1/2O6c7ofmWeukserJyOv6LFWN2rvr5pr0b8AHcG5HYadA?= =?utf-8?q?IwSpCsNxS9Fy4sfwR9i9Y+Gx9/fabjcwjk8XuupGMdo1VYwSzBD594LgTLjN5WbS+?= =?utf-8?q?jm7ieAxCvim4D4ic56nLas+1UiQu3jLKGry0TXVydFgtXNUpflLb4RxZWDyanSXGo?= =?utf-8?q?oBypRu+0mv7nv4f1Thaa94R42oAfTIFGFdhFD7cAyDzLfpmn1HBcHiRUQdggEHYPf?= =?utf-8?q?VVbUF+C5RpHIcOEsIzldyGypNtoyxvNTXKSC2eiwsAXOODJS/M7bQv750Yvq0p9ga?= =?utf-8?q?4/r+AgFALVJvAMAZRw4b2fplIqgePIoCyQ2gq6E/x7/K01lK2BOmqkFBgD0k5CUEu?= =?utf-8?q?9pVjNLQzknxHcA24U5Eft8Rv8AGitT0x9KgMe9Y70YO2NT6mfo9n7DBo/d4jD0u9d?= =?utf-8?q?I2F74n2aakNXcDM4Z88DNC6xxcT+0Nh3mHt93vAJxdRqZOLekh1dr37UzJjEY6uGy?= =?utf-8?q?CN2I7+QCauz9hiW8VotiCYvI7CcBVVQ/V9DBpsSYp4XY8PQ3JJ0mdgsUDGLgeoQ0i?= =?utf-8?q?+lRlU/G7+hb3DkI7zOZeIfs86vyqk5A0kSL/q3snAmtMv3z4kXEG3UuDS/bWtCOGo?= =?utf-8?q?lPvsZAWbazuj2Vin1qOaT0KlsHXTXK2oMVjDzhZOmTiTwYb04eivrCgv5bkHSk+iS?= =?utf-8?q?Tnvs2HrzZvmUSt9WDCvSVfqtdRuptDOoIzJ9nrBeIfLUK1xL2LNW/HcHhc69toij6?= =?utf-8?q?+GUSynK8WCy7FwsP7iM/9jhkB0UTF6TGiGw9s+XJnvSyUYWAo88kC1fulEyiVBsRb?= =?utf-8?q?5N0aJCFUfQ70HAPbxFjzeOqyyaVkmhAOcdZJCs93J1fa1U3ZlvbO176BdWKFrlhhN?= =?utf-8?q?5Sntp8Qgvr3xkzi4UVA3upwMVBuWT1s4HxAVx1BZhDoh4DF0kGyLDPVmygHs8S2el?= =?utf-8?q?yg55GZ3O5szqzJExaHtaLemTS2wY9hoUhgEG2j2j1ZqZ7BmS3XYDYkNB/ZCgi3xiJ?= =?utf-8?q?PS7AsmH6evNRf+rU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5484f71e-84e3-45e3-72de-08d992cf2449 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 07:07:41.5534 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zi/aHSR4yXV0y7Zz54bM9PUYWsSI6K23SYPMDLCmqtQkzQBw7Ejd4xI6hWU6JiHf3U65OjjNRiIbjIxlcaDXBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6861 From: Thomas Gleixner On recent Intel systems the HPET stops working when the system reaches PC10 idle state. The approach of adding PCI ids to the early quirks to disable HPET on these systems is a whack a mole game which makes no sense. Check for PC10 instead and force disable HPET if supported. The check is overbroad as it does not take ACPI, mwait-idle enablement and command line parameters into account. That's fine as long as there is at least PMTIMER available to calibrate the TSC frequency. The decision can be overruled by adding "clocksource=hpet" on the Xen command line. Remove the related PCI quirks for affected Coffee Lake systems as they are not longer required. That should also cover all other systems, i.e. Ice Lake, Tiger Lake, and newer generations, which are most likely affected by this as well. Fixes: Yet another hardware trainwreck Reported-by: Jakub Kicinski Signed-off-by: Thomas Gleixner [Linux commit: 6e3cd95234dc1eda488f4f487c281bac8fef4d9b] I have to admit that the purpose of checking CPUID5_ECX_INTERRUPT_BREAK is unclear to me, but I didn't want to diverge in technical aspects from the Linux commit. In mwait_pc10_supported(), besides some cosmetic adjustments, avoid UB from shifting left a signed 4-bit constant by 28 bits. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- v2: Fully different replacement of "x86: avoid HPET use also on certain Coffee Lake H". --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -395,14 +396,43 @@ static int64_t __init init_hpet(struct p } /* - * Some Coffee Lake platforms have a skewed HPET timer once the SoCs - * entered PC10. + * Some Coffee Lake and later platforms have a skewed HPET timer once + * they entered PC10. + * + * Check whether the system supports PC10. If so force disable HPET as + * that stops counting in PC10. This check is overbroad as it does not + * take any of the following into account: + * + * - ACPI tables + * - Enablement of mwait-idle + * - Command line arguments which limit mwait-idle C-state support + * + * That's perfectly fine. HPET is a piece of hardware designed by + * committee and the only reasons why it is still in use on modern + * systems is the fact that it is impossible to reliably query TSC and + * CPU frequency via CPUID or firmware. + * + * If HPET is functional it is useful for calibrating TSC, but this can + * be done via PMTIMER as well which seems to be the last remaining + * timer on X86/INTEL platforms that has not been completely wreckaged + * by feature creep. + * + * In theory HPET support should be removed altogether, but there are + * older systems out there which depend on it because TSC and APIC timer + * are dysfunctional in deeper C-states. */ - if ( pci_conf_read16(PCI_SBDF(0, 0, 0, 0), - PCI_VENDOR_ID) == PCI_VENDOR_ID_INTEL && - pci_conf_read16(PCI_SBDF(0, 0, 0, 0), - PCI_DEVICE_ID) == 0x3ec4 ) - hpet_address = 0; + if ( mwait_pc10_supported() ) + { + uint64_t pcfg; + + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, pcfg); + if ( (pcfg & 0xf) < 8 ) + /* nothing */; + else if ( !strcmp(opt_clocksource, pts->id) ) + printk("HPET use requested via command line, but dysfunctional in PC10\n"); + else + hpet_address = 0; + } if ( !hpet_address ) printk("Disabling HPET for being unreliable\n"); --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -1308,3 +1308,20 @@ int __init mwait_idle_init(struct notifi return err; } + +/* Helper function for HPET. */ +bool __init mwait_pc10_supported(void) +{ + unsigned int ecx, edx, dummy; + + if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + !cpu_has_monitor || + boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) + return false; + + cpuid(CPUID_MWAIT_LEAF, &dummy, &dummy, &ecx, &edx); + + return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) && + (ecx & CPUID5_ECX_INTERRUPT_BREAK) && + (edx >> 28); +} --- a/xen/include/asm-x86/mwait.h +++ b/xen/include/asm-x86/mwait.h @@ -1,6 +1,8 @@ #ifndef __ASM_X86_MWAIT_H__ #define __ASM_X86_MWAIT_H__ +#include + #define MWAIT_SUBSTATE_MASK 0xf #define MWAIT_CSTATE_MASK 0xf #define MWAIT_SUBSTATE_SIZE 4 @@ -12,5 +14,6 @@ #define MWAIT_ECX_INTERRUPT_BREAK 0x1 void mwait_idle_with_hints(unsigned int eax, unsigned int ecx); +bool mwait_pc10_supported(void); #endif /* __ASM_X86_MWAIT_H__ */ From patchwork Tue Oct 19 07:08:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12568779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D675BC433EF for ; Tue, 19 Oct 2021 07:08:37 +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 8AE2760F57 for ; Tue, 19 Oct 2021 07:08:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8AE2760F57 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.212804.370824 (Exim 4.92) (envelope-from ) id 1mcjEb-0006Ib-E6; Tue, 19 Oct 2021 07:08:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212804.370824; Tue, 19 Oct 2021 07:08:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcjEb-0006IU-B6; Tue, 19 Oct 2021 07:08:29 +0000 Received: by outflank-mailman (input) for mailman id 212804; Tue, 19 Oct 2021 07:08:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcjEa-0006IH-2I for xen-devel@lists.xenproject.org; Tue, 19 Oct 2021 07:08:28 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id dfe17ab5-99b8-4b88-9497-cdc0a17bf1f5; Tue, 19 Oct 2021 07:08:27 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2054.outbound.protection.outlook.com [104.47.13.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-4-7Bpm2fIYOzGrys18EFooIg-1; Tue, 19 Oct 2021 09:08:25 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB6861.eurprd04.prod.outlook.com (2603:10a6:803:13c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Tue, 19 Oct 2021 07:08:24 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4608.018; Tue, 19 Oct 2021 07:08:24 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR0201CA0020.eurprd02.prod.outlook.com (2603:10a6:203:3d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Tue, 19 Oct 2021 07:08:23 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: dfe17ab5-99b8-4b88-9497-cdc0a17bf1f5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634627306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W9iDjP91x9uw6yyMgsmNw7ncw5R31osBpuVcl9P/JHo=; b=QfN91mYXz7p1zgkp+0sPUZSqjstHNMYSd16AfDiRmIN+bIVtwXpr8Q0tCwPugBPrW1vNwu uYqgX5wK3qKS+jssvyaiWhb81gKmuagKOi9KL5H9VkIrSEWLc/QUv1RaQ9aDmKnPtYbuvL br5AvF5WzTmMJzRHDHMPpZVTw+dj3BY= X-MC-Unique: 7Bpm2fIYOzGrys18EFooIg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NYmnxWmGXyMtV/gt4dO+u389Kx9vbr4SbyuQYKvRIdr8Ns8Cu35/UuhoG7PF9XwM+xrFMdtgs4bTjIiwh44miDxAwM1fn3CC9/etHUECSFL3ZOjiwk68IGUJzG/mMXf1CNykYpymDrrs/MTGDgy/nA8gjBjAtpkgi05HpAZ01WnGTdGIWtqUFF6p1zLsTdcSusxZjOv7XbvbqgzwnNro8SLIAfFGLc6XpWIjmojogO4fF/Cg2C6F6k486ojjyQYDo8NYJKzz6BGEPQaEAR938CmJbSECAIOepnj3ypsrSJgwl1JqrKDSql2tSl1p9ZujmRQqwFd47ilb2gp+dHqJKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W9iDjP91x9uw6yyMgsmNw7ncw5R31osBpuVcl9P/JHo=; b=aYqEd6ZkSZs8iUFYkyjzDx6wfV88uixGay4Gk1+OPuFweE1/17nn26jlPqeGwnB0BZ3c3HkTFfDNJTkA0IjN9MslCEzwcBHwFQFDYlwEe4f/mZeGxmWnfXvWWBkpMqkHYAVGAW6kb4ZxAYouYTy7x7HszOH5cARY3N+0akuHF7m0kQc7nH99H/SEdJfSdNO5SfX/kHx+E21cn9EHf55flF5cf9iSiWA65yz6HDkKRba96QSlk3k1+MMXY6PxdkCdxedR5hTAkvjxSbdAOFrgfHuEiwcsgNfNfADmVujjNIKChvnsGSdNO22caGHdEyX/1Yh+Fh5Mianb67qHNEvYcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 2/2] x86: de-duplicate MONITOR/MWAIT CPUID-related definitions From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <9963c7a2-f880-66fc-8f12-b1ddd0619c91@suse.com> Message-ID: Date: Tue, 19 Oct 2021 09:08:22 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 In-Reply-To: <9963c7a2-f880-66fc-8f12-b1ddd0619c91@suse.com> Content-Language: en-US X-ClientProxiedBy: AM5PR0201CA0020.eurprd02.prod.outlook.com (2603:10a6:203:3d::30) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96347f4d-d916-4dfe-4973-08d992cf3db7 X-MS-TrafficTypeDiagnostic: VI1PR04MB6861: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YVjqP4l1zR34Qu9DUZYTho8qhXOpurt75y1uqa2cO+xFED93+zBIuLJGu3WFtM3mOfS3/fNPHHeHQm+X1Vmp+DDtrPRwR1Pn4PBbsWfnl0NwWETP/jtro0DyKbTM83u8xKkNcZeHGBlCGUWhrytaDxqQvPNuSdH7kpbJzN2Pehm1WevPtoSK5FW2c11zU75txnFwlBX6g0hNK5Jp86tByPJqWQLgUwYdikJG4SOT2drMMKklOqbKXN2iGAtfnPydkVhnsbB6i8EYc1ewS4J8jHEu5j7HF/WCJ8ZNcqvPG4Mvf6K9jYRnInCH4/MtXLZWNCpxI12HOIRHVAPTL1xNI6bNyCRhQpHetd3nw90AuY/qhMKbNrn8lSfhSdIgIsXjU1/xGki7Aee57hYKExm5lA1Pr0aUm5nBUqEhGE0+MSOUlmpwOyhEy0FMy2og/voKbcxlAd9MavdsvtHkNVReI2SXSrb5D9jUHEWrU5pcgoKPAwywgnbjM553I5JCy+/KQkoIv6aj0Jrl0O4M/j+PbcDJdoOB7Ksxcm1QcwHMFe0vOn9c6qZJVxwwURXCT0r9rJY7MkSm+N88bZd421ngHqU2zWwn7qr/5V+7D500yIeQJsOPM3sW1FFjXBtSUgQnMyPYbiNOFCelJkZbs6VDuBm6pvV6YJCsb6JCmF0qXKzW1Vdm83Ss9Nf4LtIhNKV0v3usAHPDJY/XbeW4K3qPdrbOEsPob6kZbUm+zGmq4jU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(508600001)(86362001)(4744005)(8936002)(66476007)(16576012)(36756003)(66946007)(66556008)(38100700002)(956004)(31686004)(2906002)(26005)(316002)(186003)(31696002)(6916009)(6486002)(2616005)(54906003)(8676002)(4326008)(5660300002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?puePg6EaYK/QlnxgH9dbk8anGNp+?= =?utf-8?q?TCxg4psjLOCQRi7n9wyOSMPovucw2htQnTsRw3G+eJd+59MPgzoyX09/7a2o2A8dJ?= =?utf-8?q?2AnlO01cUUNHHAp10W2vosrlzxl1bg3LrKw3NA7VIftfTkc9T0vuWbqJZx7mxPPW+?= =?utf-8?q?VQ9ftsnuocjwTtegA57LxYhbnnEvzk2cfnTW13SoGnFslxIPcPZp21iNwNHz+SW0u?= =?utf-8?q?iCnB52j4ScT2REiAqioRU7hCWB/S6ofXqkqwN/GO52+1IsEAWPbBlkWZeKe2pYwhm?= =?utf-8?q?hnPdbc6PoRosBkMX6QRHfz18+vbUhj3r4nY8NxdPDZtxyVfX/1pAyIfrHIWWfFRfU?= =?utf-8?q?XmezxfAThzSHz6LbEGi2BfGw2ZnZKg5azKPQzI0CrZEL4Wg02Dam7PyGIMgDzz98j?= =?utf-8?q?oHT2qEvfoWzRWBhpG5h2e1MerZHAV9hSEOu/T/69anc8BMiaAcP8a9cyW1G2Rr34p?= =?utf-8?q?uuDqyIiBeSAeui5Gi3fs73PTwpck8oESMB/4J8+lYqDBEZjo0qJvCWufNFtujC1A0?= =?utf-8?q?jEO2+eGcsMh4GszFI95jVaTGbTsFdj1ZnaZa8Z+0GNvgw8YSkUq8t1SRn+4ccZemh?= =?utf-8?q?ItLm0TUhiOVXimXCgdQdhGzAkWYAd3oL6w1oU0Y0nktLLzatCzvATWa7iJ3O/n0zY?= =?utf-8?q?6+Hy2e+g+qg/L8VpBeZWPN/OVQbPx2lcynqulxK7BCuqTTxjX+lmsI5HI+iyw0w/7?= =?utf-8?q?j4hH0/uca+t2BO3adA+kSafEN7ELz2tiRu35g9duDw0M5YLPyoAh3k4OSyO2P0owT?= =?utf-8?q?yBNiGS6Fpw1KMRay7JoTPTYtdUV1liP3FXhRTMoNoLWW5vS871jDVFpqxtj5QhwIb?= =?utf-8?q?nE3r0Xv5cpEiv/e+C9tlI5JooeBiCMnUwYt9I/8CL4Ipc45ymxbGNHuztZUVLanmK?= =?utf-8?q?FpY/9Y2v3a2mieSsdcPQsAfdl0GYMryMfuZld567ZlhmQsC057vb2ZFmKpP/GCG8m?= =?utf-8?q?fJqQDX0qqJ0cKkhOGFDfRFaVLjerOQI1j6qPeQqM/XUICBJC07XKRcb85nb/E+OrI?= =?utf-8?q?+wr15v3m7mIFqcGVCPRsKa1DhowSGdKOUVIeAgXTuHkpB6J4QhXserkszMoemzbL0?= =?utf-8?q?KhZxr+Ykudrjbo9TKYn7XOIk8hE1BxscUOvEAf9ZFJsdLdu+F09Vnyv55PK+Rw7kP?= =?utf-8?q?nvifuUEwECV7onSgX5aHrjRKb5hb/nnQl9Z5tR3rMHlbx1uH0bN/V5u6nq9ldJV4k?= =?utf-8?q?bwrG+HrZImcWKJmMfv6ISnz/BO8912Bs6JNt0XsnRnZ+w7eFeRT9XQu+rIfI6CBCI?= =?utf-8?q?ExvrkdsalnaUQKtu?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96347f4d-d916-4dfe-4973-08d992cf3db7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 07:08:24.2242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yVAsLxfqFr+YcxOemrIdQ1VCRfYvHC6gT9/kD6sak9PsuKAgqSFMPflAaVbP2A4eNkhpNWzgQrPVSyjvEx+5lQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6861 As of 724b55f48a6c ("x86: introduce MWAIT-based, ACPI-less CPU idle driver") they (also) live in asm/mwait.h; no idea how I missed the duplicates back at the time. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- a/xen/arch/x86/acpi/lib.c +++ b/xen/arch/x86/acpi/lib.c @@ -24,6 +24,7 @@ #include #include #include +#include u32 __read_mostly acpi_smi_cmd; u8 __read_mostly acpi_enable_value; --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -22,10 +22,6 @@ #define cpu_has(c, bit) test_bit(bit, (c)->x86_capability) #define boot_cpu_has(bit) test_bit(bit, boot_cpu_data.x86_capability) -#define CPUID_MWAIT_LEAF 5 -#define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 -#define CPUID5_ECX_INTERRUPT_BREAK 0x2 - #define CPUID_PM_LEAF 6 #define CPUID6_ECX_APERFMPERF_CAPABILITY 0x1