From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419818; cv=pass; d=zohomail.com; s=zohoarc; b=PEevAJ1L2rwkybPyk0//yVC12b6Asvp6Bk3DT4TU8jdWVouAJ3VcunV4MLTQXZf/Z9kztNS/kKfjrtBi/mwP6UxgIAsyUSJVErA5nfCh67973zRjZPwDwJ3GpONuuo2eJ2dhEFVwBbVdzzPvWCpasdGRvEr7aBJBdwpFTSqLSHc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419818; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uBGZdbGxyCmYWqSQzp9nF0WnQDqrWAjMlDpiE89Jvo8=; b=YDLbDWoLurE33U2k7qFDQb66eGKxTMiW5zj9og0U7aDKxvKkEbrnaGSBAi2S5RxrVfSK1yUe4rVHJGgC6icT6Qndr4rYlOrDUgAxERDTEeRlWko1PJEI9Hxg7jZR2DoVouuRi1w8FY0DkLYGMzbY8bJgB8Je6Epo1X7heE7tAYM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773419818769870.4013960823768; Fri, 13 Mar 2026 09:36:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253992.1549982 (Exim 4.92) (envelope-from ) id 1w15VF-0004N5-D8; Fri, 13 Mar 2026 16:36:45 +0000 Received: by outflank-mailman (output) from mailman id 1253992.1549982; Fri, 13 Mar 2026 16:36:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VF-0004Ms-9r; Fri, 13 Mar 2026 16:36:45 +0000 Received: by outflank-mailman (input) for mailman id 1253992; Fri, 13 Mar 2026 16:36:44 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VE-00040A-MH for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:36:44 +0000 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azlp170100001.outbound.protection.outlook.com [2a01:111:f403:c110::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d1618e46-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:36:43 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH2PR03MB5271.namprd03.prod.outlook.com (2603:10b6:610:95::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.17; Fri, 13 Mar 2026 16:36:32 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:36:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: d1618e46-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qQJlUQS8ehx+pUCBIsVHP8+mSpFc0HTohzg6FKiiI1O0O+WzppWQVrfiF/wSSksRHp7TbqcEAlJ6YPveNf535aqPI6356GflNiAv1ymMI8x8Pb6fsFhQ9hEV5ln9r0MN+2khA55wu7O9w6rjpkr/IfvKGMwY5Vnf7GpBfMw6Rd3hr/XBPSwh2a/ltn+27mdvKlKgWE4zhfFp8XdfT20aXH0EqAH/6QriI+J7UTBaegJ5GNDUj/JsjBxatsnZQ//RHQJc/hHNBVBv+jizM6sJYBPAASRnuDOOsrrOjYiRigWu0+opj6I6uUuEgCjQ7nYVt138VYnV8SfxAq4Ag963FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uBGZdbGxyCmYWqSQzp9nF0WnQDqrWAjMlDpiE89Jvo8=; b=v2GlEE+Gm77nSt812oCUToHLhXxqd3Rbs+JHr9xBaNHVS5IcOR/ezDRTF/MMedRl7sLbIjVzNAHoxir1hnIxuPl7VEjqt+oyBuhLvF90QVeOJpWsTeWDLp/LZCzwcWDn8FEb/gI08p4P2wCtX9sHumD9gTGA/9JYctfZ5NM+8BCcHZ5mZnOi3JNT9eleinM5gsiGI8Rkgb8Oozrm/Eue+gptuzr56F9RDcDoBKSPM6DwOJmxB8iqLFSulbXPR10vHRV+MQ8l3uHCodP/r0CP3p9zi8IzBEFC6K4GwzK1Nar5wP4Zs7eh1f99mGnqRhq8bfh+lzz4iDeYYazlEhJMbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uBGZdbGxyCmYWqSQzp9nF0WnQDqrWAjMlDpiE89Jvo8=; b=y9gjQGcP/Ha/V2CS9KydQH5HNgG7Zvj5jLK0T2bZtUIm9+o2tShnkK6JdQ9pm48hlPzRbMt0kgwzQdgbknGwaMaLpdbDw6EfFfSFapw3Awc4moZ0d5AeOtw4B4gegV+splRrFgA5YF+Vzof/rjv5LuWOVz04PPfXMEMuIbSDogo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 1/7] x86: relax some CPU checks for non-64 bit CPUs Date: Fri, 13 Mar 2026 16:36:24 +0000 Message-ID: <20260313163630.1073019-2-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0495.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:13a::20) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH2PR03MB5271:EE_ X-MS-Office365-Filtering-Correlation-Id: f46e3f2c-a352-4378-27fe-08de811eb16b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: ED95+5zo9HncVDuRw4JCrjo3FvRpDBwJTHkWplIpE6pd+RhVupf6Pp7cqxgDRPh1uVe0F6j9kWCu73tVYhFhSVlVLLQloL6DU8hGRnns6Yu1l7xODfo/7pk5Ccuc7gji2tXaSIG0lvFFEcJmixnlP6T91GOofDuhkOmrNwIHKiFNqxmsklL06C81lT+EWE+7/XIsftHffWhxHstajzh5VlYk9nSuY1Mcmsa9R3LWO+no/i4MjmF/T2ASLyn2t/nCscebcDirEa1wlJLL3Y869a/5p7tO7+JLXjeP15FfBwGPhagkOinNybK4cPwY33Bs+1J5t5nngbw3SNhb84Bohu05HPAdq3QCRXX+RsYJLkPqOjAnU7aOdIHT29wjnvVP9TnpaqDyZsofufgguhBDOwqQwd3H+jt2NX9hZDerLxCXGBaY8i2aDmmu6g44YWklsdaXS6svQ10tiTRfCekho4ywFHdT52xmSjbKqNSnBwB3n/PYjZAL6qQrU/I334komVSgic3r6p0ly1+PuJ9YfJbRRmOIcghJ0+TdiPbjcYz8eCZ42QmLmRdFgcg0KPHOE0P6u+hnM76BLbIFkT5i5tDrrWvGmcFSe6boJi+GYNWiiU2i6+wF6qTAcXiLFPn6fyqDvnBxPmrfLP+rBnt5BvlNTHr7j3Zbs1URpPQrZI7lZE3lSxxzKc1rThFeKPfPSj8a8Xvgd22Y8MS/faoEFa8vkEXhf+RNva6XaTVHi5g= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W7TdgVj5FCobwCD+AA7jQ38YlCkxN7fs/5wpoXU0o6NWUpt/ihRo+yFrRlaf?= =?us-ascii?Q?o34XpKkZ5S6kCTG/r3NUfL4MBgRsKJflfktey3fGZkLiH0B0ewvvdnxXUCai?= =?us-ascii?Q?Vd+aFDk8JaeHSbanPiFpgFeqUzOgYEI8SkUt+HHYL4BzFVuQcZ5yZK2y34Ig?= =?us-ascii?Q?FeJDI0xwc3ePwkVMj5u+NbtSYyrxSSIx8qeZtjxazLkXO7tm/zW+4czWE8WP?= =?us-ascii?Q?72vS7Iy/vCU8YlOC49cLiFAl7iUoLrC08De/0iG4LWY1tdynmKrui4atXuOk?= =?us-ascii?Q?3ssB26s8n0EjCbcGyQ1OmE0SON25QazzB441DnaJBkv86s9xbabJFHNemehL?= =?us-ascii?Q?8xUg5qr7VEz0NPwv+EVzpXWAzXtYjS/7le1eoHnQ1bFf8psEgURKPIcSMlVB?= =?us-ascii?Q?MWj9QJundG3xK+MuQbwucIUyPwygPutx9A8ZK4M6J+jX33pf/D8niVEbOXVH?= =?us-ascii?Q?ZPG5In6J/sEyle6vAhSmPskxihYT37SIQZnh9gCM09rk6rRL22lUx/w3LvKA?= =?us-ascii?Q?kD+zdXWAmFdCc5fiz745JCiPwO4qbdwiPdR7UfEazWmPN54HJgnMhDeBnM5S?= =?us-ascii?Q?PHgjaSLe9j0FfQYs5MpDZkixb3/mf3640D9BOqDy5B1Jrd0AZeZPGfT2o140?= =?us-ascii?Q?1plEZH4PehviFLPO6edSdU5MTfDqZA8dwO3S1wJKTNw9gnOwP4Z4pDNFNntL?= =?us-ascii?Q?mgAJUEJrg2cFaFS2p4yozAih5xOEeW2xdsP9dYxAfoFB7hZm2xMt1Bl170Lw?= =?us-ascii?Q?Jl6zWaUzM9qSw5N/xt1LGQFMurNxzf29EjciUQeDSLvPpBReXUiPmIr0aeW1?= =?us-ascii?Q?kVzE+963SsYgoIuW220KwDbOfLE3bH9nv9PDryI8r+dJnEGtYX/LRgnwu6rz?= =?us-ascii?Q?hxpLz5xrRr02PP86r90CwbLdk2P9OBsI/og6vDU48kAgdE/0CIfj8rs8+nbZ?= =?us-ascii?Q?7N9z7pGIQmmo4E20KP2RFxry8JmFJL9sOUii/FXStSGjukJZiFsZ9yVXKXXf?= =?us-ascii?Q?Bqhs2CWLRuX20wPL3aLpvGEKsAtsFH4irD3mdwsBSyAbaRS3yGZyOe01SppE?= =?us-ascii?Q?WK+w3qqK8rd9KXArl21ODX0ZMcOOOH85QLsIElYFCJb9W6RZORC+KAyUeyXO?= =?us-ascii?Q?MzP7J0e8SHuh9M2nFc1SXl2Bk4+7vjcR7n/hh7TfvCHx48Z0xewseKKhMFTt?= =?us-ascii?Q?eLdyqvb3VtRE67sXIaCUVhmcL4E7gN1avnKb38ATiUjqmeLhjhBMLj5jRyaB?= =?us-ascii?Q?r81bgLs8uMBHlm0eGppB8wCPn/OUtGlWp6q35GcfcM0rp+dBvX3FebFGPlNf?= =?us-ascii?Q?W9uoPweBwR7r0Mw4G9G2YT6miFMZD1V0GTvZxTgQAxp1k7ZL2uPVa/EYnv46?= =?us-ascii?Q?CgzBZSFMyh1fDbnEhBTZ2q147eK3rjILotKLWbAniEuP/95eVYYWurvEvCKV?= =?us-ascii?Q?vHSTgh4W1ERRG45oN1Mny7wv8MJqfpHkCZaCpU2gQ6RfIa7yyGGcWeAqqDzl?= =?us-ascii?Q?KmPq0eFqKmB5tglmwC0r8uvQscU227sXjo0jY5w+HR8Tc4eOOnLApAAWUJfU?= =?us-ascii?Q?gA/c6CK0jzOP5cnRJ5K6sI/LZTLR12/uFPrf0T+Ltq+pf7JB6M/idKbsGUj7?= =?us-ascii?Q?GkHsoePgjBIozkVC0BXn2jw34btjTs+v77D7LjtBhTF+95R7IT/0ed+jaRco?= =?us-ascii?Q?3UnjD+A78S5FagZnSaQbDZ5FCrVdq2LHEKtk+4nJXPxoVsIOA0VrPPPQ9MSp?= =?us-ascii?Q?1dy03SEavg=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: f46e3f2c-a352-4378-27fe-08de811eb16b X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:36:35.9530 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TZ0gVouyWtItMtOIzQxFTABxo+PrDUjfXCvM0NcMjFEUADFVppUmTziO/pSFmiLlxJ7G3gR/LsHHIKtkCR9PDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5271 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419821391154100 Content-Type: text/plain; charset="utf-8" These checks were guarding against non-64 bit CPU models but they are not supported by Xen anymore so the checks are no longer needed. The switch statement was removed from mcheck_init() to support Intel family 18/19. Signed-off-by: Kevin Lampis Reviewed-by: Jan Beulich --- Changes in v2: - New patch based on review comments Changes in v3: - Moved patch to front of the series --- xen/arch/x86/acpi/cpu_idle.c | 5 ++--- xen/arch/x86/cpu/mcheck/mce.c | 8 +------- xen/arch/x86/cpu/mtrr/generic.c | 3 +-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 0b3d0631dd..46749ca337 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1059,9 +1059,8 @@ static void acpi_processor_power_init_bm_check(struct= acpi_processor_flags *flag * is not required while entering C3 type state on * P4, Core and beyond CPUs */ - if ( c->x86_vendor =3D=3D X86_VENDOR_INTEL && - (c->x86 > 0x6 || (c->x86 =3D=3D 6 && c->x86_model >=3D 14)) ) - flags->bm_control =3D 0; + if ( c->x86_vendor =3D=3D X86_VENDOR_INTEL ) + flags->bm_control =3D 0; } =20 #define VENDOR_INTEL (1) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 9a91807cfb..c4b3b687a2 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -777,13 +777,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) =20 #ifdef CONFIG_INTEL case X86_VENDOR_INTEL: - switch ( c->x86 ) - { - case 6: - case 15: - inited =3D intel_mcheck_init(c, bsp); - break; - } + inited =3D intel_mcheck_init(c, bsp); break; #endif =20 diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generi= c.c index c587e9140e..0ca6a2083f 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -218,8 +218,7 @@ static void __init print_mtrr_state(const char *level) printk("%s %u disabled\n", level, i); } =20 - if ((boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_AMD && - boot_cpu_data.x86 >=3D 0xf) || + if (boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_AMD || boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_HYGON) { uint64_t syscfg, tom2; =20 --=20 2.51.1 From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419824; cv=pass; d=zohomail.com; s=zohoarc; b=C3y8VJQXYauNxI+CcK6yyUZI3rHvS3ks0KWhn5Wk9s/J4j7E9gLBw2sCgVISIIWnqLNuOt2GkbCURVvYLjZH9uGBHEyfZa+I6y2zQSXRuNi6wDrip03fWGdsB8Hhn2+9JBL0SINTyCeZ0ZexpsSVIqd8uZaguzBsnMpCW8jTuyA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419824; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mbVxtmV6Qv5YAYFByzMFnBP2CUWtNib/VVmLwmUb988=; b=CkkgwS1rrVj5GnaKHz1CYiKxif840Wp83SFOA+lQMXdHnM4qVbIV/Bdq6Y3kLt6BYToLWzSp7bAUDojylci0CCE99jSdRslCeyqs4aRbtv3Q73iwsqclAv1NcLYRWv1IOttqjVJ+S+ap7fyfg2NGHuPtc812Vt9oZ393aDH/ArU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773419824763508.1966575052005; Fri, 13 Mar 2026 09:37:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253993.1549990 (Exim 4.92) (envelope-from ) id 1w15VH-0004cI-JV; Fri, 13 Mar 2026 16:36:47 +0000 Received: by outflank-mailman (output) from mailman id 1253993.1549990; Fri, 13 Mar 2026 16:36: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 1w15VH-0004c2-Ge; Fri, 13 Mar 2026 16:36:47 +0000 Received: by outflank-mailman (input) for mailman id 1253993; Fri, 13 Mar 2026 16:36:46 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VG-00040A-Na for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:36:46 +0000 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azlp170100001.outbound.protection.outlook.com [2a01:111:f403:c110::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d2764de2-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:36:44 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH2PR03MB5271.namprd03.prod.outlook.com (2603:10b6:610:95::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.17; Fri, 13 Mar 2026 16:36:36 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:36:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: d2764de2-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P+8w5R6bbjtk9ltBsUD9vjpqPsSlxbpVs7WjEbFjLrojnUhb2xjlR2j776VTh4OixIZXscQh3b1oJKNymLuDDNVv3SSktQDVO05Wwr0HGGw3O5xIJsJGosIVDdMjiSrS7dOeB095tGQNFCG6I2I9Nz1mHmfzK2eIL5Pad/HkGcP3H5VFW8NvNO02Yz/zWHOovyE+Xc/1v5c2a+Mcv1ilSamcnIUUOpAw11OXkCOKR+cGTvXeB7gj4c01vV9a5JvHFF987/oepxeVZEbjTtmu76zUlFq8APN2US9gINB+eqrhEPqSqbqcbfm8/JfccLjzwaeGb4hEtA94wPpPLMP4ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=mbVxtmV6Qv5YAYFByzMFnBP2CUWtNib/VVmLwmUb988=; b=lblLao2AccfUN4dul18vK6aw9p5TgW004l6UgOulOCSOgu1joZ4dE8lBZCVxVEIeb8HNYeSvBWAvOeBMTtJOKIbwOEm9vfRuuX11aXiQ4Ln/YRlX+TSrLlCK4glImsBnsDDYJhO7V7kh0MSuSWbaR2weO4AMZc/qFoDuYU+jbhN1IDUJor9w3jR6wAKyMhMVHyvKD9bcp3KThpNLlYhHk8XabGG3C7zQd3rJgvQUI1bO80flVXTcfJhsi7dV/nf5KdCGeh1KsO2wWjj3Vb73ltwb+l7v8z0Amu21G2V48Vo45u3Hxr7k3y6c1QVpGemBr2sLmXL+CCmnG2KiDQJnQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mbVxtmV6Qv5YAYFByzMFnBP2CUWtNib/VVmLwmUb988=; b=MEA9/POROVpXmsZjvgxgWRPVnjBgxg0644WTxkmXCICH2x6wsnvZsAujVzrXtdeEk6CJ176Zgi4zMpA2kOcwJPV83HEROpDwhKGdewhRyqtMDvXxwcEfmA+syZkQf8qK6/RekbZUANlbTGmaEIQ7Ro8uGATpHV7P93/R6B+MhOs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 2/7] x86: Remove x86 prefixed names from mcheck code Date: Fri, 13 Mar 2026 16:36:25 +0000 Message-ID: <20260313163630.1073019-3-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0484.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:13a::9) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH2PR03MB5271:EE_ X-MS-Office365-Filtering-Correlation-Id: d404ed38-6d7d-40b9-eb3f-08de811eb3f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: 7F1TQW57bwjFKfMgxhrsXR78SuRZD3fvzvowm4QX6nGqLRZs/7it+BIZI3FKKIyzl24V96hgkxuhZjAOCGkYoiObZVyIUHeNEFbwtsmhB8X0nrpALPkow9CikLm6nD3gLBy+4qCfBmHnjM8HPWrJOEgZzm3VmixIdFqJHAys2gxWjAudG8TT8LUPzc+6cp9m2GHZ/oKZFoZb0BWix02bxIc7gHBehoEkAxiv+tpAz1LFo9xerP4pzMKtuxYBvwCwrJ97Mpb1ZAiEoenTiU0hf78tNG62hqulmomL+3KA6rQAn4g8UR84IJHH2CU+L1vEvm0ukCzNwQe75S4haz1/lGwPejAi6w8ocPt7TFNnegkI7bqLwrb+yBYwvz4gvRYfvk/wrLQ8l7czcnPqekfOYMdMIiM+OTQiT2VPsUGtr0gc7CR/1wtKttd2iQ997YaiEKpkVT4C9NmvOv4xlgZdjkrV/aC4wOYmouh/gmxZCp5wgM0Oni0tCnCGNMeFGe3FUnT6V31p7JAn0Y02ji4SP1a+HFu1PLB3D/iy/gt1dIO9SEdLsR7Te/DSM4l8V3TNambfHcgweJRbtJZiKJu6EqY2X44Xq34/WClt/uhq72HFw7p0GUJJo51NIqtSzP6hEicGavK+uHaf6D82iCkq/bhqURZwZ8yEIrkysrnAdsY/HhV4B85JfYJJwAqxYQUYrPJYLhojkO8OtLhtaqAqQH1mMN62itwkiJEdywaj9MA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?I0hTehMrJOxSc24LsWRtBms4RBWGMBjl6mS4PJDIdg1f2phCsmAjggeqfj6f?= =?us-ascii?Q?CMdxSjOiYZvXy69MjpIOayjaUZlFDjRP5qArWjex44aTVK0x/Y78TYtos7N8?= =?us-ascii?Q?zieWECW9EExaklxVj8Fe8S3G1Pe2uKZuIiri0dOOKI3jDQ9iQl65ibaKnU8m?= =?us-ascii?Q?fLETDQX6HhLX+vCNwZ0qmX9ut7U59KkjkGBTB3cRUJOzLJtYPde5zEWVJtMr?= =?us-ascii?Q?hDPeCkrGlGlB4IX01yVzukfe0HKz2vjVbM+mWl3II0F/3X7e09fB8NFHf57G?= =?us-ascii?Q?jXu6JvELmZxSqybKy0tRr46zbPyJ/vXJ2EKXv/dRtVkrBksx3Qx+MjruXam7?= =?us-ascii?Q?l4P3TO/EU9JXTQ+LFnnVR1evxrJ+4ZLhYQjzqPDbEvYwgU/FNsCTaWtV8Yih?= =?us-ascii?Q?m9zk6fxXYu88NmQBmZTSNLlehuDJzjaxqdzeBUNimEbDEA30sNXXrTWJNgQc?= =?us-ascii?Q?1famdjARVY/NGu7DBOhNYkD0gJZns09+6Cb9yk2wKNE42UdDbNoQa3ZC8jxr?= =?us-ascii?Q?9XkBBnZ50LYF71OAjphxdWnwSsDAX5hRcdBG5ylaf1/HsZ1GXSK28SfMh4MG?= =?us-ascii?Q?Nhse+WYjbUVMU4sCSU6J7gG6iv1SzQzAnu+b8HVtO69/h1ZsEunnnBFnLFz4?= =?us-ascii?Q?RLn0lGCyLeuJapnBeKHoFRlovwzRZI67jmUZNOHpP8WZB9bc2knLe5DRjhns?= =?us-ascii?Q?7kiGw3na9MiCv7AGY9fr9ygqBKJZvKXlhpVDz5j+IONo7M9mACKkfD9SzEB9?= =?us-ascii?Q?Se43jTBaloYn9M+jMOxO4kHEO+mvt8Qd2RN3niBNhjnGKeSFLl7Y/RfianFy?= =?us-ascii?Q?U0+/gsgKR3IovcGoQrlHKv293C0KL9YlKvL3chQ0PYBiFi5+ujiNwXWxUQFb?= =?us-ascii?Q?ihcMK4kcso3xK3kdCwgu6AhugdwufK7QJT/cJ3BeIhx/t6NY1Ue13XVNCSag?= =?us-ascii?Q?oenXg3+e9UCeCu45cMLqGZkNrRVf30OukuVqYMN3AdMGNQNfKFaQIj+RECQu?= =?us-ascii?Q?y39BMM/ovhX7umS3fu8LuV4wvmkbCnz2285sG9mwoLwAUZApmXkhfnzZhj6/?= =?us-ascii?Q?9UjTAn3kVH5PZQw3K2CMqkiSbO8OxXIraFc9Jvnrz0vz8k0Q98GJOZL98FzO?= =?us-ascii?Q?05HNQMWZYNVzgvU1TTRYKda6WuOPb4VtfBTbbF3+p199q/RWVCUKR858PUxg?= =?us-ascii?Q?2DEbzcsr83fzv3o81QjdLVOfCwai6IYcMg95EslAN5VFy7CZdReCyT8ShTCR?= =?us-ascii?Q?okHLMKPXfUBzFzjXpRGsszlhWa66hvVX3m3GSkWhA6IjNNZgcUOcFB+TmY5z?= =?us-ascii?Q?A/IeIiWkH7kM5cFkfbMWRLrWxyC88Jq762ae3xB83wRLuotBrGVhTFkSNqNA?= =?us-ascii?Q?HgBe4Qhu9RB1pfe9mEwxL0vREk1HygfCmMmnBHtkn/Vfdr8NfrQbzHhEIVF+?= =?us-ascii?Q?H0LxFYmTmFsEiP2CQ3KZUfuxoCyh2J8vdG8xX2jlsmuCPyA2jZrcdtBilxB7?= =?us-ascii?Q?UZ34CLXUn90FifsHFzKqwdsA35x2ICm6BlpbAnyDt/yCfcdRFxNgY66HX5ng?= =?us-ascii?Q?Jc8nJ/K3/U9pSmoB9NQOJj52F4H3UioJQgREKL1f8HQqc5M5PPPKsx/a3dvv?= =?us-ascii?Q?xVhMPdGkcqit0ku3QQC7rG1h7T7EK3cGlLn6grtTB+7IF9uae+gVAgNGI0iY?= =?us-ascii?Q?5IoSUp8ar8MtID4SPmddQVYKZl4f6QtK5f6kGFSuzgKQW4wyBImfhHYS5VuH?= =?us-ascii?Q?vkzzMwnwHQ=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: d404ed38-6d7d-40b9-eb3f-08de811eb3f5 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:36:40.2441 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HmrzYPO357iTOqQha9SWm7tIG7Qr481LCA4cz3LsvNzeTBtBRwo18QWj8VZyioDpZdeHLbTac/MAnDPpEiO1Aw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5271 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419826725158500 Content-Type: text/plain; charset="utf-8" struct cpuinfo_x86 .x86 =3D> .family .x86_vendor =3D> .vendor .x86_model =3D> .model .x86_mask =3D> .stepping No functional change. This work is part of making Xen safe for Intel family 18/19. Signed-off-by: Kevin Lampis --- Changes in v2: - Undo the family !=3D 5 check in mcheck_init() - Change model range check in mce_firstbank() Changes in v3: - In check for family !=3D 0xf in mce_is_broadcast() --- xen/arch/x86/cpu/mcheck/amd_nonfatal.c | 2 +- xen/arch/x86/cpu/mcheck/mcaction.c | 2 +- xen/arch/x86/cpu/mcheck/mce.c | 28 +++++++++++++------------- xen/arch/x86/cpu/mcheck/mce.h | 2 +- xen/arch/x86/cpu/mcheck/mce_amd.c | 16 +++++++-------- xen/arch/x86/cpu/mcheck/mce_intel.c | 5 +---- xen/arch/x86/cpu/mcheck/non-fatal.c | 2 +- xen/arch/x86/cpu/mcheck/vmce.c | 8 ++++---- 8 files changed, 31 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c b/xen/arch/x86/cpu/mche= ck/amd_nonfatal.c index 7d48c9ab5f..fb52639e13 100644 --- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c +++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c @@ -191,7 +191,7 @@ static void cf_check mce_amd_work_fn(void *data) =20 void __init amd_nonfatal_mcheck_init(struct cpuinfo_x86 *c) { - if (!(c->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON))) + if (!(c->vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON))) return; =20 /* Assume we are on K8 or newer AMD or Hygon CPU here */ diff --git a/xen/arch/x86/cpu/mcheck/mcaction.c b/xen/arch/x86/cpu/mcheck/m= caction.c index bf7a0de965..236424569a 100644 --- a/xen/arch/x86/cpu/mcheck/mcaction.c +++ b/xen/arch/x86/cpu/mcheck/mcaction.c @@ -101,7 +101,7 @@ mc_memerr_dhandler(struct mca_binfo *binfo, * not always precise. In that case, fallback to broa= dcast. */ global->mc_domid !=3D bank->mc_domid || - (boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL && + (boot_cpu_data.vendor =3D=3D X86_VENDOR_INTEL && (!(global->mc_gstatus & MCG_STATUS_LMCE) || !(d->vcpu[mc_vcpuid]->arch.vmce.mcg_ext_ctl & MCG_EXT_CTL_LMCE_EN))) ) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index c4b3b687a2..2c70964a82 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -23,6 +23,7 @@ #include #include #include +#include =20 #include "mce.h" #include "barrier.h" @@ -334,7 +335,7 @@ mcheck_mca_logout(enum mca_source who, struct mca_banks= *bankmask, mca_init_global(mc_flags, mig); /* A hook here to get global extended msrs */ if ( IS_ENABLED(CONFIG_INTEL) && - boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL ) + boot_cpu_data.vendor =3D=3D X86_VENDOR_INTEL ) intel_get_extended_msrs(mig, mci); } } @@ -564,8 +565,7 @@ bool mce_available(const struct cpuinfo_x86 *c) */ unsigned int mce_firstbank(struct cpuinfo_x86 *c) { - return c->x86 =3D=3D 6 && - c->x86_vendor =3D=3D X86_VENDOR_INTEL && c->x86_model < 0x1a; + return c->vfm >=3D INTEL_PENTIUM_PRO && c->vfm < INTEL_NEHALEM_EP; } =20 static int show_mca_info(int inited, struct cpuinfo_x86 *c) @@ -596,7 +596,7 @@ static int show_mca_info(int inited, struct cpuinfo_x86= *c) case mcheck_amd_famXX: case mcheck_hygon: printk("%s%s Fam%xh machine check reporting enabled\n", - prefix, type_str[inited], c->x86); + prefix, type_str[inited], c->family); break; =20 case mcheck_none: @@ -766,7 +766,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) else if ( cpu_bank_alloc(cpu) ) panic("Insufficient memory for MCE bank allocations\n"); =20 - switch ( c->x86_vendor ) + switch ( c->vendor ) { #ifdef CONFIG_AMD case X86_VENDOR_AMD: @@ -876,7 +876,7 @@ static void x86_mcinfo_apei_save( memset(&m, 0, sizeof(struct mce)); =20 m.cpu =3D mc_global->mc_coreid; - m.cpuvendor =3D xen2linux_vendor(boot_cpu_data.x86_vendor); + m.cpuvendor =3D xen2linux_vendor(boot_cpu_data.vendor); m.cpuid =3D cpuid_eax(1); m.socketid =3D mc_global->mc_socketid; m.apicid =3D mc_global->mc_apicid; @@ -977,10 +977,10 @@ static void cf_check __maybe_unused do_mc_get_cpu_inf= o(void *v) &xcp->mc_apicid, &xcp->mc_ncores, &xcp->mc_ncores_active, &xcp->mc_nthreads); xcp->mc_cpuid_level =3D c->cpuid_level; - xcp->mc_family =3D c->x86; - xcp->mc_vendor =3D xen2linux_vendor(c->x86_vendor); - xcp->mc_model =3D c->x86_model; - xcp->mc_step =3D c->x86_mask; + xcp->mc_family =3D c->family; + xcp->mc_vendor =3D xen2linux_vendor(c->vendor); + xcp->mc_model =3D c->model; + xcp->mc_step =3D c->stepping; xcp->mc_cache_size =3D c->x86_cache_size; xcp->mc_cache_alignment =3D c->x86_cache_alignment; memcpy(xcp->mc_vendorid, c->x86_vendor_id, sizeof xcp->mc_vendorid); @@ -1136,7 +1136,7 @@ static bool __maybe_unused x86_mc_msrinject_verify(st= ruct xen_mc_msrinject *mci) =20 if ( IS_MCA_BANKREG(reg, mci->mcinj_cpunr) ) { - if ( c->x86_vendor =3D=3D X86_VENDOR_AMD ) + if ( c->vendor =3D=3D X86_VENDOR_AMD ) { /* * On AMD we can set MCi_STATUS_WREN in the @@ -1171,15 +1171,15 @@ static bool __maybe_unused x86_mc_msrinject_verify(= struct xen_mc_msrinject *mci) case MSR_F10_MC4_MISC1: case MSR_F10_MC4_MISC2: case MSR_F10_MC4_MISC3: - if ( c->x86_vendor !=3D X86_VENDOR_AMD ) + if ( c->vendor !=3D X86_VENDOR_AMD ) reason =3D "only supported on AMD"; - else if ( c->x86 < 0x10 ) + else if ( c->family < 0x10 ) reason =3D "only supported on AMD Fam10h+"; break; =20 /* MSRs that the HV will take care of */ case MSR_K8_HWCR: - if ( c->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) + if ( c->vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) reason =3D "HV will operate HWCR"; else reason =3D "only supported on AMD or Hygon"; diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 920b075355..3b61b12487 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -137,7 +137,7 @@ void x86_mcinfo_dump(struct mc_info *mi); =20 static inline int mce_vendor_bank_msr(const struct vcpu *v, uint32_t msr) { - switch (boot_cpu_data.x86_vendor) { + switch (boot_cpu_data.vendor) { case X86_VENDOR_INTEL: if (msr >=3D MSR_IA32_MC0_CTL2 && msr < MSR_IA32_MCx_CTL2(v->arch.vmce.mcg_cap & MCG_CAP_COUNT) ) diff --git a/xen/arch/x86/cpu/mcheck/mce_amd.c b/xen/arch/x86/cpu/mcheck/mc= e_amd.c index 25c29eb3d2..2d17832d9c 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd.c @@ -160,17 +160,17 @@ mcequirk_lookup_amd_quirkdata(const struct cpuinfo_x8= 6 *c) { unsigned int i; =20 - BUG_ON(c->x86_vendor !=3D X86_VENDOR_AMD); + BUG_ON(c->vendor !=3D X86_VENDOR_AMD); =20 for ( i =3D 0; i < ARRAY_SIZE(mce_amd_quirks); i++ ) { - if ( c->x86 !=3D mce_amd_quirks[i].cpu_family ) + if ( c->family !=3D mce_amd_quirks[i].cpu_family ) continue; if ( (mce_amd_quirks[i].cpu_model !=3D ANY) && - (mce_amd_quirks[i].cpu_model !=3D c->x86_model) ) + (mce_amd_quirks[i].cpu_model !=3D c->model) ) continue; if ( (mce_amd_quirks[i].cpu_stepping !=3D ANY) && - (mce_amd_quirks[i].cpu_stepping !=3D c->x86_mask) ) + (mce_amd_quirks[i].cpu_stepping !=3D c->stepping) ) continue; return mce_amd_quirks[i].quirk; } @@ -291,13 +291,13 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) uint32_t i; enum mcequirk_amd_flags quirkflag =3D 0; =20 - if ( c->x86_vendor !=3D X86_VENDOR_HYGON ) + if ( c->vendor !=3D X86_VENDOR_HYGON ) quirkflag =3D mcequirk_lookup_amd_quirkdata(c); =20 /* Assume that machine check support is available. * The minimum provided support is at least the K8. */ if ( bsp ) - mce_handler_init(c->x86 =3D=3D 0xf ? &k8_callbacks : &k10_callback= s); + mce_handler_init(c->family =3D=3D 0xf ? &k8_callbacks : &k10_callb= acks); =20 for ( i =3D 0; i < this_cpu(nr_mce_banks); i++ ) { @@ -311,7 +311,7 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) } } =20 - if ( c->x86 =3D=3D 0xf ) + if ( c->family =3D=3D 0xf ) return mcheck_amd_k8; =20 if ( quirkflag =3D=3D MCEQUIRK_F10_GART ) @@ -337,6 +337,6 @@ amd_mcheck_init(const struct cpuinfo_x86 *c, bool bsp) ppin_msr =3D MSR_AMD_PPIN; } =20 - return c->x86_vendor =3D=3D X86_VENDOR_HYGON ? + return c->vendor =3D=3D X86_VENDOR_HYGON ? mcheck_hygon : mcheck_amd_famXX; } diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/= mce_intel.c index 839a0e5ba9..d49737f24a 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -711,10 +711,7 @@ static bool mce_is_broadcast(struct cpuinfo_x86 *c) * DisplayFamily_DisplayModel encoding of 06H_EH and above, * a MCA signal is broadcast to all logical processors in the system */ - if ( c->x86_vendor =3D=3D X86_VENDOR_INTEL && c->x86 =3D=3D 6 && - c->x86_model >=3D 0xe ) - return true; - return false; + return c->vendor =3D=3D X86_VENDOR_INTEL && c->family !=3D 0xf; } =20 static bool intel_enable_lmce(void) diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/= non-fatal.c index a9ee9bb94f..4e7c64abef 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -23,7 +23,7 @@ static int __init cf_check init_nonfatal_mce_checker(void) /* * Check for non-fatal errors every MCE_RATE s */ - switch (c->x86_vendor) { + switch (c->vendor) { #ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index 1a7e92506a..84776aeec8 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -45,7 +45,7 @@ void vmce_init_vcpu(struct vcpu *v) int i; =20 /* global MCA MSRs init */ - if ( boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL ) + if ( boot_cpu_data.vendor =3D=3D X86_VENDOR_INTEL ) v->arch.vmce.mcg_cap =3D INTEL_GUEST_MCG_CAP; else v->arch.vmce.mcg_cap =3D AMD_GUEST_MCG_CAP; @@ -63,7 +63,7 @@ int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vm= ce_vcpu *ctxt) { unsigned long guest_mcg_cap; =20 - if ( boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL ) + if ( boot_cpu_data.vendor =3D=3D X86_VENDOR_INTEL ) guest_mcg_cap =3D INTEL_GUEST_MCG_CAP | MCG_LMCE_P; else guest_mcg_cap =3D AMD_GUEST_MCG_CAP; @@ -136,7 +136,7 @@ static int bank_mce_rdmsr(const struct vcpu *v, uint32_= t msr, uint64_t *val) break; =20 default: - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { #ifdef CONFIG_INTEL case X86_VENDOR_CENTAUR: @@ -273,7 +273,7 @@ static int bank_mce_wrmsr(struct vcpu *v, uint32_t msr,= uint64_t val) break; =20 default: - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { #ifdef CONFIG_INTEL case X86_VENDOR_INTEL: --=20 2.51.1 From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419824; cv=pass; d=zohomail.com; s=zohoarc; b=MVd5o/kklR0DHUfgqYPsE68oX/ySbx0wQjlatILxK0q2W5USaiuqsK7flya6g6VwjCFNtDJG6fJkWTg23nqrH8RVNdn2DFMJLGz+QRqpTFSPPRNW9twgGSGbSeIwNEVd5Set2g41Nvrx0Ahc1aCKHts43wTZNWl13+p6yCRqFug= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419824; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4DCI1IPGGhbSXpfhfNCCCnchGXNmQEqfWuu8VgQvnxI=; b=JvM29YWefwbVZirypCu92HnViLrEW00covNR87Ixhp6GJp5rkoB19S5qoSIzCC/sS0gO9N7WbBqIasGNArUi9f3E32jKKq3TgCX0btVP6KDwCbOZTUAL7eT4Z/AlNgzBnS31M10eGRyLiu1P3z33mvV9SejQBIz5yZz/J9C8LLY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773419824646340.8673999701018; Fri, 13 Mar 2026 09:37:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253995.1550000 (Exim 4.92) (envelope-from ) id 1w15VN-0004xb-2i; Fri, 13 Mar 2026 16:36:53 +0000 Received: by outflank-mailman (output) from mailman id 1253995.1550000; Fri, 13 Mar 2026 16:36:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VM-0004xS-VO; Fri, 13 Mar 2026 16:36:52 +0000 Received: by outflank-mailman (input) for mailman id 1253995; Fri, 13 Mar 2026 16:36:51 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VL-00040A-AM for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:36:51 +0000 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azlp170100001.outbound.protection.outlook.com [2a01:111:f403:c110::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d5391a2b-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:36:49 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH2PR03MB5271.namprd03.prod.outlook.com (2603:10b6:610:95::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.17; Fri, 13 Mar 2026 16:36:41 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:36:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: d5391a2b-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=epJbFbv7QRKMbIhnkEEcYHcJYNUFjDe/98/S0eOi5e/MzYxP6ooPcWdRjLb44LqReNstp2twlTkHm0Pt+JD3Jh/8v2sxNzntbUDtQ3pmseHlaNmTA8nY2Z2Gwn0yknx4o1cg5A9CXKUVnfpYEkaWJdh3nkAy9zSPqPBzrjhXrdR7VE/OhNWd8RXZaBPYF78SLsMk8DAK/VV7SNGuKIYa0A+6oikbabvak+1LJG+PU9ZSk+FabTQS+0fGuTaWTduyWMkq+wrkPGiV1WakgmaZfcSe86C6RI8LHxdU7N0Ru6Yx/2APQZ0kC7eq1sHD1Jk7t0deExOqHQN572wHSvBFlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=4DCI1IPGGhbSXpfhfNCCCnchGXNmQEqfWuu8VgQvnxI=; b=lIOTwRnanDe95C5EkrLq8b15h5+qV6+17kkHlPBJxTsRVD1ifnL8te3FAbq/Ae1YeSFdkrhuqx/kSnlK2g8m4hZnZygH7U2uDOc6qFA9CEIVL7/M0erUVVOlOAXj0LafmzbAZ0D90Jpoof3ShffFX46oIBf6AUwudzVZZiXOoip4+6AwH9Zl+sZw2V6mitKOjxF+i4G2x0FtzCSPp2hfHq9aTSDmeG+Fpg0pqfE/cNRFzbl7QzdcYqBVyfbMqc2F/KJejimq0JRJGwLdukxnt/gxB+Z0AmNvAMFCrT1VZlCd1kofz7FfLNlbuYrDAE6he2fk2/X0KP3uDIVQEy9FtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4DCI1IPGGhbSXpfhfNCCCnchGXNmQEqfWuu8VgQvnxI=; b=YEr0zdRienXEqrjYx1/VfjifkIf8S/gU1vzbR07Ca4YILsqMrXsF6+aCJweeBNVLaIggmXMRFo1Q+jSGLiFeXHEuA9korcDJx/vItMiC2ATWQ7RRKoqtlADpmHti+kOOWj4BeHU8tXPHtjpLPOT9Wvu/Yihli/K7gl6FomR65Pk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 3/7] x86: Remove x86 prefixed names from acpi code Date: Fri, 13 Mar 2026 16:36:26 +0000 Message-ID: <20260313163630.1073019-4-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P123CA0037.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600::25) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH2PR03MB5271:EE_ X-MS-Office365-Filtering-Correlation-Id: 9aaf5cc7-04c8-40dd-fb75-08de811eb6a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: geLG66UgyZ8omc0ZS8VUpgiwHtbhPDv3XKMBuR5nWrHEcwNkrWBL9PvtyNkLvcabrToSwHQEzoFwvuih6OrJq2KGohcRGT/ZSLa6eIY0ygO2EXJ9rxY/f/XFPoSellWTj4VIxvyIA3RXdgDgWLmOq/8B8PvbUcl/n5tuk3usVlw56b2FNKZ2LtONXyQyNSZeZMikDy9UTcbnc5K5RcAYSTSZc7KtP84GgBL4mayoJJ/bnCNQaP4t0xu9PVyiMQX2n/V24Uy9X2xeTUQVEjcOUlcw/zZWdCC2R5rGPP+nUIVWGBN0Dx+DNRRBLT8OKFfORN3t44a7QmmBV6hzHtP9h1z2xEthTn2HgwEhGb1Rab0wWnlLIjN0uVwKSdO9bxtM7rrxCgXX0nTeqOVWEw0mwk39QLvtv/GETf8Edq29VXnOUTl8Jsk7DB0tRFIDrbEKj3+sHEShqXjFBQNiZIJ79V6axqmE8H++LySz0qSby32bq88IvCvpuJbVsU5etVhYw1T9/d/Iia9GEl7r7i4VVWx1tpIFfrOuBIOXjd7MQSVNfP77T6liAl/amnS6EiwQPx63uY5kx11I4A6IOeZdC2Df2GRIMIdIe5cBW5H5SAL9FoiVrb5tSlZt3+dSnr6GQJk8U9FAF6Fn23z8mTN/6HBFLCcAJ4VioIEM3jtvDoBZUzHTqx7sAiaqD6HgoLQKNqrbLBkb2c9zo073P4pzBySlxX5aGPYvXZ8578W6ET4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JWnvTIHPBkKgg6bXtdaYry6cXs+j/fuaSTE2Odh5vTm8TgjTSBCg2WttpPV1?= =?us-ascii?Q?rahebqEzc8r9IwnV8Co78eWgrtl6432iL5kd/NeJli7LwvqfjasmiZ7cuASI?= =?us-ascii?Q?Z7rctSsaT77nlOotrMFowqT24/AyDOT9OXaQovNyOwqzn+Zcgg5HflaTpb5a?= =?us-ascii?Q?n8L1UAIThQr9m8NBjJCgaacd2rRZPxS/cxQilJbsDjl47YnoCQ1lMkXiS1V5?= =?us-ascii?Q?WJy30QFsCJdH2lzTUtRkdMd+tYdB2Dfi1txSlRZ31mZpsAz8GiS5wjthjznT?= =?us-ascii?Q?DmY24dWg61rhFwe+PD5Psz5vQlOouyv50QFw9fT4RDDD92gHJShkcTj0Quz3?= =?us-ascii?Q?ox/yQImwjx2qxGIJow1tH5vcW7cUxgUYkHnk91hGd5BjlUCrQd7Jd9OaDz/x?= =?us-ascii?Q?/xQB73JluyMNgJKi3+VIgHHWwiF6dLxvVdPi6k3hj5+Z1IN+NZCasT9vvSr+?= =?us-ascii?Q?ZFTYF3obHfX+A1I1nTboq7cYWy1XyD2h8yuC2AXED2e6QI3xGyyEq9vrNYh/?= =?us-ascii?Q?bfoUg4ndcPM98lAW87X25zeToYQ9QmqG4us9bZsMj7AjU/fC487nNL3NsPe2?= =?us-ascii?Q?R1aYM4I5+HxlZbHZAgKNlqqRJfLtvRlzQ9G2AiDICDJSR+W3rK2raz0QAEvq?= =?us-ascii?Q?WyjOHUvzd/VGoUi1CL1iWCKkUDmirvo4GvniyM78KicAjzXGDZvMKeOW7fIr?= =?us-ascii?Q?yteOtiy3zbRuPFTtRf2PNdXreEvF6OnxZFqk7iqEirFBkBZU90dZ/mVAG6pU?= =?us-ascii?Q?lY5IXvnk0cWdoDXc5SQ2HW8F59uTstZCho7MgnuJ2lJbRIAcc40AfWyFNxuX?= =?us-ascii?Q?yefEqXMP7oHBae/7kgRh/hDQGbl+39Ds318VoVf/5UaqY8fP/sughGBRSfCI?= =?us-ascii?Q?sqVJ3dSTWUPT3lPFBQhpGKuPxYvlzY2jPpR+p8rzQLoO/LkWeUwRQTpXGer7?= =?us-ascii?Q?F+lwwJKyGV6LGQjm4oN4FuatmcN8V1wwGfJPzIilTuYSbhOOChsoxGRZTxGQ?= =?us-ascii?Q?G/EUF2v8MOsd3cd7Bzpk8XXiply+yZ7NAkdNH8fNWBFHebphfxJmXlBAbwpw?= =?us-ascii?Q?gd1PKMnLTyPFiKEyyIy3iJKAcQaZ0W8X4PGgR9Lq+RsL0rJuNzqDMjKHy+T8?= =?us-ascii?Q?bM2HzQdcWb9DXYTjTuUoPZGDjys0OcA9pitfH86ztbctqCWeeXtphZqwDQyc?= =?us-ascii?Q?m6FCvhgVWwupwOEVuzJoSLWqMKqmGW6hp5Zcc8Z3rNh5schUcOf6LAqNMui9?= =?us-ascii?Q?2Aj6M8LcuccW++YNq8ymerXsjWyeTaAXImq0shY5A5xcp1xvrUaPYJJboq8K?= =?us-ascii?Q?66wNHALbbCdEQ/whgF3wJ6I7bf4BLl3T5RJoGMd29yEYFvpaeVwPFaNsXQ0X?= =?us-ascii?Q?HzYQf/llUZs3hhHYQYtvqNoKyzhHPgehJEE8P66RAYiBTOIb58AaOw2jfkUc?= =?us-ascii?Q?UPU+wCt16mNRd91sMfMSzftdRCqETTcFIA9vMK43iHsCk+dTuC4/em6uqnOy?= =?us-ascii?Q?DbzUFE9jNaUOghNaltp/iFU3fFs+fBVOPX9C6xP4jQEFWUNS50WDHWhF8/r4?= =?us-ascii?Q?qwtGR3ky/RqdzYnLyYQ7UEkH7qZacn+F9X49Hdz+4xIkU2d0HuehVSI2YcXH?= =?us-ascii?Q?984G0wtgGdZjp2mNf4k1011lF4nU99MZzTdoty9I/dyXHY4OVRsW/W/7i7rT?= =?us-ascii?Q?t4lnC6wFCOG8hSb3OxcQlrMERdek6Zab6ZETeytYPxEgbEZdXZd00MgPrbsV?= =?us-ascii?Q?0GVmjlVg3Q=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9aaf5cc7-04c8-40dd-fb75-08de811eb6a8 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:36:44.7923 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I1PKbhf8t7T9imsZibNkEza97C4BS6jDyadfyXI85yjVXk7EEF4IQWl2ue7kr9ZinZTpwpraJ82E0mB7cnWfcw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5271 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419826579158500 Content-Type: text/plain; charset="utf-8" struct cpuinfo_x86 .x86 =3D> .family .x86_vendor =3D> .vendor .x86_model =3D> .model .x86_mask =3D> .stepping No functional change. This work is part of making Xen safe for Intel family 18/19. Signed-off-by: Kevin Lampis Acked-by: Jan Beulich --- Changes in v2: - Remove the XXX comments Changes in v3: - No changes --- xen/arch/x86/acpi/cpu_idle.c | 18 +++++++++--------- xen/arch/x86/acpi/cpufreq/acpi.c | 2 +- xen/arch/x86/acpi/cpufreq/cpufreq.c | 4 ++-- xen/arch/x86/acpi/cpufreq/powernow.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 46749ca337..3001e98a6e 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -178,10 +178,10 @@ static void cf_check do_get_hw_residencies(void *arg) struct cpuinfo_x86 *c =3D ¤t_cpu_data; struct hw_residencies *hw_res =3D arg; =20 - if ( c->x86_vendor !=3D X86_VENDOR_INTEL || c->x86 !=3D 6 ) + if ( c->vendor !=3D X86_VENDOR_INTEL || c->family !=3D 6 ) return; =20 - switch ( c->x86_model ) + switch ( c->model ) { /* 4th generation Intel Core (Haswell) */ case 0x45: @@ -915,7 +915,7 @@ void cf_check acpi_dead_idle(void) mwait(cx->address, 0); } } - else if ( (current_cpu_data.x86_vendor & + else if ( (current_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) && cx->entry_method =3D=3D ACPI_CSTATE_EM_SYSIO ) { @@ -1042,8 +1042,8 @@ static void acpi_processor_power_init_bm_check(struct= acpi_processor_flags *flag flags->bm_check =3D 0; if ( num_online_cpus() =3D=3D 1 ) flags->bm_check =3D 1; - else if ( (c->x86_vendor =3D=3D X86_VENDOR_INTEL) || - ((c->x86_vendor =3D=3D X86_VENDOR_AMD) && (c->x86 =3D=3D 0x1= 5)) ) + else if ( (c->vendor =3D=3D X86_VENDOR_INTEL) || + ((c->vendor =3D=3D X86_VENDOR_AMD) && (c->family =3D=3D 0x15= )) ) { /* * Today all MP CPUs that support C3 share cache. @@ -1059,7 +1059,7 @@ static void acpi_processor_power_init_bm_check(struct= acpi_processor_flags *flag * is not required while entering C3 type state on * P4, Core and beyond CPUs */ - if ( c->x86_vendor =3D=3D X86_VENDOR_INTEL ) + if ( c->vendor =3D=3D X86_VENDOR_INTEL ) flags->bm_control =3D 0; } =20 @@ -1415,12 +1415,12 @@ static void amd_cpuidle_init(struct acpi_processor_= power *power) if ( vendor_override < 0 ) return; =20 - switch ( c->x86 ) + switch ( c->family ) { case 0x1a: case 0x19: case 0x18: - if ( boot_cpu_data.x86_vendor !=3D X86_VENDOR_HYGON ) + if ( boot_cpu_data.vendor !=3D X86_VENDOR_HYGON ) { default: vendor_override =3D -1; @@ -1647,7 +1647,7 @@ static int cf_check cpu_callback( break; =20 case CPU_ONLINE: - if ( (boot_cpu_data.x86_vendor & + if ( (boot_cpu_data.vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) && processor_powers[cpu] ) amd_cpuidle_init(processor_powers[cpu]); diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/a= cpi.c index d0ca660db1..de67f1aee2 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -454,7 +454,7 @@ static int cf_check acpi_cpufreq_cpu_init(struct cpufre= q_policy *policy) =20 /* Check for APERF/MPERF support in hardware * also check for boost support */ - if (c->x86_vendor =3D=3D X86_VENDOR_INTEL && c->cpuid_level >=3D 6) + if (c->vendor =3D=3D X86_VENDOR_INTEL && c->cpuid_level >=3D 6) on_selected_cpus(cpumask_of(cpu), feature_detect, policy, 1); =20 /* diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufre= q/cpufreq.c index 5740c0d438..9ef62b3538 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -133,7 +133,7 @@ static int __init cf_check cpufreq_driver_init(void) =20 ret =3D -ENOENT; =20 - switch ( boot_cpu_data.x86_vendor ) + switch ( boot_cpu_data.vendor ) { case X86_VENDOR_INTEL: for ( i =3D 0; i < cpufreq_xen_cnt; i++ ) @@ -252,7 +252,7 @@ __initcall(cpufreq_driver_late_init); int cpufreq_cpu_init(unsigned int cpu) { /* Currently we only handle Intel, AMD and Hygon processor */ - if ( boot_cpu_data.x86_vendor & + if ( boot_cpu_data.vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD | X86_VENDOR_HYGON) ) return cpufreq_add_cpu(cpu); =20 diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufr= eq/powernow.c index beab6cac36..55166eac72 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -143,7 +143,7 @@ static void amd_fixup_frequency(struct xen_processor_px= *px) int index =3D px->control & 0x00000007; const struct cpuinfo_x86 *c =3D ¤t_cpu_data; =20 - if ((c->x86 !=3D 0x10 || c->x86_model >=3D 10) && c->x86 !=3D 0x11) + if ((c->family !=3D 0x10 || c->model >=3D 10) && c->family !=3D 0x11) return; =20 val =3D rdmsr(MSR_PSTATE_DEF_BASE + index); @@ -157,7 +157,7 @@ static void amd_fixup_frequency(struct xen_processor_px= *px) =20 fid =3D val & 0x3f; did =3D (val >> 6) & 7; - if (c->x86 =3D=3D 0x10) + if (c->family =3D=3D 0x10) px->core_frequency =3D (100 * (fid + 16)) >> did; else px->core_frequency =3D (100 * (fid + 8)) >> did; --=20 2.51.1 From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419830; cv=pass; d=zohomail.com; s=zohoarc; b=aSNdRmeGbrenYIYfqBQbPFjbfpUNx871G5hqWwAcK9PlqA/ufd0o1wO8uMh4qtP/uy30ZI7LmFJO8S6tp2l6/DmUosv8vfpxvS2Qxst4mNI2ZLBd5/vJqWmP4I+0ST4itzr3uUN/7+SK7xjhmLY/V4+fUzh3hU4+KksGRpadDQs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419830; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zKvNKrMMq+iJ/izQetqNBCBeOqEbJlez3gi0nUvgvwo=; b=mp767b2wjJl0xO6IyvGU3EemIYs8s+KWsBNml835WA66HG7aoTfLT7Lsj2Q3EhaViPOl0ZdSouYbWPK95JxVEGL3NjIfX4ccc8KfF8Tx6OMd3N/OnrSX0sF0ifceIzzGzfOwsQOq0VBiHcfPhL1ilNi5WvjzFqi9ekkQjIs9PmM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773419830241155.45178633761066; Fri, 13 Mar 2026 09:37:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253997.1550009 (Exim 4.92) (envelope-from ) id 1w15VQ-0005Gl-Ai; Fri, 13 Mar 2026 16:36:56 +0000 Received: by outflank-mailman (output) from mailman id 1253997.1550009; Fri, 13 Mar 2026 16:36:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VQ-0005GU-6h; Fri, 13 Mar 2026 16:36:56 +0000 Received: by outflank-mailman (input) for mailman id 1253997; Fri, 13 Mar 2026 16:36:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VP-00040A-Fu for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:36:55 +0000 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azlp170100001.outbound.protection.outlook.com [2a01:111:f403:c110::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d75fe006-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:36:53 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH2PR03MB5271.namprd03.prod.outlook.com (2603:10b6:610:95::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.17; Fri, 13 Mar 2026 16:36:46 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:36:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: d75fe006-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N7JoNPxH48fj35dgdyeqjZkIo3VFqKVkXgplr8xQBO3d2xxEm/tvztb5ZARvw0uukrt/nLuSN6CFCK5frQGkfq6KLpLsAKOALoloqiJt7VNQuk3XP4rsa88/lf+QppD9AaibxwA6Dn8tU8lq7wYM7j4Zh1uc1fTuH1ntxudmiAvoG4+abEmvty26BkPxV/h/4B/1NIc/53tMMYhFtYR2tQUgCZ1XqhvEyvH3oK2rRS3xBeyBn69PuM4FjRn5YPlvfGwxGqlDkR7yeUxJqLz59pdK/O9/Eei0Iw5CMOmxD3ORGmozi8xmia07yONmfuuGIJ0+208KBlLhGeuLR2dScg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=zKvNKrMMq+iJ/izQetqNBCBeOqEbJlez3gi0nUvgvwo=; b=uk/9HA3EdRKnlrqG1OJiL0X7WcF/IW0/tPfqr1sQRWvDfqrrqb+jeCu1ZlgiUR/uo1q8bBQ+8AzGyWx1h8mUZqLX+KowhZbSIjFl30JbG6fs9Nff54bUiZolifkDTDrgqjr+ZNwCQL+pFlvh7i+6UavOQQr+BgqWRScCC/UTMLhECgn1Qs1NwoHhkXiUkSIKkKgOiCaXKwhbIwuI3WmS6v8KJMFVM0VJ0fNBDTuJZLatj2KEqOrzGucZX0IaMEeMYzLMmBXCCZkCaXCKUVlN034Lwtt9LDjIovbnOaHQ1eNo0FLOgyF1eHR21GGNuaEvkBFDfqt+aLv6nCn6uJt2SQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zKvNKrMMq+iJ/izQetqNBCBeOqEbJlez3gi0nUvgvwo=; b=cZAvpEzNJBY1rrMRCeYMSf0sQiZ+KzaY8m4uQtlDZ5cqQNt35tsAKc9XfcAg7NdiKIWJohagW7hpoIt6ZpGRt1AYqDb6PkHiPtKPJYbxg5bTUAHjncDqGLOELJuQU0LOS6uuOVhDxoOdP2JngyXC2LhroHh22v7LfZVgW+lRbBs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 4/7] x86: Remove Intel 0x65, 0x6e, 0x5d from VMX code Date: Fri, 13 Mar 2026 16:36:27 +0000 Message-ID: <20260313163630.1073019-5-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P123CA0028.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600::16) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH2PR03MB5271:EE_ X-MS-Office365-Filtering-Correlation-Id: 3825baf0-e1a8-4b41-fe06-08de811eb975 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: pbkr5dipB2INxc1S0hkt4JH2SQeFUF23E3MtRq3kZfW/g+INUQspug16zCyyTU6f98FtY4A8xKkTDYuATsw6h6N36o3pApc78wkkGK+kCQ58tyE3b/2KKxpCQWSr5/HRcVKi8Gb7sIK6sS1f17Ds/EdGmD6DEM0qDH8hLo+7iPShKIrDNNDqzR+QiNdiOo4dHv10HNNMaeWgCOnBP4AtyUAsTfnFW0N+m2FAXEsqDIEgpYtLrYyC8hdP2fvPWNGj/VYpyRahDRPUudOzEErt/fcud9iYjnUWuPY+zwAyIUxtP/fK6htD8LGRqQeSi6OrcDqfh4IJggTySrfv1ciFd0lsAIutHkZKJyBiQe3ido7GRuy6P/QTppcQcFiN/BG/f0t27Afe+ta1wm0rlV4F9hiGB162weaRCUGAZP243buvx1DaYAejCHuZ1VScY7YPgLDVttJcdRetC2JKtRJch7CZnuIjtEo4g08qO42NqLe9HFkmTfrzeK1u8l6ncO2h+S2K4cI6KtUkdQmPDev2YabipURHTNmXEh/KwbrjZqQhKiCqrUM7eg4gm8gS+I0PTxwPN0T1tc2HaB6SGr+Lkn/U6JboG5JiG27iWEI327npOZnUzeZbS3VCrtpMKpsuFyVHhjDkLhjDyU98K6IsIhNsE7o+pSIpK8DhJuZY0lfCOhbqTmph6v3lTwoQN39KYHYEOKkghfW4kMCwsAnQhddnzaHD68doGDdtIToynXE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Y3P6hoCSrWmXs0cSCGtF5b4fbl1jcEDQC2VN25ocmCZ1YiRbdCjju7KtktCF?= =?us-ascii?Q?cNjBbzlFNNqbSKCBPDb4Q+40n5s8KztPIHSvQoA3bra5ikUu/1UX6lVrZPrn?= =?us-ascii?Q?sRVzL/xCp8eOlgtqFBZUFsjsCVFM0g4niCzv8+WXI6Rc8CuNluIG6J8Yvj+x?= =?us-ascii?Q?mbFdcIzRhY2v2vJ8Cn09dWlUpLC+L9BH+jjQU2100JYn8XzAelOcFv2WK77Y?= =?us-ascii?Q?d1QkxKtYfYKoqn5y/kp7NKRmUPBI9RynucMhHooPC4SSdQaeBv4N14d7tY/k?= =?us-ascii?Q?mnmoOH719PdS7vL0rV8n2Mw+NYxe7XhaCniZW3tuhlu278CnRqpipkUqn882?= =?us-ascii?Q?JfWOOIL1U98I9scEYePcXLwe0pnLBPNvFXO+alT/r1a1sbP62Zky6EPE+NsC?= =?us-ascii?Q?mJzfJZk7DFBlnx6tqlLpPPTbDs0KRnvj3gyej3UnclD/RbbTQx7byPlH4bpP?= =?us-ascii?Q?Qdjjc11J8kVJuQVCpdbk3tfj3ePmbwd702RXQDVL2YkTsPPlhBItwI5sHUH2?= =?us-ascii?Q?2cD9Sl1apf2u+ZyH4XXImGngxwIUoH1l+tbo/lcrfR5KF0/s+oR+z82tIQ2H?= =?us-ascii?Q?aIJp/raqa7pBMxxsC2kHQDSF0szpHYOEGrYIro/zol769lr9Wjrm/RAXwevb?= =?us-ascii?Q?y21eQRsf9Bst64mWjE+GyyUlJSuD66qdEyYYOIy7NAEDE3CsUhqz0dFf/pg3?= =?us-ascii?Q?TmMGXO2cYMVEnl78fggesh8MSEtCZK7IdWaqJgLSnrZUtIf/odj4RH1jV4yg?= =?us-ascii?Q?C488gAyrDZHdWU4Z/jWc9VfHNnqK636BGBM1LnArIhF5eHnOFilUYe6ewKbC?= =?us-ascii?Q?EMNhENJcfl4VNSiJw/6f2yvKBxHVhP3NClpizukb5j6G1P6BI8Xun6Jx3yw2?= =?us-ascii?Q?G0IYX3GqQ/glgQLqqpwLcCF0jmvd/7AQ6Jpudu2y5V5TiHV+NDGOhCu7JJOc?= =?us-ascii?Q?qjrAl6MHEpoBmShElMMmItCe0htQrsp6gCZIAe192dWS9IwasH+uwzZHNPeD?= =?us-ascii?Q?CwivpnYcK2qR/z3SGQ2Z03vv+h3ZQHhgNo1IIIuH+z5IeIOLw3MYXqZOHedv?= =?us-ascii?Q?Q1z0+HqjJygxgZgbJDwOJvE/dKBFbkA2/NwbYVsYqYX1PK+vJjvVGdZp4o7H?= =?us-ascii?Q?mbxTFvIAOltwBS9GQynB72yXX5O1zQMCfDyUjnZ0ijk1C9vnNsNyjYa8kPYm?= =?us-ascii?Q?90GlMvW7Byz8k2LisIxMn33W1fX8SvNVCgp7hqR/KHqeUI2XKwnUxLcnDUA1?= =?us-ascii?Q?NW3I1jNuDSRiO8eN0DmdM1J5fkfk5jmgnBEtJ9XdRF9yWx3+asTFGTuOZfmc?= =?us-ascii?Q?Pfr6TVu7I2/d4DgtSvnTb4ksNpjRsLXYCWyQtMLlbz6M8QHFiwCT7heNGrWF?= =?us-ascii?Q?ialQq+PlxT0O9WFHtmMWsUMArN8E5j3ON4lQuSapxyz9DxTz68SdiO+iRdxM?= =?us-ascii?Q?6p4gngC5+HPLQhM7n9dzAj0KLZ2r2mYnxohxoKi2RB33yyIirww8uOMaXj8q?= =?us-ascii?Q?pT8y4B/r0ewMNjuerRRfjJpEKjM7j4lmYiqDfG2TizUgW0Mk+qIIhfl9RGfK?= =?us-ascii?Q?wZxZ6DqrMLKNsspER3L08CHk2MJnm2yuNNcQ2l7Nsf1nnouSF01Kko25/kcj?= =?us-ascii?Q?y2GjagDBWaV3O3lcKjDHBZVFOovAv3OiXavmHetpRCr+Z8OMtCgl1BAZCHp0?= =?us-ascii?Q?xRDbbnA1SCjfJz156TzGWQjdNGk09jujCunsqlp3beEIaCoVi7gzZDS6wxRz?= =?us-ascii?Q?o8Kv1uHIpg=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3825baf0-e1a8-4b41-fe06-08de811eb975 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:36:49.5714 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sty4+Y5YKAgLAXc6YQvd7+EGQaYQDZvd335o6QpOP/1i+fJzlZvtvqDTkuUUVAHCeX1O5On78018vWLI50ONAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5271 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419831547154100 Content-Type: text/plain; charset="utf-8" These Intel models were used in telecoms and not regarded as general purpose processors. - 0x5d (SoFIA 3G Granite/ES2.1) - 0x65 (SoFIA LTE AOSP) - 0x6e (Cougar Mountain) Model 06_5DH does appear in the Intel Software Developers Manuals but Linux has declined to take these models into intel-family.h because they're not general purpose. Signed-off-by: Kevin Lampis --- Changes in v2: - New patch based on review comments Changes in v3: - Expanded the commit message --- xen/arch/x86/hvm/vmx/vmx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 82c55f49ae..e45060d403 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -550,7 +550,7 @@ static const struct lbr_info *__init get_model_specific= _lbr(void) case 0x1c: case 0x26: case 0x27: case 0x35: case 0x36: return at_lbr; /* Silvermont */ - case 0x37: case 0x4a: case 0x4d: case 0x5a: case 0x5d: + case 0x37: case 0x4a: case 0x4d: case 0x5a: /* Airmont */ case 0x4c: return sm_lbr; @@ -3126,10 +3126,7 @@ static bool __init has_if_pschange_mc(void) case 0x4a: /* Merrifield */ case 0x5a: /* Moorefield */ case 0x5c: /* Goldmont */ - case 0x5d: /* SoFIA 3G Granite/ES2.1 */ - case 0x65: /* SoFIA LTE AOSP */ case 0x5f: /* Denverton */ - case 0x6e: /* Cougar Mountain */ case 0x75: /* Lightning Mountain */ case 0x7a: /* Gemini Lake */ case 0x86: /* Jacobsville */ --=20 2.51.1 From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419835; cv=pass; d=zohomail.com; s=zohoarc; b=YdQzELpoLChtfgr6evVxRDeZac0r93Aeg7jAGQl/YV3rYjUXNd8Gbo59omxY521Xn25ZWZQcSBSDTTiR3QybukK6cRbNRPpMfNQgNnCGHYThCoB/6SOEUcnBbSvIb3vsRhpsBUgagEGrn29mMIFHkm3vEMwUou3I6oRDTxR+Wz4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419835; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rjEqapidBPBMCON99YM5//X9D18Zsigu9iVOPUrCt94=; b=bX8oSucCtwVNmsodVDtvwpAe9sZMcP4WJNKahbEwSjJFZF+wujZ1Ut9ksrruChdCmXGmg0wLJ+D+qWep3isqqlGlaIxtoJ94I58Ih07rjFNgy1I2zt6oMvypCPmcamBGrqw6uxlHom+WmMb3RpvWNpIp2ZJcr3w/9u05dy5cliM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773419835725202.768055942582; Fri, 13 Mar 2026 09:37:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253999.1550018 (Exim 4.92) (envelope-from ) id 1w15VV-0005hb-KX; Fri, 13 Mar 2026 16:37:01 +0000 Received: by outflank-mailman (output) from mailman id 1253999.1550018; Fri, 13 Mar 2026 16:37:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VV-0005hL-FX; Fri, 13 Mar 2026 16:37:01 +0000 Received: by outflank-mailman (input) for mailman id 1253999; Fri, 13 Mar 2026 16:37:00 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15VU-00040A-IX for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:37:00 +0000 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azlp170100001.outbound.protection.outlook.com [2a01:111:f403:c110::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id da26976c-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:36:58 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH2PR03MB5271.namprd03.prod.outlook.com (2603:10b6:610:95::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.17; Fri, 13 Mar 2026 16:36:50 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:36:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: da26976c-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BQ/7PY4vtnUg1fkLeDaNUSml3FfDlbDbCLBcPeyuRBGo5voqIORNS4LamcFU4tNzI+vymhlNKfRTcWW8Wil4ozZrqPguUPhihP8X2EeLzwOggshf8rXikZy60+13GCPfYClh0ghA2TxjWFE+zcKosHcQoLI2SixU1AU8A4mVgKEXWLM9F20SoJQymWt6E6ApTMhT39XySJtnmiPdTfe4L6r/O91ndhXQfeoSWExoro9C8D9qivk6DZlSkb69AgUIt68NwXlG28MbWJps1lCl3r2dyE88HM5DD+uR2AgIDbL7PGzpkqLAwXSMPiGtr0f9GmEDrl0k+h091RNnTOzTbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=rjEqapidBPBMCON99YM5//X9D18Zsigu9iVOPUrCt94=; b=whwarTJxqTv91pruyBqUe6GnYjnOKj6wtgGF74WubcJ9VyI8V/xfRsRDeLfW8o+Szuk+ZaMXt0gctT3O0TJE3uIQEUzzwoO/O7B7zI9QdtxnH0V5DDi3a/uluYzsyTLG2dObql7iMYuYr6afHT1AgeqS/9lPZdbHdzaY31/rWTzP7d1OcXq5WCD1dGwflh90sXEXJiOt4hwL9Ow0M3ZipdU0oXCIAh02dPWxCHiUR/iUx6a7w+rpFoeRbPAD6mNuCqgOdWuOI7w0eT9iglNBra1qiiPUpcCR8gewAvdlsTlCCUY6ABI9PorQc9oGuEDzDCN6ThwCYgD9F8PfUbHJXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rjEqapidBPBMCON99YM5//X9D18Zsigu9iVOPUrCt94=; b=eoHabhJzRZocPZBgTvVqZM01rVg6NSAilD/jneCjuXonCi+EeENBtTwWy2ek/k4IU8n3zQB1JgWkvkD48NnEJRt/VuiGDHeQ7b4Gk9QG1JIHzkvRFpGpPSg1rXvzRtCFv9M/yaITqX8LxbjHsiIAGmM8gXGyAawVj/nQv+uoEaM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 5/7] x86: Remove x86 prefixed names from hvm code Date: Fri, 13 Mar 2026 16:36:28 +0000 Message-ID: <20260313163630.1073019-6-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO6P123CA0029.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:313::14) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH2PR03MB5271:EE_ X-MS-Office365-Filtering-Correlation-Id: d536bb8f-6cf9-46af-cd7b-08de811ebc37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: pcLtY/ZvD648ObQVtI97ovr3dbVVy5nNFYQpmzXlKN+LxmuMwM8EHlG4FK75WtIdzfYBQ7XptYfDo68TXlMiagpl7sOQA5O5Lt3Zf0J0ukeSHgTLoHK/l8Ancbal3pwg16zWzyofZPhd52ISAZdwmU773/0Fwqd/PHQXSmo/i1drYaR5S9z9tZDuaGmYu1sXkw3UqgysqB2x2CMTS0T5lW5aG4Wl551lQtZae3OSPXXiJJb5QEeFh2Nh3l3WfUAwdF+8nWQnon8sF26uEPu7t8ms/E0EBuWyG921U5HJOzCyO/9AvzSXpbNmOiSWHLyyM0pdNJH5FFKslMdnF8VEkmTGzgnI5UeyQtBs627eaHAEp67Z272LHKYJ5G9FL/3kJlWKWX/A0YNE5wf885d2YRwLtQt/zf9YYVZmfpPBC1L1Qyjpgr8LzIRxf7yaqTHxD/dISGX5GusqhLVtlMImKLfnK/25DM/VswqcGuh/bhE0teP3TzEzE+M/nFuJfV/p2Qss8gWyd1u9dwc2I1cBDbrp3o/q3t/cKRKKV/Wuxn6LqEvC9TiO5wNbSq5N/N6NY+i+kZlSLLTjL3y1NUItJ47DTOdJzkrRbEZ3SKvpGxmRez/OvDszDjU1ip2KtgJW5JFZ+XiPJHo+sQGNkCxQc8R2H0mV2VA7PsmCYNDAzEHIjGiAnJ6uZ1YTfGjuA/wJrD+3n3RSg8ejSaxWkpiX1nCYakme31Hj5n2XykEk5sc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TXvnf4TYhQeI79tFgT+9jU3x2/8CBQn5aa+x6nu6B62BhW6/ejENd6rL++C+?= =?us-ascii?Q?ciTbKjiLiv+F39hshmFizljRe/3yLAO7eQDXn9DKg2gaQ9YUNTNLatIjKN6T?= =?us-ascii?Q?xYP6Xr0KJ+3kJOGnTcyPrwSFQo7etlYjc+kXm1JsmQlXyIhvvwLwV94pEgDh?= =?us-ascii?Q?puB/JDQQJbItlnZxxDy7cyy3IUA0U2ag8vj23xUV3eYv/eooPZ8wQPF+pzP+?= =?us-ascii?Q?hd8CrUScEaWmJ9Dz1+TTygG2/56R4e/nlZh5Xfm07n06mn8j/FstJYmr4aPP?= =?us-ascii?Q?BGnM+eJgW7z6CZwKnqGnEo13HHWXSOZ2vxxulrDvuXpc1Kar4NOiTV1AT6Ch?= =?us-ascii?Q?MPyjcs/Rasjn5FieBCpFz1xKp7Kev9XoIULlgGeQXGEpUekXH0s0Dh9wsZw3?= =?us-ascii?Q?SBBV3+AhBGQCk6s3sbpmBOu4mF9iXypZOxnxGUqzKwIAQ3Bdb0ETRcuOw5Cp?= =?us-ascii?Q?WFTe95yVCP/no8QIZFeblCr9soFkFJ9Hs/0iLnwwY6F+3tRTWEhYpe4IChP5?= =?us-ascii?Q?7RxTGLLyPJDIPT420Lc/be/5IsB5MsNP0ZuAc08BBnFb2GiUursn9kZlYbsX?= =?us-ascii?Q?Be1aJPLOBFrDw5d3nXiDvMnYtDV+YJcE5yoRDtkTmu9Uef4s6EmbF2jCuOBD?= =?us-ascii?Q?7N4n6+fBZNJyT0bBQlVWUY94t7xoUXwOwVAuKhD8XhvPyuE36c9TXxOWnMcE?= =?us-ascii?Q?5HvHY5uS3XtpcxuAjqN86kUe39RB7ixM2WytyHDpMqLODSS9uqo80LQuNBFT?= =?us-ascii?Q?xZSGgdZ2zpq7ireFc4QtLOaIDn5RrvBxyM+fHx5VQUBvmPxACDsRRHMSLqe9?= =?us-ascii?Q?Ze4f2Cc7VeO68NHVgMb1BKXIF35Fg5XzPByxArHwbIVXUOXTbtKLXzoPtlfh?= =?us-ascii?Q?gOXG0rzk81Lbp+q6pEeakdXvN3BYWnx8hvkT12mLHDRMvg6mhLm2jNX3ZsBA?= =?us-ascii?Q?MfAuVQah5wRHQA7deBP6Ymi0XLRTEq/4xrzHK3+jQhnURY2i1NiXqUYJLYSw?= =?us-ascii?Q?vSiergfbAzo+4pwvBf8w8ve8uPk06xvVlDISBxThBSQ6Js/KKO8uO+LsxNWZ?= =?us-ascii?Q?1GbkBkyqLY3zpwJW+fydOBBmARk5Kjwfr7UtzUDYuLBWjZGS7yjP6p7rw3oL?= =?us-ascii?Q?ysAornTOxgByiQHA2UOb+o/BxPshu2efPoF3QsAwNCb9H1KJl9xrbdN4n5xY?= =?us-ascii?Q?+C/wuVoH0dPDUS2Q17vKj55r/6cHC7PVZeW6UdhGvvk8YQouft4EmTqjkfQk?= =?us-ascii?Q?ULo9SBgZemfTk73QPMr4QPbxMxgtBItG22IzdRjRwk+qU4ec9eP9t4DsbLxF?= =?us-ascii?Q?Jj/jANG7kBu89/12tHsD4Lu8o2eoM4qvePq2qYkySPZfXgbz8qBaVOjcjn7i?= =?us-ascii?Q?Y93fZVCSJ7lNSjlU2zvse4K7gi7Nb5IjnUYDZh6iJhbwLp3O/55X/IJxVYpG?= =?us-ascii?Q?JSuFmyNlWFhZNJryuykrt5w1PW6HMARfH0R46vszAe1NbCn105pJvI+4eyPZ?= =?us-ascii?Q?e+Qq4umaTw/PkiLed+r4MTiDUGzmKcn5XZyvhIhiBJLJkErGATNoe+eyGFcW?= =?us-ascii?Q?7zIolprBUH+R5e++mOSBIrZVM+MrOQ3kqpuk/dM6geGPzKX1sLHKBTE24gpc?= =?us-ascii?Q?ZOhRi3PR2BjX1aFAWWtWt4tNALbHzvkehJSA9Ny+BrnqpuLMahFWejCvDlxP?= =?us-ascii?Q?m0XbSUTIjHelbHg21IZZy+o29gyL3TVTjeIFNaNu62YkJsRCnlhIIglNCnjv?= =?us-ascii?Q?kF9H2oKsyQ=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: d536bb8f-6cf9-46af-cd7b-08de811ebc37 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:36:54.0910 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DxXOP35SiiaCj9nXP8iHQgbgarYx8HfAhyVkQtM/5O52PhaicC9y12vnaj24aQ7bZs3i5eN151MbV6Y+Xzgy2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5271 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419836761158500 Content-Type: text/plain; charset="utf-8" struct cpuinfo_x86 .x86 =3D> .family .x86_vendor =3D> .vendor .x86_model =3D> .model .x86_mask =3D> .stepping No functional change. This work is part of making Xen safe for Intel family 18/19. Signed-off-by: Kevin Lampis Acked-by: Jan Beulich --- Changes in v2: - Group Silvermonts, Airmonts, Goldmonts in the switch statement - Restore Errata info in lbr_tsx_fixup_check() and ler_to_fixup_check() Changes in v3: - No changes --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/hvm/svm/svm.c | 6 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 +- xen/arch/x86/hvm/vmx/vmx.c | 277 ++++++++++++++++++------------------ 4 files changed, 146 insertions(+), 143 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 4d37a93c57..6ad52e1197 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3850,7 +3850,7 @@ void hvm_ud_intercept(struct cpu_user_regs *regs) { struct vcpu *cur =3D current; bool should_emulate =3D - cur->domain->arch.cpuid->x86_vendor !=3D boot_cpu_data.x86_vendor; + cur->domain->arch.cpuid->x86_vendor !=3D boot_cpu_data.vendor; struct hvm_emulate_ctxt ctxt; =20 hvm_emulate_init_once(&ctxt, opt_hvm_fep ? NULL : is_cross_vendor, reg= s); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 243c41fb13..5e4d8b3c52 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -590,7 +590,7 @@ static void cf_check svm_cpuid_policy_changed(struct vc= pu *v) u32 bitmap =3D vmcb_get_exception_intercepts(vmcb); =20 if ( opt_hvm_fep || - (v->domain->arch.cpuid->x86_vendor !=3D boot_cpu_data.x86_vendor)= ) + (v->domain->arch.cpuid->x86_vendor !=3D boot_cpu_data.vendor) ) bitmap |=3D (1U << X86_EXC_UD); else bitmap &=3D ~(1U << X86_EXC_UD); @@ -1057,7 +1057,7 @@ static void svm_guest_osvw_init(struct domain *d) * be conservative here and therefore we tell the guest that erratum 2= 98 * is present (because we really don't know). */ - if ( osvw_length =3D=3D 0 && boot_cpu_data.x86 =3D=3D 0x10 ) + if ( osvw_length =3D=3D 0 && boot_cpu_data.family =3D=3D 0x10 ) svm->osvw.status |=3D 1; =20 spin_unlock(&osvw_lock); @@ -1805,7 +1805,7 @@ static int cf_check svm_msr_read_intercept( if ( !rdmsr_safe(msr, msr_content) ) break; =20 - if ( boot_cpu_data.x86 =3D=3D 0xf ) + if ( boot_cpu_data.family =3D=3D 0xf ) { /* * Win2k8 x64 reads this MSR on revF chips, where it wasn't diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index c2e7f9aed3..d3b1730f1d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -2163,8 +2164,7 @@ int __init vmx_vmcs_init(void) =20 if ( opt_ept_ad < 0 ) /* Work around Erratum AVR41 on Avoton processors. */ - opt_ept_ad =3D !(boot_cpu_data.x86 =3D=3D 6 && - boot_cpu_data.x86_model =3D=3D 0x4d); + opt_ept_ad =3D !(boot_cpu_data.vfm =3D=3D INTEL_ATOM_SILVERMONT_D); =20 ret =3D _vmx_cpu_up(true); =20 diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index e45060d403..3d308e149c 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -502,72 +503,74 @@ static const struct lbr_info *__ro_after_init model_s= pecific_lbr; =20 static const struct lbr_info *__init get_model_specific_lbr(void) { - switch ( boot_cpu_data.x86 ) + switch ( boot_cpu_data.vfm ) { - case 6: - switch ( boot_cpu_data.x86_model ) - { - /* Core2 Duo */ - case 0x0f: - /* Enhanced Core */ - case 0x17: - /* Xeon 7400 */ - case 0x1d: - return c2_lbr; - /* Nehalem */ - case 0x1a: case 0x1e: case 0x1f: case 0x2e: - /* Westmere */ - case 0x25: case 0x2c: case 0x2f: - /* Sandy Bridge */ - case 0x2a: case 0x2d: - /* Ivy Bridge */ - case 0x3a: case 0x3e: - /* Haswell */ - case 0x3c: case 0x3f: case 0x45: case 0x46: - /* Broadwell */ - case 0x3d: case 0x47: case 0x4f: case 0x56: - return nh_lbr; - /* Skylake */ - case 0x4e: case 0x5e: - /* Xeon Scalable */ - case 0x55: - /* Cannon Lake */ - case 0x66: - /* Goldmont Plus */ - case 0x7a: - /* Ice Lake */ - case 0x6a: case 0x6c: case 0x7d: case 0x7e: - /* Tiger Lake */ - case 0x8c: case 0x8d: - /* 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: - return at_lbr; - /* Silvermont */ - case 0x37: case 0x4a: case 0x4d: case 0x5a: - /* Airmont */ - case 0x4c: - return sm_lbr; - /* Goldmont */ - case 0x5c: case 0x5f: - return gm_lbr; - } - break; - - case 15: - switch ( boot_cpu_data.x86_model ) - { - /* Pentium4/Xeon with em64t */ - case 3: case 4: case 6: - return p4_lbr; - } - break; + case INTEL_CORE2_DUNNINGTON: + case INTEL_CORE2_MEROM: + case INTEL_CORE2_PENRYN: + return c2_lbr; + + case INTEL_NEHALEM: + case INTEL_NEHALEM_EP: + case INTEL_NEHALEM_EX: + case INTEL_NEHALEM_G: + case INTEL_WESTMERE: + case INTEL_WESTMERE_EP: + case INTEL_WESTMERE_EX: + case INTEL_SANDYBRIDGE: + case INTEL_SANDYBRIDGE_X: + case INTEL_IVYBRIDGE: + case INTEL_IVYBRIDGE_X: + case INTEL_HASWELL: + case INTEL_HASWELL_G: + case INTEL_HASWELL_L: + case INTEL_HASWELL_X: + case INTEL_BROADWELL: + case INTEL_BROADWELL_D: + case INTEL_BROADWELL_G: + case INTEL_BROADWELL_X: + return nh_lbr; + + case INTEL_SKYLAKE: + case INTEL_SKYLAKE_L: + case INTEL_SKYLAKE_X: + case INTEL_CANNONLAKE_L: + case INTEL_ATOM_GOLDMONT_PLUS: + case INTEL_ICELAKE: + case INTEL_ICELAKE_D: + case INTEL_ICELAKE_L: + case INTEL_ICELAKE_X: + case INTEL_TIGERLAKE: + case INTEL_TIGERLAKE_L: + case INTEL_ATOM_TREMONT_D: + case INTEL_KABYLAKE: + case INTEL_KABYLAKE_L: + case INTEL_COMETLAKE: + case INTEL_COMETLAKE_L: + return sk_lbr; + + case INTEL_ATOM_BONNELL: + case INTEL_ATOM_BONNELL_MID: + case INTEL_ATOM_SALTWELL: + case INTEL_ATOM_SALTWELL_MID: + case INTEL_ATOM_SALTWELL_TABLET: + return at_lbr; + + case INTEL_ATOM_SILVERMONT: + case INTEL_ATOM_SILVERMONT_MID: + case INTEL_ATOM_SILVERMONT_D: + case INTEL_ATOM_SILVERMONT_MID2: + case INTEL_ATOM_AIRMONT: + return sm_lbr; + + case INTEL_ATOM_GOLDMONT: + case INTEL_ATOM_GOLDMONT_D: + return gm_lbr; + + case INTEL_P4_PRESCOTT: + case INTEL_P4_PRESCOTT_2M: + case INTEL_P4_CEDARMILL: + return p4_lbr; } =20 return NULL; @@ -804,7 +807,7 @@ static void cf_check vmx_cpuid_policy_changed(struct vc= pu *v) int rc =3D 0; =20 if ( opt_hvm_fep || - (v->domain->arch.cpuid->x86_vendor !=3D boot_cpu_data.x86_vendor)= ) + (v->domain->arch.cpuid->x86_vendor !=3D boot_cpu_data.vendor) ) v->arch.hvm.vmx.exception_bitmap |=3D (1U << X86_EXC_UD); else v->arch.hvm.vmx.exception_bitmap &=3D ~(1U << X86_EXC_UD); @@ -3073,68 +3076,68 @@ static bool __init has_if_pschange_mc(void) * IF_PSCHANGE_MC is only known to affect Intel Family 6 processors at * this time. */ - if ( boot_cpu_data.x86_vendor !=3D X86_VENDOR_INTEL || - boot_cpu_data.x86 !=3D 6 ) + if ( boot_cpu_data.vendor !=3D X86_VENDOR_INTEL || + boot_cpu_data.family !=3D 6 ) return false; =20 - switch ( boot_cpu_data.x86_model ) + switch ( boot_cpu_data.vfm ) { /* * Core processors since at least Nehalem are vulnerable. */ - case 0x1f: /* Auburndale / Havendale */ - case 0x1e: /* Nehalem */ - case 0x1a: /* Nehalem EP */ - case 0x2e: /* Nehalem EX */ - case 0x25: /* Westmere */ - case 0x2c: /* Westmere EP */ - case 0x2f: /* Westmere EX */ - case 0x2a: /* SandyBridge */ - case 0x2d: /* SandyBridge EP/EX */ - case 0x3a: /* IvyBridge */ - case 0x3e: /* IvyBridge EP/EX */ - case 0x3c: /* Haswell */ - case 0x3f: /* Haswell EX/EP */ - case 0x45: /* Haswell D */ - case 0x46: /* Haswell H */ - case 0x3d: /* Broadwell */ - case 0x47: /* Broadwell H */ - case 0x4f: /* Broadwell EP/EX */ - case 0x56: /* Broadwell D */ - 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 */ + case INTEL_NEHALEM_G: + case INTEL_NEHALEM: + case INTEL_NEHALEM_EP: + case INTEL_NEHALEM_EX: + case INTEL_WESTMERE: + case INTEL_WESTMERE_EP: + case INTEL_WESTMERE_EX: + case INTEL_SANDYBRIDGE: + case INTEL_SANDYBRIDGE_X: + case INTEL_IVYBRIDGE: + case INTEL_IVYBRIDGE_X: + case INTEL_HASWELL: + case INTEL_HASWELL_X: + case INTEL_HASWELL_L: + case INTEL_HASWELL_G: + case INTEL_BROADWELL: + case INTEL_BROADWELL_G: + case INTEL_BROADWELL_X: + case INTEL_BROADWELL_D: + case INTEL_SKYLAKE_L: + case INTEL_SKYLAKE: + case INTEL_SKYLAKE_X: + case INTEL_ICELAKE: + case INTEL_ICELAKE_L: + case INTEL_KABYLAKE_L: + case INTEL_KABYLAKE: + case INTEL_COMETLAKE: + case INTEL_COMETLAKE_L: return true; =20 /* * Atom processors are not vulnerable. */ - case 0x1c: /* Pineview */ - case 0x26: /* Lincroft */ - case 0x27: /* Penwell */ - case 0x35: /* Cloverview */ - case 0x36: /* Cedarview */ - case 0x37: /* Baytrail / Valleyview (Silvermont) */ - case 0x4d: /* Avaton / Rangely (Silvermont) */ - case 0x4c: /* Cherrytrail / Brasswell */ - case 0x4a: /* Merrifield */ - case 0x5a: /* Moorefield */ - case 0x5c: /* Goldmont */ - case 0x5f: /* Denverton */ - case 0x75: /* Lightning Mountain */ - case 0x7a: /* Gemini Lake */ - case 0x86: /* Jacobsville */ + case INTEL_ATOM_BONNELL: + case INTEL_ATOM_BONNELL_MID: + case INTEL_ATOM_SALTWELL_MID: + case INTEL_ATOM_SALTWELL_TABLET: + case INTEL_ATOM_SALTWELL: + case INTEL_ATOM_SILVERMONT: + case INTEL_ATOM_SILVERMONT_D: + case INTEL_ATOM_SILVERMONT_MID: + case INTEL_ATOM_SILVERMONT_MID2: + case INTEL_ATOM_GOLDMONT: + case INTEL_ATOM_GOLDMONT_D: + case INTEL_ATOM_GOLDMONT_PLUS: + case INTEL_ATOM_AIRMONT: + case INTEL_ATOM_AIRMONT_NP: + case INTEL_ATOM_TREMONT_D: return false; =20 default: printk("Unrecognised CPU model %#x - assuming vulnerable to IF_PSC= HANGE_MC\n", - boot_cpu_data.x86_model); + boot_cpu_data.model); return true; } } @@ -3428,23 +3431,23 @@ static void __init lbr_tsx_fixup_check(void) * fixed up as well. */ if ( cpu_has_hle || cpu_has_rtm || - boot_cpu_data.x86_vendor !=3D X86_VENDOR_INTEL || - boot_cpu_data.x86 !=3D 6 ) + boot_cpu_data.vendor !=3D X86_VENDOR_INTEL || + boot_cpu_data.family !=3D 6 ) return; =20 - switch ( boot_cpu_data.x86_model ) + switch ( boot_cpu_data.vfm ) { - case 0x3c: /* HSM182, HSD172 - 4th gen Core */ - case 0x3f: /* HSE117 - Xeon E5 v3 */ - case 0x45: /* HSM182 - 4th gen Core */ - case 0x46: /* HSM182, HSD172 - 4th gen Core (GT3) */ - case 0x3d: /* BDM127 - 5th gen Core */ - case 0x47: /* BDD117 - 5th gen Core (GT3) - BDW117 - Xeon E3-1200 v4 */ - case 0x4f: /* BDF85 - Xeon E5-2600 v4 - BDH75 - Core-i7 for LGA2011-v3 Socket - BDX88 - Xeon E7-x800 v4 */ - case 0x56: /* BDE105 - Xeon D-1500 */ + case INTEL_HASWELL: /* HSM182, HSD172 - 4th gen Core */ + case INTEL_HASWELL_X: /* HSE117 - Xeon E5 v3 */ + case INTEL_HASWELL_L: /* HSM182 - 4th gen Core */ + case INTEL_HASWELL_G: /* HSM182, HSD172 - 4th gen Core (GT3) */ + case INTEL_BROADWELL: /* BDM127 - 5th gen Core */ + case INTEL_BROADWELL_G: /* BDD117 - 5th gen Core (GT3) + BDW117 - Xeon E3-1200 v4 */ + case INTEL_BROADWELL_X: /* BDF85 - Xeon E5-2600 v4 + BDH75 - Core-i7 for LGA2011-v3 Socket + BDX88 - Xeon E7-x800 v4 */ + case INTEL_BROADWELL_D: /* BDE105 - Xeon D-1500 */ break; default: return; @@ -3473,19 +3476,19 @@ static void __init ler_to_fixup_check(void) * that are not equal to bit[47]. Attempting to context switch this v= alue * may cause a #GP. Software should sign extend the MSR. */ - if ( boot_cpu_data.x86_vendor !=3D X86_VENDOR_INTEL || - boot_cpu_data.x86 !=3D 6 ) + if ( boot_cpu_data.vendor !=3D X86_VENDOR_INTEL || + boot_cpu_data.family !=3D 6 ) return; =20 - switch ( boot_cpu_data.x86_model ) + switch ( boot_cpu_data.vfm ) { - case 0x3d: /* BDM131 - 5th gen Core */ - case 0x47: /* BDD??? - 5th gen Core (H-Processor line) - BDW120 - Xeon E3-1200 v4 */ - case 0x4f: /* BDF93 - Xeon E5-2600 v4 - BDH80 - Core-i7 for LGA2011-v3 Socket - BDX93 - Xeon E7-x800 v4 */ - case 0x56: /* BDE??? - Xeon D-1500 */ + case INTEL_BROADWELL: /* BDM131 - 5th gen Core */ + case INTEL_BROADWELL_G: /* BDD??? - 5th gen Core (H-Processor line) + * BDW120 - Xeon E3-1200 v4 */ + case INTEL_BROADWELL_X: /* BDF93 - Xeon E5-2600 v4 + * BDH80 - Core-i7 for LGA2011-v3 Socket + * BDX93 - Xeon E7-x800 v4 */ + case INTEL_BROADWELL_D: /* BDE??? - Xeon D-1500 */ ler_to_fixup_needed =3D true; break; } --=20 2.51.1 From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419874; cv=pass; d=zohomail.com; s=zohoarc; b=MQYl5tCid2DC7eNh4F6Zvw1tcbz5DDxzMXbF++xW2YBtlO1nPTJ+tPoFutHCe03FE5oTrW7k8hJJfRIxURsMVlDpETQj3GNZO5bdHnm3o7E88O7fwvDkZja785KPIaRm9OJzGg1R7PeCByvvQRqmrzcXkHh4c1yXDJSwr/NCpjY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419874; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8vfe7iZju8xm+2/r7rcAXdCT0DwXxs44MCyRUGYGVnc=; b=cF0i3YOTawBNsdzoqtPG1Yd+6iRTAilkYpxet9/NWvEjPIodoS5EjVy3RBZfuhNyOBR7r0tSviqKM1aKeB436ykTOWIKQm51C6nRZsClE9e7l4EljKLdzdI/EXjqPu+ObX0JYEfNvDPXD2izUNKAprJLKxaUVmhxNNntbGl3+xY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773419874479660.3046589787695; Fri, 13 Mar 2026 09:37:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1254053.1550072 (Exim 4.92) (envelope-from ) id 1w15W7-0000lG-Ur; Fri, 13 Mar 2026 16:37:39 +0000 Received: by outflank-mailman (output) from mailman id 1254053.1550072; Fri, 13 Mar 2026 16:37:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15W7-0000l9-Qz; Fri, 13 Mar 2026 16:37:39 +0000 Received: by outflank-mailman (input) for mailman id 1254053; Fri, 13 Mar 2026 16:37:39 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15Va-00040A-7a for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:37:06 +0000 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazlp170120005.outbound.protection.outlook.com [2a01:111:f403:c105::5]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dd861051-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:37:04 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH2PR03MB5271.namprd03.prod.outlook.com (2603:10b6:610:95::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.17; Fri, 13 Mar 2026 16:36:55 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:36:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: dd861051-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fjtSxWna1caQMNXSbYGG1e7WzEV0itBxQjTaeOVHTlbc5SK0Vg5q7Z5oVaLFBmZHfpMYeZ5LpLMsEDRFtJyTLFJJRxIAY86oAN8bXFVkK7pdggOlxqIvtpijKuj83CO6edISv3J1tOuckKU3UIzeUpYhbq/Mh3npqrpH0W5s4htvK2ikIQfuo4P8k5pik6QADtE692ue0DR/iiq8itJ8ClqEavvLDckUu14zgARPcDq0lmtoZy2vRs90cNVb3gBWTBdicx94GqvBe2SGISjekRARXIqQ9Au5FqZGhtZOColROcG+UBhEnJCC464Oy9WadGmKuwelBnsUp7Sr/DRewg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=8vfe7iZju8xm+2/r7rcAXdCT0DwXxs44MCyRUGYGVnc=; b=yYtr8EtYA2PiTQC9w6Ey5TmsjV7WiegYMIFiI36yVDbBi96/BQASfR2PXB3e9ml8+2i+DVRX4QbPUAWBKj0T5e/o/KKcKRuCreOC4yLAhfMvLRcFBscyqFrO5dNnQDgud/CDdnMMi7vmW9cqn8bWMOca4thz6qi8CS5h7TbCJHNjYXcuPdzwPVl0fF9XJZbZVhzKP/7j/ouQiAp2c2S68lHK/G/cu7J7xozokfQLLAmD/T3LP9Z/XyNTr4+nXkjYJ5J2b4CVzOBswY1ldKzdQINRQ2fa1iXY3xOoVzCN75Ea53I6aX4fsjurmtdfnZcWZvBEyqL1Z64fJyTI09EcsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8vfe7iZju8xm+2/r7rcAXdCT0DwXxs44MCyRUGYGVnc=; b=Rc/RJX0esPu1nAs7kNBo0ASfuFTwtIPysCkDX45Hn9s0DxuxeWa2HKsSNDVA4UzZRTMWK24QujbfYlrPTm1o+nZ6Yv+Ze5zFCdLTNbe67ONWTk8pGn1KyP7/TTM6gah7R2IY3jmJuYsz2IQYL+8ALBLUqkggfCgL2mEmUG7WFYg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 6/7] x86: Remove x86 prefixed names from x86/cpu/ files Date: Fri, 13 Mar 2026 16:36:29 +0000 Message-ID: <20260313163630.1073019-7-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO6P123CA0018.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:313::11) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH2PR03MB5271:EE_ X-MS-Office365-Filtering-Correlation-Id: 941a1d77-25b8-43b1-f484-08de811ebee6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: 68/QAPABejauYqz7xkMnylWfWySCfNYUSkmo00WW8XwPHKF7tqGpTjJVDzHNBi7kVA9ty4E2DfHkdHM7M79NeoaIfbpOzLhPfM6Q04j/LG549/L3NMshxeqkTDs0R46h4J5iHydz6k65Fna4KgP8JE9/+TbjprJiijg35+uAWrrraGtFn2NrHcz37Eiy2VT+KqO3V5+QtQ6h2r6I8ZfXm2lZmi+Il84t7G0UXINtKSXG/F57gbjcPLT4UNS+2r0LzhypQZBYd4U+3wr2m75kMMOrMiMNvjuTf5kRN1t9p89yZ10KD3T38uez0i99HlDujegWbto+ziivGa6kjFlizbYq5g5QN6F16hQhO4znYuwBfhcfIKdzDR77R/C/EBLClpAfOur8ExDmqrO+PL3LYvcfNmY3b626dnXhWS8a9da6WewMBNaGDCKOV7jnctwqmlT4ZV/rJWNkOMvWwa+UbA+tscZGTcfyTM8emVzRyPqMSLWrtQ2GQI6O3qSIjAgFnMlPaWRdm78af8jFuNsSNV+QBfYvEH5p9vOOHdWuyMHw/6BYlJ+EkGJELx/6fhXYg0KFvgTrR0XKD16ErM2LcoC98F/LLXOm+FUk/Y3hGriHrfN6zkGWUvb1oxzqvpBQkgDMPnWjyCb4UTS3z5nB5dpCU434RBlpON1Zz9s41W2WhqjWTgmpzlJ3ddUnxnCqSNlflq9RwJexNMAb+vmYL3o/bU8XvD0p4IyiP6bvgoM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DJPu+h+XLVzwgdXLgIDwMmMKgoRNfZg8T+nPrQKUJoqpozkHWT3pJuu+vnzj?= =?us-ascii?Q?/XcnuD8JV7um0IfIUbAKiwgMtbx2MOeORwtCC/5uEKs8b4h8GRXjZkJZLtj/?= =?us-ascii?Q?wqKvidhWL71dzXoWCgDc37Sr7Ar5HftyDgmy5XN5yK+jKToh79MW4mzwNKMd?= =?us-ascii?Q?rAWkk7Qd05pkvdTwnjFQypqf+7Yq6CID+CYRntwGPEHfr6/L/3Hi+DZ2jxeW?= =?us-ascii?Q?DqP5eiufWqSGJDCa9bDs0rtPE6woM2r/RwUsuSFwzUZlmaSLv05cpNgeFy4y?= =?us-ascii?Q?eeDxGEdBs14xnbXHzGKcXiEDBPpl6LpLz4Pv3dT9HNFOsvHHu3gFSJLFqWKg?= =?us-ascii?Q?1EBtDn3lv2VjCJAZ0mtcFu7d4gAEpvNwkjMKSV7y7kPiKSwFP1ye45Xwj1GX?= =?us-ascii?Q?+O/31fqg0Hi1VCCinlWGQRswMnGLMao5MOfBOwMCwtxtGOF/+X6NcOFkQNPO?= =?us-ascii?Q?bKiWq/Lj6c4z9mrtRiS91kNPozKJwouYkAQ+TxmSX9yzWrVn8k4A5CI07iXn?= =?us-ascii?Q?IJOIFbVRzbpwDp/95HtGdxBvJdXcrK0A0is70fxUxqiFhNgfy68gVeh28ZKm?= =?us-ascii?Q?szHr4UDTH/vC0tbkMplpRVQSZVBGcTk1cQRiEd6NEJ9jmUZvkx6eS1OUas5I?= =?us-ascii?Q?YLmZol7vWQVlLVatOREVnJSDb6jGZSG3jQvN6fVXhGFIxuXNvQhD/p92vMHL?= =?us-ascii?Q?ilG3ct8DXYjmWB1V4+Om/BQQ8sQhHiWq+UNKz3qS1eh1VwXizMRIhYTCUHKX?= =?us-ascii?Q?yjkbx10J2yWQaJ1VxGDBtS9R8g+wq4uLJyDGyrhJEBQh4U7a+8tGEwgqcSkz?= =?us-ascii?Q?Yv+03J6lEKp2R6XHBZR0qerC3ulhO+Yp/0nurRQEUSUhYvonxJntgTG6e1X7?= =?us-ascii?Q?q/epbEO3khCtiUishwZm3bySq48scVtmSxwCCBXFoiZOjl4bU1PRz/QCVI1V?= =?us-ascii?Q?9cEluOKBiR9BP8rGhT1QcveKv5xNnuXauENkGvRkY35UibI3Mz3x8ry/DOpf?= =?us-ascii?Q?JFmiHG0CmWsmGHLoEinGyDLXRiXjl/YL+2u2ZBMqN01IeLftdKg2NnslfL0h?= =?us-ascii?Q?Xd0otCT6XH+Krk13E6qecgB0726sO8sopagJwiJs5r2l8YEwpYWMp4Y8vHCf?= =?us-ascii?Q?7+0rjXxnA/sCG5ovriTm0hqWwjvw064OBttxSFlFNA6ZG7/Fo70ZtSqbBg+3?= =?us-ascii?Q?yN5Ucw0yDw/0G9Gi67T3Dv9NAh/ALNvP6SkoIDwEhDqnJESU4VoekNpZ9bq4?= =?us-ascii?Q?uokY/9OHV+TWcbp1F9E7zPFjveXeIl4155jrzyUeiNwWOyYG1TA8dijVBpyY?= =?us-ascii?Q?7htuln0yZgDah1HoKV+f0FeEDtNGXU+f7F7EqTdqZRauDsNzHmvRQuCLEYan?= =?us-ascii?Q?KUGklO8KABPFEUajcAYjG8WxRfcGpphyKJdAEXVl7x3eyBNxtw1GwWJ5ruqz?= =?us-ascii?Q?P1zSnJOt5QiFbLVUu8C1xWyNRDwou0dEFdxZlr4HLInRrBfBmsv+13fNV4+y?= =?us-ascii?Q?2+1oDD3v3+7Gcivowh/WpKUnzF1EfKYqsmstscJTLSpivCadbwKvleweD/E1?= =?us-ascii?Q?Yah2Ea/GF7g2SSNZxl64taux+AnWHUlTCErD9fSxYNkA3ylt+iXok9ZD3VLV?= =?us-ascii?Q?Sm01LkojUYXYv0YA6rjdsaAx7NxMFoMqXsJwwBNZisM+EYfOZ94IJMjJFTn3?= =?us-ascii?Q?wsmwTPRWz1J7WYQd7d/2yd9Df0MEOu0MAS5tRvRYvW7bFlZgrLLK2DcAoGG3?= =?us-ascii?Q?v2t4ARxBtw=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 941a1d77-25b8-43b1-f484-08de811ebee6 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:36:58.6177 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0pyVO/wnya28DO590rg2qGyBRHh6OjcxBsL7/O947YGG3yq0NeG7avLss8I2OuOFtrxUByvhqmqTWT1vImueug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR03MB5271 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419876952158500 Content-Type: text/plain; charset="utf-8" struct cpuinfo_x86 .x86 =3D> .family .x86_vendor =3D> .vendor .x86_model =3D> .model .x86_mask =3D> .stepping No functional change. This work is part of making Xen safe for Intel family 18/19. Signed-off-by: Kevin Lampis --- Changes in v2: - Switch uint8_t to unsigned int in vpmu_arch_initialise() - Switch int to unsigned int in vpmu_init() - Remove XXX comments Changes in v3: - No changes --- xen/arch/x86/cpu/centaur.c | 4 ++-- xen/arch/x86/cpu/hygon.c | 4 ++-- xen/arch/x86/cpu/intel_cacheinfo.c | 6 +++--- xen/arch/x86/cpu/mtrr/generic.c | 4 ++-- xen/arch/x86/cpu/mwait-idle.c | 4 ++-- xen/arch/x86/cpu/vpmu.c | 4 ++-- xen/arch/x86/cpu/vpmu_amd.c | 6 +++--- xen/arch/x86/cpu/vpmu_intel.c | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index d2e7c8ec99..9123b05dc1 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -41,7 +41,7 @@ static void init_c3(struct cpuinfo_x86 *c) } } =20 - if (c->x86 =3D=3D 0x6 && c->x86_model >=3D 0xf) { + if (c->family =3D=3D 0x6 && c->model >=3D 0xf) { c->x86_cache_alignment =3D c->x86_clflush_size * 2; __set_bit(X86_FEATURE_CONSTANT_TSC, c->x86_capability); } @@ -52,7 +52,7 @@ static void init_c3(struct cpuinfo_x86 *c) =20 static void cf_check init_centaur(struct cpuinfo_x86 *c) { - if (c->x86 =3D=3D 6) + if (c->family =3D=3D 6) init_c3(c); } =20 diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index b99d83ed4d..7a9fc25d31 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -41,12 +41,12 @@ static void cf_check init_hygon(struct cpuinfo_x86 *c) =20 /* Probe for NSCB on Zen2 CPUs when not virtualised */ if (!cpu_has_hypervisor && !cpu_has_nscb && c =3D=3D &boot_cpu_data && - c->x86 =3D=3D 0x18) + c->family =3D=3D 0x18) detect_zen2_null_seg_behaviour(); =20 /* * TODO: Check heuristic safety with Hygon first - if (c->x86 =3D=3D 0x18) + if (c->family =3D=3D 0x18) amd_init_spectral_chicken(); */ =20 diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_ca= cheinfo.c index e88faa7545..a81d0764fb 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -168,15 +168,15 @@ void init_intel_cacheinfo(struct cpuinfo_x86 *c) * Don't use cpuid2 if cpuid4 is supported. For P4, we use cpuid2 for * trace cache */ - if ((num_cache_leaves =3D=3D 0 || c->x86 =3D=3D 15) && c->cpuid_level > 1= && - c->x86_vendor !=3D X86_VENDOR_SHANGHAI) + if ((num_cache_leaves =3D=3D 0 || c->family =3D=3D 15) && c->cpuid_level = > 1 && + c->vendor !=3D X86_VENDOR_SHANGHAI) { /* supports eax=3D2 call */ unsigned int i, j, n, regs[4]; unsigned char *dp =3D (unsigned char *)regs; int only_trace =3D 0; =20 - if (num_cache_leaves !=3D 0 && c->x86 =3D=3D 15) + if (num_cache_leaves !=3D 0 && c->family =3D=3D 15) only_trace =3D 1; =20 /* Number of times to iterate */ diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generi= c.c index 0ca6a2083f..23c279eb9a 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -218,8 +218,8 @@ static void __init print_mtrr_state(const char *level) printk("%s %u disabled\n", level, i); } =20 - if (boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_AMD || - boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_HYGON) { + if (boot_cpu_data.vendor =3D=3D X86_VENDOR_AMD || + boot_cpu_data.vendor =3D=3D X86_VENDOR_HYGON) { uint64_t syscfg, tom2; =20 rdmsrl(MSR_K8_SYSCFG, syscfg); diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 5962ec1db9..6776eeb9ac 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -1637,7 +1637,7 @@ static int __init mwait_idle_probe(void) lapic_timer_reliable_states =3D LAPIC_TIMER_ALWAYS_RELIABLE; =20 pr_debug(PREFIX "v" MWAIT_IDLE_VERSION " model %#x\n", - boot_cpu_data.x86_model); + boot_cpu_data.model); =20 pr_debug(PREFIX "lapic_timer_reliable_states %#x\n", lapic_timer_reliable_states); @@ -1816,7 +1816,7 @@ bool __init mwait_pc10_supported(void) { unsigned int ecx, edx, dummy; =20 - if (boot_cpu_data.x86_vendor !=3D X86_VENDOR_INTEL || + if (boot_cpu_data.vendor !=3D X86_VENDOR_INTEL || !cpu_has_monitor || boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) return false; diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index c28192ea26..470f5ec98d 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -398,7 +398,7 @@ int vpmu_load(struct vcpu *v, bool from_guest) static int vpmu_arch_initialise(struct vcpu *v) { struct vpmu_struct *vpmu =3D vcpu_vpmu(v); - uint8_t vendor =3D current_cpu_data.x86_vendor; + unsigned int vendor =3D current_cpu_data.vendor; int ret; =20 BUILD_BUG_ON(sizeof(struct xen_pmu_intel_ctxt) > XENPMU_CTXT_PAD_SZ); @@ -815,7 +815,7 @@ static struct notifier_block cpu_nfb =3D { =20 static int __init cf_check vpmu_init(void) { - int vendor =3D current_cpu_data.x86_vendor; + unsigned int vendor =3D current_cpu_data.vendor; const struct arch_vpmu_ops *ops =3D NULL; =20 if ( !opt_vpmu_enabled ) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index d1f6bd5495..943a0f4ebe 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -532,7 +532,7 @@ static const struct arch_vpmu_ops *__init common_init(v= oid) if ( !num_counters ) { printk(XENLOG_WARNING "VPMU: Unsupported CPU family %#x\n", - current_cpu_data.x86); + current_cpu_data.family); return ERR_PTR(-EINVAL); } =20 @@ -557,7 +557,7 @@ static const struct arch_vpmu_ops *__init common_init(v= oid) =20 const struct arch_vpmu_ops *__init amd_vpmu_init(void) { - switch ( current_cpu_data.x86 ) + switch ( current_cpu_data.family ) { case 0x15: case 0x17: @@ -585,7 +585,7 @@ const struct arch_vpmu_ops *__init amd_vpmu_init(void) =20 const struct arch_vpmu_ops *__init hygon_vpmu_init(void) { - switch ( current_cpu_data.x86 ) + switch ( current_cpu_data.family ) { case 0x18: num_counters =3D F15H_NUM_COUNTERS; diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 1e3b06ef8e..ed9f62b936 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -917,7 +917,7 @@ const struct arch_vpmu_ops *__init core2_vpmu_init(void) return ERR_PTR(-EINVAL); } =20 - if ( current_cpu_data.x86 !=3D 6 ) + if ( current_cpu_data.family !=3D 6 ) { printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); return ERR_PTR(-EINVAL); @@ -958,7 +958,7 @@ const struct arch_vpmu_ops *__init core2_vpmu_init(void) sizeof(struct xen_pmu_cntr_pair) * arch_pmc_cnt; =20 /* TODO: It's clearly incorrect for this to quirk all Intel Fam6 CPUs.= */ - pmc_quirk =3D current_cpu_data.x86 =3D=3D 6; + pmc_quirk =3D current_cpu_data.family =3D=3D 6; =20 if ( sizeof(struct xen_pmu_data) + sizeof(uint64_t) * fixed_pmc_cnt + sizeof(struct xen_pmu_cntr_pair) * arch_pmc_cnt > PAGE_SIZE ) --=20 2.51.1 From nobody Mon Mar 23 19:52:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1773419858; cv=pass; d=zohomail.com; s=zohoarc; b=NMtGcGWMIEMhGxxMY1lRzgETRFb0MomYHmAt4zzhyVbWaG8upT30P7qiGvmp5VggBoUkOk/w1i2lxTmU1N7/jMibBoaqJi4ErU8uskaS8KGhaSan7/8oTi33nDQrIw/2NT3kJuhqhDPTrKwXQq6JVMBh8kG0Z0lNCTci369Oaxo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773419858; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Yd8n5uLy2YBtVrAJOKIpy1iVYTwPAmDskE+Dkrm1v1c=; b=Kc6seMNh7qQjvsH7mV0Z/F7dvU947RaixCFvDqaUR5rf3jyTSwHLdjRJSIzxPYXNRCwG24pCel18ovK1nu1m7GuD3GhhNZJja6zncids/8Ev9VY5xqatXRwhfFkG0daIyI93vXkPHieQ+D17/0NvhdMbuAWoDv0LY0Sy7ONFGRg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 177341985855757.83560551868743; Fri, 13 Mar 2026 09:37:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1254026.1550027 (Exim 4.92) (envelope-from ) id 1w15Vt-0007J7-5d; Fri, 13 Mar 2026 16:37:25 +0000 Received: by outflank-mailman (output) from mailman id 1254026.1550027; Fri, 13 Mar 2026 16:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15Vt-0007IC-1a; Fri, 13 Mar 2026 16:37:25 +0000 Received: by outflank-mailman (input) for mailman id 1254026; Fri, 13 Mar 2026 16:37:23 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15Vg-00040A-VV for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:37:12 +0000 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azlp170120002.outbound.protection.outlook.com [2a01:111:f403:c007::2]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e1601c20-1efa-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:37:11 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by CH3PR03MB7412.namprd03.prod.outlook.com (2603:10b6:610:198::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Fri, 13 Mar 2026 16:36:44 +0000 Received: from BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07]) by BY1PR03MB7996.namprd03.prod.outlook.com ([fe80::5068:e1b5:b478:8d07%5]) with mapi id 15.20.9700.015; Fri, 13 Mar 2026 16:37:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: e1601c20-1efa-11f1-9ccf-f158ae23cfc8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HujcbZVQlkiQ4pwQH9DE3gv7KcvxEatO3ZsNp5wda7TkwrnF2g0b3zZQZdd236NU9uhzu2rsY9k/51PSNyaPppVcCERJYDAyfp1ZX9bTMg2N1o4nFjBQc8aQRYxaioKTBfXfn0ugeuFFy4qiN1vWfbzhk1zoqwpf0HsBlvZ/FyTAs7hc1ycr1bOht/hNsYSfUd2ZjmKQFJInFczJZzZBVm9OA2kxRapOXTWeLvBE2YvDekq7jp3RE+VI7KHPPDnQMNueICna26cDOeM+JVMXVJadcTIv9wKw4tnwN78XJi5LqMK/klyN9iMtcqYfCuNcCDVsC6wh68BF8JBhxO6Qmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Yd8n5uLy2YBtVrAJOKIpy1iVYTwPAmDskE+Dkrm1v1c=; b=wikCIBkDNBhVhrB7RBKFnsn46Z7d8wGbJwIEdN3SVb0Ky20hvsHnaNDDyBJTpfakcKQhXAj9dgxTNu+9Z7sDp5Ka8u0Dk8bLerFyJj8Z1pyuJHwcQ8fpvRtS0x2ZY5BSFMJ+3IJH9oWwLtfP3xLR/N9yZV6XTs0933+FnVDn60pj3cn9avqZjH1CyBbCtrU9++5Wx5gOuwshKcdRfWOt/41tFI2Y74oLRNmLKX2YX5f2qi56a9fFFq6h5DifFdtBvx1rxQdI+d7JvpQJzyAn1rXn4O1/UbTHpxZgTmbyGBWFr/lUyTdTEO3FWrKY+A2QwXS5BLHEfhf5S/asxIR6/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yd8n5uLy2YBtVrAJOKIpy1iVYTwPAmDskE+Dkrm1v1c=; b=dKNqnz7gi25nKxkUEYmQnstz9cowR53FGQ4Jgqsm52VaSeOncr+YWDm7xC6fxaHre5F9MZLqhy9P1Tuns0KfUDq/3cDrje8/15GnCqf0ExgbIi2xz2tXjOya0hEx4prZZg7hEBQG6JbvbTKojCZjdIZ/DwMdVJJfi9beG1094O0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Kevin Lampis To: xen-devel@lists.xenproject.org Cc: jbeulich@suse.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Kevin Lampis Subject: [PATCH v v3 7/7] x86: Remove x86 prefixed names from cpuinfo Date: Fri, 13 Mar 2026 16:36:30 +0000 Message-ID: <20260313163630.1073019-8-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260313163630.1073019-1-kevin.lampis@citrix.com> References: <20260313163630.1073019-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0308.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:197::7) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|CH3PR03MB7412:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c28bd30-667a-405d-a693-08de811ec1aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: rlkNn/n0nqb/H9RqKcNWbEagWf83eRo8Hp8EO/d79NjWFxxfgRkaAbtHUuHB6nkjT+o+Afo2a9s5RSzSA92ukDCzzBSwZgEIGR9GXjkkdv8CXTemveS3yTzat6a7CwQ84DbkAHAUwKhFqpwZyVsEMmeEQ4HS958mHTstm1o+I/7yKAOxb/0aFjRa1ZCHZTh3vwYSuXPZxpF3nFUDx/KOsv/sPe6zkbOKYEPpCagaZqe7n+/RIt2uYsFFIiQ7ZYFoQzyEPWb5rebU+COhveKNH03ooIMxDTDxVug1P3+JpkD5ks8uol1A4DHP9s5c5GMYTgrVUbFKD/G/VRO+9oaY9B4REYEwjHun9ux72J12agwNsgEDPAwkHc2pKD2M9M9bVC5KnyHM+2N9DOyuy08U4iTAqowF/6m+zbt/C81d6rnhEUu2qRnS2FElAciKXVgNcMN2XDJbL09K0lt6PMXWUspq1HWMnV9s2Fst9VxXvOhk7kQ0aKQauuwPDAe/w+LHRhrxzkVgsnrs2ahbhVIvbuutsRm7sHVlynkn3anwzI6ORJF/p3GbN00AR98jJHSC+PVD5n+DzknqUm1uobVzEEzPbtdT2k7NBEpVzFZQ4FF29T2Ziv7FcbqCDOiVajZROeK8zp6XtTG4UAR1IdE2psXBOSOTo1uZWRUHTkFgl2H4bXs4AbTzp7hwtj2Dw6mK2oUJIczIJrYTuYlFXW7nCLRw3RE3Ngq5ZPeMHCbyPlE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY1PR03MB7996.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fL5UP2X4258NefnzQ90Agk85sctdBd4LR9e0Nn6Z77eeBV+2LBLmtRAF68L7?= =?us-ascii?Q?VzsvIttNINBCWpGN+n9A7bSi4+70PkAhyWkcO10CTuXSbKvsaTF6Vmzb7RGZ?= =?us-ascii?Q?uLL+NiSAnlqK1ZUVjLETaHPFKntMK2QKOWl+/lgItuB0rdBKYmFwsnnHoeFW?= =?us-ascii?Q?O5k4TtjmYsUFrTnp5puE4OJsuG3tf2kzxgNr2mC5jqEVAcqz8zANcKsIqLxW?= =?us-ascii?Q?vDbpCCVOLCGRiKbf0EECbhxzsRHF7Re9xTNUvE9wyBpNpOxqfMIj+r8QgMPF?= =?us-ascii?Q?VUv6u/JcXu9OMVQ5nxOr1I1BOAm8LxZM/vOhUVDyyk1mQbgBceTVSlBjuAwR?= =?us-ascii?Q?VylJpmf6MXD6MFIvDIs3Vms/JfENN9z/iwMF/LXYPXlHsmeObA0kRPBxWtFV?= =?us-ascii?Q?sCUnovp5hK6q34hdxQKpx/EAqdpxriQiKMVnGIJ+EHR7sZp7VbumvLmB3ToA?= =?us-ascii?Q?fVHZ1gZO7Q2rJjhaOucTeDTLxLtKLyDsj/66lhxXBSAHnPOUa0fr+iF6wOxv?= =?us-ascii?Q?dusbWccNNE/RGjuUskfnvS6bOXkwoNK0rGBsbaQUadsersk7x+eMGZl5ICCB?= =?us-ascii?Q?wfM/azeMVDtKTaEFblilzyWjDsoymezcy+Z3/hEmLHKkQaz2UOaYEfu5mG6v?= =?us-ascii?Q?3rO3pmh8dsGk0uLtkS9KM4VFg/YROWBLXKcAQYLdkupj+qNJXx+KlZsO+2Wx?= =?us-ascii?Q?no4uqfaB4p7bWpiTETMKapPXilaXz2sXV1Ej+ZrTecWXVV+2ML6FtLJdQmnQ?= =?us-ascii?Q?N5r+gOyzP2v7Qkm6huoMeQW/x4w93H7dmKhNddOoZ0HLAW3Y6/epxxWpYItt?= =?us-ascii?Q?6gqWIRGiADK6++8TP9a18M5QY39lOMwGTpJXCDAb33sauWMyrYyChsyJjvk2?= =?us-ascii?Q?mNtqRjp0orPZB+tqix2QMz/2at4JNXzDm17dO0aBak1T06UxlYdi0bErgGdG?= =?us-ascii?Q?wUyK/RNZ3aFdBhoPujkmTNhX9LAGy7VvOvukbrlLU4nk7xImKROtMLucw6Zw?= =?us-ascii?Q?J6IdeGu8fMnF+3BULxxkgbtfrfPhKO5r2unxEMl+kkPjFIj68nmosVMf1bfb?= =?us-ascii?Q?1o1tHq31rIxQDiEfniOVZ4GWyYcHMYOJFtDZ+bb1qzj4qJ6/VCnmD1PjxMdx?= =?us-ascii?Q?h7CT8rzzQw5GjodJjvKWMfwdt5Yv6x89lerVrSwqm17jgZ4Hom2CBtjw5WE0?= =?us-ascii?Q?czIBkEC3Y/dWimXZOM9MVzf2xJ1m5Fvps0zEbodGSS9DiDGeNNqWmoBoHqHF?= =?us-ascii?Q?bf099d46mROkIvwM9j0i3K9JIrsAQIF8H6Vta1rs0c9TqZU+4zLr2c5BbrcI?= =?us-ascii?Q?HpavBLAJGc40Pl+/Q8hy5b9KPB+8nXSGF7giJw3jLzXV5U8nOz+NxRii/Uvz?= =?us-ascii?Q?K2IGTvoOCDMysecn+MkijVSGhQcT4aBAnsxQYdx4MC1gQ83urLHtYE184Sue?= =?us-ascii?Q?uRs3kPkSp1Shtb+NuyDfYW3ti+CCRC96oc7LfKUkX3iOXQvDkOSjeDiyjwho?= =?us-ascii?Q?B1MBUlwy+j/pOvYDnC+5OfOVN5+bvLGQ5siL9UfiiAel1IIxrQ2ztXCUTIOl?= =?us-ascii?Q?zSwKuw7GSc9DauJOknXq7hzG3bxCRbczLJtAr0P97ivAYggZhi2/t50OaHo3?= =?us-ascii?Q?GC9EiWB4TfPisCF4DYJZX+2GWdP4P5p5DSIdF5hrc+YfL9ZX2ZtWt5dkCD5y?= =?us-ascii?Q?9LkacNYUdUkJHWhHcWTv1WU4UTi8oZFR/PfRYx0VttFBMWKYNoF6HNH5qIqX?= =?us-ascii?Q?T6bbJ5JPYQ=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c28bd30-667a-405d-a693-08de811ec1aa X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2026 16:37:03.2855 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: snsrs0O6E+0fUmQq6A90BcItMWtw4DnLvCq/Mm3OzAi+IfdzxPijcEBv79h+24l+N8WmLSKXKkDpzhEazudQyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR03MB7412 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773419858751158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Lampis Acked-by: Jan Beulich --- Changes in v2: - Remove the unneeded unions Changes in v3: - No changes --- xen/arch/x86/include/asm/cpufeature.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/a= sm/cpufeature.h index dcd223d84f..11661a114f 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -43,29 +43,16 @@ #ifndef __ASSEMBLER__ =20 struct cpuinfo_x86 { - /* TODO: Phase out the x86 prefixed names. */ union { struct { - union { - uint8_t x86_model; - uint8_t model; - }; - union { - uint8_t x86; - uint8_t family; - }; - union { - uint8_t x86_vendor; - uint8_t vendor; - }; + uint8_t model; + uint8_t family; + uint8_t vendor; uint8_t _rsvd; /* Use of this needs coordinating w= ith VFM_MAKE() */ }; uint32_t vfm; /* Vendor Family Model */ }; - union { - uint8_t x86_mask; - uint8_t stepping; - }; + uint8_t stepping; =20 unsigned int cpuid_level; /* Maximum supported CPUID level */ unsigned int extended_cpuid_level; /* Maximum supported CPUID extended= level */ --=20 2.51.1