[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] x86: de-duplicate MONITOR/MWAIT CPUID-related definitions
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Tue, 19 Oct 2021 09:08:22 +0200
- 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
- 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-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==
- Authentication-results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com;
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Tue, 19 Oct 2021 07:08:29 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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 <jbeulich@xxxxxxxx>
--- a/xen/arch/x86/acpi/lib.c
+++ b/xen/arch/x86/acpi/lib.c
@@ -24,6 +24,7 @@
#include <xen/acpi.h>
#include <asm/apic.h>
#include <asm/fixmap.h>
+#include <asm/mwait.h>
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
|
