From nobody Mon Mar 23 19:56:00 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=1773348257; cv=pass; d=zohomail.com; s=zohoarc; b=cICz4Uff8C0HsFYr+dsraoVpfkwQdyxSVYOSV/GOkoW16+MWo4bl6Lqk4ldkk03RAyWaXEApejkd45s63UTOlOwqCqTtG3Y8YB7zHmUjVyZ6YpDHpeuUmkKv3XfTWXRowmUBP8CetDKEZjbKGMPYYw44E7xG4DBTkAcmCvPhZuY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348257; 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=SdfTNX5aLajDFtunCfhU7/bkqi/fSCRzyyG5ed6hYgM=; b=CBsxeXjW1ZYM2s93zFw8TpOxI/+YelR7xQ8a4n+Pgco9P/PnkHj2HvbZiov5kZ5Ls0OzYKWc/hAthpEZT1fYTTe9tAR8fpZjA2PJFEQnKBrlDwwAWgIMB89RNqHhQpXw+C3Cb9kQ3ekAb1e5/aYYPvFt9A3KzTKrJjE/70ZlxTE= 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 1773348257443924.2383701449071; Thu, 12 Mar 2026 13:44:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1252992.1549406 (Exim 4.92) (envelope-from ) id 1w0msp-0006PQ-Kw; Thu, 12 Mar 2026 20:43:51 +0000 Received: by outflank-mailman (output) from mailman id 1252992.1549406; Thu, 12 Mar 2026 20:43:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0msp-0006PJ-Hq; Thu, 12 Mar 2026 20:43:51 +0000 Received: by outflank-mailman (input) for mailman id 1252992; Thu, 12 Mar 2026 20:43:51 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mso-0006Bj-R5 for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:43:50 +0000 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazlp170120002.outbound.protection.outlook.com [2a01:111:f403:c001::2]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2c12d2c9-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:43:50 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6870.namprd03.prod.outlook.com (2603:10b6:510:167::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.12; Thu, 12 Mar 2026 20:43:47 +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.010; Thu, 12 Mar 2026 20:43:47 +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: 2c12d2c9-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zC4N0+KpIErUAGBoiI1IzbDaWDTfqrMxTAoB7JOBmgWwh6R+8l6Mo3UL3xD23IbTl0AD912geiIXd/Cbxta01vG8wr3RhBxU3PdiR3bJZ+NqbpUfUe0vAEWpmpWd39AKn7ZF5BQsCLVTWsW8nMVWzWayK7GR4ZEoIxVQzUje7K++QKQ3IXIP51AZ6Ueh0A/hCLycOwsL7bQzjp7N2oy/XHv+zdXlAGqigzU/BVNpTbD1CGdRVF5ngMKNBOk9AHHH5xduOfdXKRC3JrxDmuHqrs441weWHz9W//WQGda69D1fkaTFQd9CrTToW7u08sSvgxKPFPp2e06xrogHCpZm3g== 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=SdfTNX5aLajDFtunCfhU7/bkqi/fSCRzyyG5ed6hYgM=; b=gOcumTv6tP9a3c52t5OM9HxH3Plhg/KDVPqgeKxXWd9n4cyCmnkVhXpkconrpkzxga551F5p1M43Bzt3KGcS2SUumEzgwqFj8FAiaEpaj84dIGaNaAmIdUTeUkYiJ+6Ns6TsPQS+A1g43/s88+Sm+1E0tNypyQKy2mQ4EjtEZWwOh2lkOYNTIixWX70SUEMFFpM0bIb9kxMho+PR+/MJ3uclYmg7L7DOvjGuVr/ZaiRfTD8/k+HPPV+J4DyoeuR8Mqp3rZjpYYZA99prtUGIyeNM4lvrnF1Y+PBR/IcXbwWNWoLpvUkt1MTKgvBdIf9+vi0xeFWuVELgrw7JRbPixQ== 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=SdfTNX5aLajDFtunCfhU7/bkqi/fSCRzyyG5ed6hYgM=; b=tmawjSc5Q6O0USlm1pR+VoHlEPaT6VS5hrixJngMP8zRNNP5Ana0IZpi++CzZhETZOU2oDWvf5S3qYMPtuHZavS5//3tfDEGmbv6dkZ7iy4g9nVLq9NARi8+5F3VSMMWK7zvJTropumenQooksEF3EldBAeF1tkAL67vkpFMPGs= 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 v2 1/7] x86: Remove x86 prefixed names from mcheck code Date: Thu, 12 Mar 2026 20:43:33 +0000 Message-ID: <20260312204339.740403-2-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0565.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:33b::19) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|PH0PR03MB6870:EE_ X-MS-Office365-Filtering-Correlation-Id: bca96d51-6321-4ce1-6cd2-08de80780ef1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: VD3EYehW3wOntt3z82QG80344ixukKX2Q9HKkPZffZwRQv538tsZSKlk1pfJCEuvgJzVlsX4ivApLAc2XWLGO1gQ+hx7iV9IhVkB/UXGbZDLohSqxGS2FVLRZmy2acTrReByFLpqUlg1cPHwUti1lf1OuBKRhki2NUtR8OVfExOxJGdUsdSH9rhoTnne9UlfxIjkPP5MixtF3Jq6E1MmFgT3HGNAqHqJqXKmp59u2k5UfKwq3ZijZMb+wzOj5SFG+cvSrp3759vJOyhXiZIdyHwrbVHcsxmGzEgppzBS+zEI7wubwY9/hGeqDxYQHkbkwwEaY8VwRx5VFH1wJYT5ePhJdg5dG0HQzKXJpAJyjPVpxDnwrG1nTak0MDThh2v2Eg6BUiEAq8tUS+pIC3QbizaOsViwSbqP31dOiHiscnCCF3e8kXQDxIyjEgE92KNt6sjR2/Rhf0G3WNxlrDiqG6uCQNJxqmnC18CMX1/EWz1fA8iJaQTGKtdwSFILnWBOGyuWFhVO7vdnZPIL1OiLsuj12ib2/pOBBQMmyuu5gLCeEiL75mn8ORLINC34Zpd+GuuCy2YsVEDTwYTWzAhsL4dYB5K8Yff4P1Qfpj/rp/BdKxoNt1m++x+QE5UQNcaMnTi0mGjEZJQ44s3EuIzPYBYhL9O7ORGCKUqmFK7wiB7xCD+1MXWltZHaxIhikZ4a70bLugFb/QcQLKxLsflGyfWMmylMDoQp2NGGoOcpJ5A= 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)(366016)(376014)(1800799024)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EUUqLP0RU25jXdaNrkvjf9trJ0/kaKLDVLfmKoYVzf7KF9AveFIkrrEQPHED?= =?us-ascii?Q?n1n9CwpKSff9luN3bR5K5RDBBtoy+G1LZ8MSXrc54jCEt6xbydfufCqsSuuO?= =?us-ascii?Q?Xf9WW5/5qY16fp1yotZs2q5wzcxCnkyOfxmh1pJSx+lSeeCszfFkJi/vecwu?= =?us-ascii?Q?WwLNTXmg053EkVnK5FyfV5rP7YXm1rGPGCmBJzMOlrBGSrU7+L0EXPT4ewsS?= =?us-ascii?Q?J1Uuh5uHIttorKgYlNgQJHIv8bhVdS2n07uzhaA5XQYMwpnTFYyGeoWQBTFg?= =?us-ascii?Q?VjI7YP/zo8Hz8oObF4tJKGConAiTUSIb1V0O3MIfk6YX5NsgdAKWE+JzHnym?= =?us-ascii?Q?xeeaxU0Ec4tVB+jVQApM0zLwGKfCwlV3JUwyaYbbkgLBlvMKrAq5qQidZ021?= =?us-ascii?Q?Ev/OXjuRBppwPGSOTsEWVOtQYZB9mbZf4Wk5t2kls7PQpdEeBQ1uPwqUbMVJ?= =?us-ascii?Q?HwOJ6nDe3CbZ2wBDxvfpv4+/7/7ZrkhiN09Theccby9/qH5XggWS9H2wBIob?= =?us-ascii?Q?zJHsdcsIcdnlPTq2tLSDwEjYAz/lFlMpo8VVQ8XeTfdZcfGQDmt8JTLw3uq4?= =?us-ascii?Q?gN9+r0S5nM7SdZbtJ6IjU98UkTWFNrhybwo6tIfVTlxE7oZUwa5c8BP9dBly?= =?us-ascii?Q?t80/zGJPKO8E/fQ6gTJ9cdZi3hrpDR/fEIqYmclAW6gufZdxipCDyPuR+ulw?= =?us-ascii?Q?ZuIlib1TpwGBXrux2khgih+3iX2vPDeDD2bB6o97SLXFJ6LvZUJk2n9fHMhX?= =?us-ascii?Q?N0WUQKTPB/hSdOrYFhdHQvZhj4jE8oyK5eQkOrvV02FQH82dTKgz4RrIcRwH?= =?us-ascii?Q?118wPZaWuf+a86aHtLFYEqyztMUM8pPth6WoM/jI7tQRURrii9djvlfORBPV?= =?us-ascii?Q?p8sQy7ThKXabcKdwiaiNkgRk0tK6qelxNenX79Yw2KhsdLJ9Uz5OA/2Ay4EB?= =?us-ascii?Q?O7aXttNKF7JP2QrEkm5ccM6uMIzh11ji1glm+mAiXkv7c6MvZbAqwK9KXdix?= =?us-ascii?Q?gTqpLUcveVgLsOf0B1r2O00N6JVvGDIzWu3tdiRc1bCzAyNxjXj3u3XTH7s0?= =?us-ascii?Q?f9dffUX4uPNELSspLAJ7ejVdnkXf/aQLHyg6nx5IS/xyXmzGdj4YBY5Yw78J?= =?us-ascii?Q?X5rWBdWT8LNnR/LAjHKcgHvD/TuGA9FDqpn6mQUH2AfSIBFjlNCwPjzr8Mt1?= =?us-ascii?Q?nCMlKIWTrqXtoSymCBaTnkWiTLaSi1tEHQEvQLJ3fpbvyGn2i1FwgYLPA9Ky?= =?us-ascii?Q?o6k5oWBRD9uWRxzBz1zSNZv9kEQ9mzdtk1B308w8gkmERqmuJR4sqolS3t2g?= =?us-ascii?Q?/4lfoAm+hXwUI5Fbjng2rxqQJt7TQMIF05fOa4T7ZgT5fRt70UxVW/QteT1y?= =?us-ascii?Q?pF8izdM/mfBNwCPmwzFah4K4DEIDD00rxFRvZLI80rQ2EStuYaijVTlyVRPr?= =?us-ascii?Q?FWOR7xjatddEEWUDSjoYyQvBtC5MBRsS+tvdSzt+ERM94AJgtEN212X7wEgd?= =?us-ascii?Q?LLifs4E911C+NAcM9owZaMoVdzJTIMT6KzxbeBDuAG8YqX3l/H4EBzbSAzXC?= =?us-ascii?Q?+vuNuhhAdkB6AKs9dc/cmWwqXJEACZiLnDRYyV4FgiI3TzItenSuYEk+LqsO?= =?us-ascii?Q?mHv9gyeSVCLf1WtPAhenvEPd5cZOYIjJ1ahmC/gN2zw20RmNXnrv8FsXi967?= =?us-ascii?Q?M+XJZWXReP4af1rRBfJcUC9fJpedbWOzkN6tsc+9lX4FMBoIWY5XRXFcGB3g?= =?us-ascii?Q?6ZWjPAVblg=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: bca96d51-6321-4ce1-6cd2-08de80780ef1 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:43:46.9387 (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: XKgmWZnB5gShpFhVefocRZg2VGBJR57qN4MteWsYvW4xHV0rNS+lLVU/PCjC4RM7OhVOKCV63b67VkpaftYu1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6870 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348258439158500 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() --- xen/arch/x86/cpu/mcheck/amd_nonfatal.c | 2 +- xen/arch/x86/cpu/mcheck/mcaction.c | 2 +- xen/arch/x86/cpu/mcheck/mce.c | 30 +++++++++++++------------- 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, 32 insertions(+), 35 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 9a91807cfb..8a41116aa4 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->vendor =3D=3D X86_VENDOR_INTEL && 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: @@ -777,7 +777,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) =20 #ifdef CONFIG_INTEL case X86_VENDOR_INTEL: - switch ( c->x86 ) + switch ( c->family ) { case 6: case 15: @@ -882,7 +882,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; @@ -983,10 +983,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); @@ -1142,7 +1142,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 @@ -1177,15 +1177,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..4d6b7d588e 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->vfm >=3D INTEL_CORE_YON= AH; } =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:56:00 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=1773348263; cv=pass; d=zohomail.com; s=zohoarc; b=IuYRzr3hIk3AlkwiHmm0HKDbAXgQTru48LlCFpe1qCYBr4d2sy8/+NQDicMVdRCj4FKkzi80F4GG27WYfVjM0QMhu4fzMYD9rma89Fub2Y5IjLpHYGPFUzSCf8X2CuEqxzEF1ffEmIb8H7zW0jTa5qjBRfRlqd9ut9zD/pBuO4o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348263; 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=S6RMyHcSBKFmR8hWUKR8tGOBt8z2Q01OO6dOkO90IPg=; b=Tql9WSYnTdiZoJQ/nWcXCE2IveaI5R1mT3gGfHPcBOH3iyhdKZVkNRwVlSty6rD+fs6i0FkWvNuh6u6QAeoWEAXiaLzi0AUTH+IaFB8ustu5jfFOsKv63R8S7Gac0TIDTxshccB2j5kNqsZwgc2MnCZ8BSE1mX3lfw7KarOZKHM= 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 1773348262993753.7276135690182; Thu, 12 Mar 2026 13:44:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1252993.1549415 (Exim 4.92) (envelope-from ) id 1w0msv-0006fN-W7; Thu, 12 Mar 2026 20:43:57 +0000 Received: by outflank-mailman (output) from mailman id 1252993.1549415; Thu, 12 Mar 2026 20:43:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0msv-0006fG-RS; Thu, 12 Mar 2026 20:43:57 +0000 Received: by outflank-mailman (input) for mailman id 1252993; Thu, 12 Mar 2026 20:43:56 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0msu-0006Bj-K4 for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:43:56 +0000 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazlp170120002.outbound.protection.outlook.com [2a01:111:f403:c001::2]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2fa2e1f9-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:43:56 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6870.namprd03.prod.outlook.com (2603:10b6:510:167::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.12; Thu, 12 Mar 2026 20:43:53 +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.010; Thu, 12 Mar 2026 20:43:53 +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: 2fa2e1f9-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YSuvM7DAq43oqqxbqB2rALqSiZg9l3VWvp9XU5dFqGGh+eP+Dynia4l75Dno/tJVcTka43dg21cDzql9Ee6yGwyoEIip43HbsJJOntcZvHRKJdhJJXduWu3K2FrWYN/39eoGSCzjfx51S5Xjxh1dRhGg6dwffcIM4IunnXavwLScpcF/792ZQRR6OcnaRuP1T7RUFIvra8XXk01jEwI2Hs5O5lSFLhZQoPog1RnnQanRvBB4bIc+X0evgPAEo914GsFXBZVWBOcvN4urW1L1RkIyBANieA8dBXqOEzW+eQOZoLAs7KI2fb2BxtwKKXqOvOdrXB+jsXLWmn6FRdAsiw== 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=S6RMyHcSBKFmR8hWUKR8tGOBt8z2Q01OO6dOkO90IPg=; b=UW7Ve0lKAOFQ2GuXbDLzUMtmUba+to0Un5E/BvF24uvmI2nanCdwCPdE4weKcWPzcea5PVlO9Wrrd1wTFRoEFn4oyXm1uCdJho3jlPBD1sowQDmQCq2W5OVMeyoFI8HA4RreJx8m6iItyI3O9joEcN2RTf4TUfeUlVJinjhtaEfBDjtP/8aQikTwzxg4YSgixc2wA1YOoJmQ6N0zkj++jpXcBI9VcHUPkD8vzn00d7Bp4ck6kwww1/OYQe5jnSmv30N6y/UVQVr+VCremqqv3gbSbJeg/EZ8ntLFnDgdfxica975m6+NlSGxgNMGpy/jvhRVEzwj1yOvIOgINSc+hw== 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=S6RMyHcSBKFmR8hWUKR8tGOBt8z2Q01OO6dOkO90IPg=; b=O7XNRQQYjscMuStnx2t4qbXwk75Lr6dPrVLg47b8iWa8TR2991E6lornMOvPvWSyOzSgR/QzYKtzx/1Rx56H905xTzavOiLYd6EA4Ih2Av9MqIV7H2mJlZ22K1ROlIoU9B3u0rCXBuPRkm5qe9hEEYKPin82zr6D5/KKSsM7Jjk= 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 v2 2/7] x86: Remove x86 prefixed names from acpi code Date: Thu, 12 Mar 2026 20:43:34 +0000 Message-ID: <20260312204339.740403-3-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0207.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a5::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_|PH0PR03MB6870:EE_ X-MS-Office365-Filtering-Correlation-Id: a3ade90e-379d-40f6-6575-08de8078128a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: MlIyfEXv/KQe9iGC6CuwFeIS3/ijjcofUyXn1rm+4NQusILF1/y0u66vjWxKqSlJPRHU7Yio8mpXiLXYSWmmrzSbOSNO584kN9upG1K8myyoXQlf+oMhYXjGoXekBhLfln/jPr5deTpY1j+6SVCkuANBHc24QWe+Kxq3Upt68RnCT/EfCYtnmq/j7RK6G22CiPqOjNbu9hk+Cuetkvf10o+OphDozUXZeVnuSORo8e2iXKbWWJjymMT91qPHQIIrLxTDnpy0MTSX6YNl2psg/C/KSrJ0rbr1Is95nWGIn6jxqWDhpwIUUBi7eL3o92xWLwvF+/XX/5VrNOGSDg5cq+amgRLmoa7c13zfiNqmEwmJOVWHu/RJwHeVwnEisppC3ycm7Y+hZEDhlO3FOey+P9KV5LH7uljEg8kwOCHzWUYkJhyTTrUdzotQ54NE27+/NFChKVjYhW8z0Tbs1TizG7DOdIbncnOQPi8fpHSfp1rSZGKzyvplSjwZxAXGXXyPcA189gNv3OdjEKscVI7Ui7KgsMzY95robnlzBkFWWizgy8g0lLBkcVVH6lVoMXKSdYh0eOXrD6CGSXqn3lb1z62qPfkDgpbSg8y7kfKb0dx5FS7A+9IdI6Q5W2nCgE4UE3HI14sYND/wtzlVvroeiyq+GwOCG1Ix7qZ/8hOxHiWshd23jeEXivQmjs6ymAOZXpuw2ia6i0FNw1HW/CVwfAixSmSQ+06FW0mCtVZk4A0= 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)(366016)(376014)(1800799024)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Y2qci0uMmsvtc0/sEipz+AMrvitCBLIIx9PrEhIeQenAskfFsvdh5IvPVM8L?= =?us-ascii?Q?+b8PFBtiGjD5dp61cDZJQFMs/+MaMFS+Zhd2PrERKjFg7bgHlS1MJRMtHv0D?= =?us-ascii?Q?1Umbig7ekZmIjH1Qdfa7ErDWxqIWZBxpRGHROIObR99p9a2byJ7uTDAd50wi?= =?us-ascii?Q?nIyeetqhl/UCZOR1Re+5kBHkA6BiNLYX69W1tZJcTgVs/oZycbXpD3Hg2+p1?= =?us-ascii?Q?aPpO+++aDoqU9uRzpxeSY5On9BXrP5agRglKraom8blU+lRu6nMMv1h85ZFo?= =?us-ascii?Q?6f8a7zs1PvomsZOI69kE39K5cczRPLE6QkZPSdZM1BnylB+qIfI4BllmD2X+?= =?us-ascii?Q?VaJuwfqUS3k6cqSV4BDwwLBcqxU1GvVSKq4T61/V6Ht+aePqfqgeKvvp7WLM?= =?us-ascii?Q?GKDyUAJI9nyRdTsmStRLYdBKe1XdN2QJ02x9ocR131FUI59wvnHsdd3wc530?= =?us-ascii?Q?kp9d9p0nKEtOGCij2/JfdgV3M9COuJAWthBaecBcL3SXc2vpSBjM3x/M8Mab?= =?us-ascii?Q?zir4LU6EP63YiYQ+iq7nq48wwjQvGBIViqymmE6ojyTDw86Ogk1XgZeUEV24?= =?us-ascii?Q?xDuyaw6MEs9KU1KCKA6IuGrwM0Um5j0fh5+Rz/N5SBVcxprqdtXeDe8KVbvh?= =?us-ascii?Q?GkvRUXF95jtfe7eEvnsSKmhQiWS3N6BlvXruGGKo/KnrDakRe+04nhCBPL1t?= =?us-ascii?Q?vvB00u+pis8wKSsiYfllEv9dhlpIPdiP1IUuPAk2UrHF2kdKMF/mFWyCnqUw?= =?us-ascii?Q?uPcDCo3ko87VxBqXMaLV4n7MPjTAi1ssVlBeK8hjDgJHWGcM3pXyZhSEyVtK?= =?us-ascii?Q?u5vvgcFrkdBnSeuyZUGtmDaZFzryZ5jclCIrB+a0g8wwgQ2bugwH8O9isPV5?= =?us-ascii?Q?rG/HtWuRIL+B/gyTvs2iG85hkFtnMardvl8Vs+zSEhko9O3LYCEWoLstPcvm?= =?us-ascii?Q?UW0sHlcl8ykOuVBiag59qKeL13k0sDRUgiH1acfF4yM9OHDFgKf/ZsVWMMX2?= =?us-ascii?Q?/MeE+04AyjmW6jiGNRYtSupg+hBKXOFIw4LsA7pbTo9ASXdrFZDWsxDZuZJk?= =?us-ascii?Q?K18RTfhxp94bh1qzYmNA0IJSzBxhQP5SCaswzRWcvI3HVykzj4rKzQJC4sF+?= =?us-ascii?Q?KzGFIdDxZv8Z7dB1xSukp73vaEnb+6/D88AJeZS1dCwvKmG5BYBcHJqi+vjB?= =?us-ascii?Q?dmFMNeWPzGjet90FBsZw47/J8unvxmNVvX+rCAB4VYrt5P6E/rddz3sHXr2B?= =?us-ascii?Q?oWI5c60lNSmK2EoxKwc1GH8z30gI2cgtX2/L8uyW+GqkJkVOMDGdHNCa/MT4?= =?us-ascii?Q?hgc1Z4T6mdqyBa+AyG695aAI2VnLB3KIjcRl9zpnH54g4Gpb2e5fyhMlulst?= =?us-ascii?Q?kcOo7sBGdunhX6LPCzp0YYaZo0P/6V74AQ3LorP/+qKmIn7zO/qH2pMu+pGt?= =?us-ascii?Q?JmSx0BGZPVyqFcitYqD1FJ16idAleWDEwP7bJka4RSsZi4mwKkF8MkrQ4d7l?= =?us-ascii?Q?iDXBLf9x8QeEOJIgH4rdK5XVQQkrAZ1mqC/Sx++cSH3cjXzc48sP83EwWB08?= =?us-ascii?Q?o5qzkxY4kH9rhtuP9t408JNRVn1gkJSIXWMpdmw9CB5D5v10b1pc9ThPQD4e?= =?us-ascii?Q?gIkRyqhgiRtXfm6xn8meF9GrAMJIIjCZPItA06xs7dUKAEv2IpsCBa9/l9ho?= =?us-ascii?Q?EiXC0IdhPqQBcPmXcVxg33LEKtRZdsprGwZlgCjylLC3xfnj9Ir7DFpBfVyc?= =?us-ascii?Q?sBS15HjCaQ=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3ade90e-379d-40f6-6575-08de8078128a X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:43:52.9548 (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: qxxgPiqlAu8BpeApekkYJsF5JCVxXjvU4NScenej9Tb4ICnlubz3snioTs+toUSoJoFEzZBTminbanVGnzGk2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6870 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348264224158500 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: - Remove the XXX comments --- xen/arch/x86/acpi/cpu_idle.c | 19 +++++++++---------- 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(+), 15 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 0b3d0631dd..6622965ace 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,8 +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 && - (c->x86 > 0x6 || (c->x86 =3D=3D 6 && c->x86_model >=3D 14)) ) + if ( c->vendor =3D=3D X86_VENDOR_INTEL && c->vfm >=3D INTEL_CORE_YONAH= ) flags->bm_control =3D 0; } =20 @@ -1416,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; @@ -1648,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:56:00 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=1773348267; cv=pass; d=zohomail.com; s=zohoarc; b=MORjxJ1ERb7//Vg43E5gKoXOSGeYCu6fuQYQPN8SgI0X0uxDImHiQ+oHYMbJBhytqyGHdGOPO2LRrAwKYWHeEla7BBrSM8/iskaB66LWk9VBeULVuL3CUBsahb4h9QdoDJJemgDwTna8VBihxurIxOl5Grkb3iAcQ8vANN7MSHg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348267; 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=4bnrZNvGq+Vb9DJ9a2Zhmk9lhgnLVZNUoXX5pa4kBHY=; b=XL9mGV30y3LT/VzH6VRRw03+HTSisOdnMP9aHu9IYwsRZxdkrPsHq8902umbT6g5PTohInn56aYep+0tQZhNMOIjtMYvoSH2nZ/r+UBcdg9c1zCgaKv1THrHV1cWLU5+NPeDvRYJB1i4WU+3O+T7G+DG5zn/ZglrxyI3N6J6eAQ= 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 1773348267686825.7856426375557; Thu, 12 Mar 2026 13:44:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1252995.1549424 (Exim 4.92) (envelope-from ) id 1w0mt1-0006x5-AX; Thu, 12 Mar 2026 20:44:03 +0000 Received: by outflank-mailman (output) from mailman id 1252995.1549424; Thu, 12 Mar 2026 20:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mt1-0006wV-5c; Thu, 12 Mar 2026 20:44:03 +0000 Received: by outflank-mailman (input) for mailman id 1252995; Thu, 12 Mar 2026 20:44:01 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0msz-0006Bj-NL for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:44:01 +0000 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azlp170100001.outbound.protection.outlook.com [2a01:111:f403:c110::1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 327e1d0a-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:44:00 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6870.namprd03.prod.outlook.com (2603:10b6:510:167::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.12; Thu, 12 Mar 2026 20:43:57 +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.010; Thu, 12 Mar 2026 20:43:57 +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: 327e1d0a-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eCUmT5gviEyKBzndMK6THM3brdJ8BIZWpsTG9nUEckB3641RlhwyGMrDestVRvEN5ituHGrswBqmnvCNfIXKE1yaetA5QAU0xSrDT9BaO7I/LgrVKigdYEbQw6ktYjKRRS7UwfGaH8F+o1YtqFpLhQl5gqgo9cx/SW+mtLim+Kh44XuBU6M68bn112AG5CzhB6Qgjnkoe8em51PY2f0IW+Beom0AI0MNJOIDYqvDgtfpi+mf1qPQPoaI0s2Rg7hAoUdcUa2zvErV6nPtcSGECOzOr3V+1fwO3V3iV6uwfibRUS/JldJNuBhE/ykVAFLyTg0ZdOguQPUqRq+R2mhCCw== 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=4bnrZNvGq+Vb9DJ9a2Zhmk9lhgnLVZNUoXX5pa4kBHY=; b=NMoHz/3Y6427ofoyaQogUTxEBuM7UkDFFDxCAaws21wUIDkeNZntvHEttiuWjXWvMq3xGfpHCT/c9ua+I6GYtY1lZJ8B+9AVxvfbr59GZLvrNPB6xLI4x1JKqEdF51Ywzx8orjb/e+7t3bWdkGgN+NnvWoKjc2d5WTUwLajk3PotolkPeG43iU8bbQ764C30ROEIUe606hYzmyCzqPEOje+yOS8tnKfpY70RuD+FnTi9dYnQDxnYr3WYzCdUeW8dGkRm+umRCu0XPG8T9rVBdqTfHffKCYnyxwqgCgImEscyCtFeoSDZKgnm+hy6jhy8s41RQeSl2VgLfIhKuR5spw== 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=4bnrZNvGq+Vb9DJ9a2Zhmk9lhgnLVZNUoXX5pa4kBHY=; b=tNaK9LuNPb/DLthJmIzTXIyIQZGx5NFPe535tuFLHKg2oYVMOy481cBXetthyBoj2GphPRwrSokXkska5gPek8K8dhP8V8ZDSvgAvX1kIR9fxCRDRFkkIr1/P5AZOJfKLbNrbJ3IZzQ8RKZFXufoPvra/yrSj8P2PXiHe/fIXO8= 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 v2 3/7] x86: Remove Intel 0x65, 0x6e, 0x5d from VMX code Date: Thu, 12 Mar 2026 20:43:35 +0000 Message-ID: <20260312204339.740403-4-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0202.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a5::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_|PH0PR03MB6870:EE_ X-MS-Office365-Filtering-Correlation-Id: d4b828d5-4979-4d03-266e-08de80781507 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: vYGxs2EtMFW7PeqeaOA4GmxuWQrMO9lswagB8V1ippmHZaJo9/N58JRoLqRXYTCU1deDwSWHF5HtVsZIFwXDVlJi49PRe559TVhAs2GTpolcs+4OAPYLjex2iSFd6TmAfRVbrBl9zAvj7IdKEPCLC27lPBf0N9+GcFHTK2All291CXFxHwWwHSlz1AFDtcqbFtx2KV6vbIqRX0Wg7bWPzZCxSHQk4xl5eGlXJEX69tN2xU3VEa6NzrC8i+oNhnCzBfx8J0/w0v8rYj/9nM6W1lXKSDqnC/1nfINbJlVZKUlVX9+j0qHvmqb9GRAlBTP4kkr8ETvJW6TmYN+TwA3GIVJ7BXEkvtBHfemCe/TzUSRfSb72AUZa4o0tI0vRyYJcer1YGYkFfPDaA+ThDIWVfW1DRNumgcSmpMgA3R5KAC4CUxqrqdA1WAGAzCPDwPFTdog863gkQEB4ay+zbIYlw50/zg7lFb1E6munam1swv6lrGu4wcO5CHugoSZuWR2TdhI2iFZy/EHpdCMjHiN5K23lxDUmTQ3rIfCyK1MrPejUeq99bqVGc0fxjFsoGyWf5BuDsd2cGRcrnJwuCD7EPr8Ad7z/1aU5aMq8AF2t8nmiFdm763zgpndWkYXt/YQPdIxqVR7dqpjldYcMOaSPMh44aTbYuT9oTiNsfJQIHclU9KBtdkpYHSxi5apCbTZ3+3h2qmITobMJNLhFfswD/nAxFDN7sEPDNRj1Nvf9lOg= 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)(366016)(376014)(1800799024)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ATVvHdzGKSuWZcgtC7OhA3XbBoICBCoXZ8fejyS9EIE+Q3IJdnEA8BJHLxjc?= =?us-ascii?Q?BsBDxb/HJl/WKCmAW5jddTt+omthl8VS5+etj+tuT8xMpmxmNwI0HTnW6349?= =?us-ascii?Q?1sVpa51sirFeedFED3ZWVnlbORLukWulQc57bXgwnfXhYloxkUAPvQSkADnl?= =?us-ascii?Q?FNgnhMCepb1/rke3dCV9mJKa110OcnKrS9lRlLzoNhIjvo55YLKog49oUdK2?= =?us-ascii?Q?V+jUFtofqSANHdKBIkJ9wveuQOJQHbcLQLRh2EeP1lbDJ/OQ6bQJXgfCEi+d?= =?us-ascii?Q?rWDcv4EwsefSIrT7r3tvBUKZjc7DgEEJTVRvJJ+WTYp4Z8xPgPfp8eHpL7HE?= =?us-ascii?Q?jRgXv0zIAli35FOwJtOB6shY9Yp2oWM6qMcc+P2Z4EVzJIqfgXz/V2jbcbCW?= =?us-ascii?Q?AxAeiGUDWObqchYpA70bFhIY1MC59Z2yjECz1BnEDuQ7xqfKkM/nMjE54bQQ?= =?us-ascii?Q?21GyBaOS8Gn1YHwZA5a6QcoliHTzIO6pNpUGYAYUMClHhG+hxXsBM4n7k6Ty?= =?us-ascii?Q?/udSsgjEMkjxHuq0ufyYh+WyiKdRLjwbnGLqICosZYCRNt2n5Cp/0LCpPjnZ?= =?us-ascii?Q?z4641L1t6FZCuLLQT/uzhnku2bBkxmRXx05A5ldUiodx1q+MVaxK6yyR7siI?= =?us-ascii?Q?ZKpzfC4pEEw+GCcHpBiAmNXm99vVxdrFtoxV7BO2J5naoqaLJ0Z6vL0gQj4p?= =?us-ascii?Q?WjUGyqjw+ogwZ04ptrj8arD9CLZ5MKWymflsl3uEhpYG3tQjZDlXJqmUGSG4?= =?us-ascii?Q?ycsCKhSmCkInHbx60jG04GFTccaYQyeYRA2vx2+5uhzGPDsM1j5s2cJNh214?= =?us-ascii?Q?hz5MZJPUOdEAeNqz4NU+MBD2nr64rnZnmT8y2auXhmCAkYz65N9b0Olxn662?= =?us-ascii?Q?AKJr2liRoBgvohcG+X74+1jI7SCkcdr6d0fGL+Uwy6HGXKMo8f8YfdCQBvNj?= =?us-ascii?Q?4eZypCmrltvTSLuDrgbcoto6zfcchPANzqigN3Ub9Eo8Zx0liptXQbEX/swi?= =?us-ascii?Q?Cjk1oBt97wduTkFASOQEOIz7W94J+K4OLZxBbpYZQbBidH9yh11eKy71oL7c?= =?us-ascii?Q?pcFVSWKMC40BgTM+DqYkAQYFov+e7re4UDObRYIsMbR2eIRFfq18yZlqS1uD?= =?us-ascii?Q?n6qnT8uscylFrBEZOd+jM99zT9vHtkC1dYmR7TcTfxhcHeoBz1S6PJfkmfpO?= =?us-ascii?Q?FkFLbKaSBdPQ7VF6N80+zPj0E6h6VbmQsiux30rGwYgbictMnYcoJ24beHvB?= =?us-ascii?Q?uW+h8j7ypyK392COoY2hs6HGFmgCmkcFaXER1uJyigbf1QM5qfvV0szzFPBU?= =?us-ascii?Q?Ytl+Eh7MsxSBxqwr9pFqO58LLDSP5LOi8QoJhJf+tm5NhMH01EsC16VKyA9y?= =?us-ascii?Q?cG9HVEUfgGRmLGN1LaFrar+G+r+8Qh32QMmbNFoVgD0ksEav4aIh9Dt7pvts?= =?us-ascii?Q?CR505RnMVF6zSP2MW//YOlVqZsRV7oNZYEJXKCNnr8zuhPo4p/g1lT7EdUWZ?= =?us-ascii?Q?EZhfSG/antutHyIC/aIlmZK2mRVHgRI7ztMW+MOUigWeRt9vO6zDUULw9fmG?= =?us-ascii?Q?BcYmBp5QgqYZkSMbX0oTQHJZQqJ64WfhjAhBleeuWxhxuPvyqEvTiLS0quWx?= =?us-ascii?Q?D1Y1YSmy6jewfMsZBsfbmUFxtOmDLgSViI3OYIWo4Mk4ZAl7wIQKF+Q3Imrx?= =?us-ascii?Q?2fo7sJdKRFLNt0MSXtNOZNXi+qhraZQwzndAm5C7lcVkZ7CsJuKaePoMoyPv?= =?us-ascii?Q?I8TzM85dfQ=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4b828d5-4979-4d03-266e-08de80781507 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:43:57.1308 (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: m/yPSJECyAI5YnuPjia7ZCBY3CD3hOg3JgAyYBnJt56EoOBqsxvhO7agQPmjm45yMhIv0rnnqLLhA4TTngVEaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6870 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348268206158500 Content-Type: text/plain; charset="utf-8" These Intel models were used in cellular basestations and not regarded as general purpose processors. - 0x5d (SoFIA LTE AOSP) - 0x6e (Cougar Mountain) - 0x5d (SoFIA 3G Granite/ES2.1) Signed-off-by: Kevin Lampis --- Changes in v2: - New patch based on review comments --- 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:56:00 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=1773348267; cv=pass; d=zohomail.com; s=zohoarc; b=O8ZJjO30CM4I7Vg6a5wadwos2CtIQ4gVmkCwhtTJuUSBrNg/s4XjvWWtC0HT5vt97uiWzlRt5eyavZXKPU6vSpr+dWAM2gzM4hFOFs3LjqjNGam1kBWEG+LjowS9eNtVh0gBLSE5oLWjSs2TDbjWLB98jm9bujoZk0EO/efTmbw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348267; 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=I56d0W50ljTEtq6zSKU8BUWqQNcOEh+rwGgmRDXjn/0=; b=S/hfVDNduxKH4tydLONyAyyCoN8mkEmCSNmcdNPGvejF3KaH4PO5vJF2G5QgpdVoSztHxEYLaY5C6clvXuNvvOBgi58UeKViH8M5QnyphdU6l+jTRWw4F+vuurdUmP9SJh7tXarF9aPKG+z3e1T2SFdEEmw5VPxPET7lRyq6qec= 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 1773348267348475.3050719233811; Thu, 12 Mar 2026 13:44:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1252998.1549433 (Exim 4.92) (envelope-from ) id 1w0mt9-0007MS-IJ; Thu, 12 Mar 2026 20:44:11 +0000 Received: by outflank-mailman (output) from mailman id 1252998.1549433; Thu, 12 Mar 2026 20:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mt9-0007MJ-Dm; Thu, 12 Mar 2026 20:44:11 +0000 Received: by outflank-mailman (input) for mailman id 1252998; Thu, 12 Mar 2026 20:44:09 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mt7-0006Bj-3z for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:44:09 +0000 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazlp170110003.outbound.protection.outlook.com [2a01:111:f403:c10d::3]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 36872b5c-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:44:07 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6979.namprd03.prod.outlook.com (2603:10b6:510:169::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Thu, 12 Mar 2026 20:44:02 +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.010; Thu, 12 Mar 2026 20:44:01 +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: 36872b5c-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QTABYxefRgz+caiV6A8n0fC8NPIcaiEOayj+Jk2RMeU7f4SN63gKdK1+6v+nVjjIAPMNr1olVOOcbVU4b1AXfmwPE4kXPpsR0Msykuvf4S8gsVj45Z7P2UDipitfV84aRawzMrez8wVGZfOmaqUyG7ek0lYl5nI82pBkGV/oFEP0mpe881PSfInfX5vAsDZdWJoGqMnwG8N5ivY7G07WMWeEPfscjxUR9shCjzlgQ3qpvig6TmxdNoSBR8Beh9d3DzaahMhIO/WThSnik2S4BokdG16PMrj9PRRFWHgABUElpAROQ4vfmxv4uNOQ3jyByVwpse2iYmFPRnaNplqJQA== 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=I56d0W50ljTEtq6zSKU8BUWqQNcOEh+rwGgmRDXjn/0=; b=Pk/uEyETf45EB8HLTPmgzAfB/M801AL/3kw/pWAAQVM2O+B5g01zPJHI9mfC8ua5xshB3FJyUfXPTiWY2HvPCYrFGlJ2pUulLFHMuoaFFKcuV+iSdQMJz2Jvo3rKlOfq960u7fqSw6Gp15FrGqJi73/CmyqdA8HKtbyd3N2uIC1V9GX0cwwLp+0AxyRoBR9w1Ne+VVZkTdyNvTG/UvYg/fNTDZ8lh+cZYaeqIv9xJTm656AydywPTD1MKPm5nzr/aVD4amUH78LaDcGCBn9YlM82pxN9rug2cpNFLilWmJnowxEM+xcvpkHbC6RdnV77VBuA668YIby3aAVJTeQ3cg== 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=I56d0W50ljTEtq6zSKU8BUWqQNcOEh+rwGgmRDXjn/0=; b=tIFKHSs8RK6sAuUA2WRIqwh2MZn6pXVf08R/UP7aOd6OijmtTvsTjIhfbeJGA6Tp70f+6bCEGu3rMyYGXQ/OJ3I7K7XBB2iVoy18tLLQyd7WsJSWdU//2oS8+4nBY6uIKdxhArBj6V/R1IFnRDFe5FMoZilFwGKFTWRBh8IyPUA= 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 v2 4/7] x86: Remove x86 prefixed names from hvm code Date: Thu, 12 Mar 2026 20:43:36 +0000 Message-ID: <20260312204339.740403-5-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO3P265CA0001.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:bb::6) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|PH0PR03MB6979:EE_ X-MS-Office365-Filtering-Correlation-Id: b0ca2fed-caa1-46d1-bd20-08de807817ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016|22082099003|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: xgZN8KO+FslGQjMxjt1pEECouLWRRcSfO2cJyyWQQeOCi+Ov9VCpnj/tffOG1qqyOewykMEmdSvso/mlbapwjYGAArHEBmQc0sl7hSsvtG5YHetsPUBDGfGc9Nkk1HerF+2lvXpxlI7VA+4SNhdjdIv5DhZMDRclX8X4Cd0k9Co5FqKdf/m5WdX518xVGz4NtebMaWb/zygZF20Fr9LQK43WXB7VEn00pJthU+xR/zECz03Sq213QRwo1LFdTqeaVCsjiXUHO3A9lYKZEy+BAX2AeS+3I3DJcrSn4wqJSIA0xubM+wTG/3WvRcYvPthNGsdH+iBXnq65GKTHPe4OUaQQXFiJsS5ojfh77FcST5j79NHGDy1GFiX0r61CfDI2uJ0Yit5qbgunh0Ocv/VsOdwQ/zkFVMJuNbT+sQv/hvHbMVDRLMsKpHDUQUsTTvSvkTATEciPhEP2iUs2jnDZC34NIZRBxz3q39PAza/rnXRf9Kt0qP4Z3Spq9qO0Y2sEEm2lYqOyRlTrbLBnMLvghu7dJW1HhaXsJbW65Z2jJFYkBA0k3yvQhn8g1P7QrUopzc1CTxi+GaJjP+rVUx5qOaBK6QKVPAnd0XMogPSlJF+qG5lOB6xvosPUGxVcxqDVZ7VAGqCetGJUO/yOC28lJb7UzpxxmXi/z2yyLuOia4lw9rXZzf6p5REy7/brqNVGA//7zMZtNfKz26sprrnKWDchiHN/pXV19/DKQYlrSzk= 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)(376014)(366016)(22082099003)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YlomapYLIuQCbvtccQpnrCzmXjF8xGqcCNtNoRqrc2R74KMixUhVxVUzuY8/?= =?us-ascii?Q?+fg7YEtxEIg1MjFoHGrHqqt59ptYGEF9sI212OCY2wJ7GTaowDc8mVeQuDVN?= =?us-ascii?Q?/0Wg89mH+ZRfbJrTFqoZ5+qhc3uIYGtI1DUu09QqylfqLMeWpiwS/twyXjIp?= =?us-ascii?Q?6q/prAMgw+eIZ9euFWASG8H3fqBfdxi6YZPTzDRQ6dXkCbOtHBGWA5UnWHbP?= =?us-ascii?Q?bauqtz9dYpv5cysZIBxUpcgeAILF6RyXUsT6k1Q+UiHvxQpMRWIVHSrYGfTl?= =?us-ascii?Q?1X3bleGnZ0W/jFP+RD78ualL3B1RClEVLWeZ9u80omrhWMWYU+6a7XDZ0bo9?= =?us-ascii?Q?ZFed95Mn0Te3MvblUKMNpQK6UKxrEy6jBUn2yy6lpb9QJhS1A0mGwhQkacIg?= =?us-ascii?Q?tz2O7DAyzCJMvgcNoMh0Kp4OLPoZyqzLOfQMdHyt+9Ze9qw8iWGOMZys34BB?= =?us-ascii?Q?lyI4WenObnQ9VMI3s5iFdRY9L3YB2RMmdu0mX/3ZJsa/OwWXpP/hOXwsEbU6?= =?us-ascii?Q?q+Fbyh3pMzMBSGYFP09nPqUV9ZfZ0I0WPTKQEqnxfDm5cwg55M65L1X/CxWt?= =?us-ascii?Q?KwaRfIWF0BBghdPGJtbG1te7jBXeNEyDoDWt7LyJnxlpd/VL9aQdMOD0CFQb?= =?us-ascii?Q?VMPhbZ+68uK7vIgh+0Gh76AecKw6XBhqZwM/7+80f8vMC/l6t2ArQOpvpoFk?= =?us-ascii?Q?sYKgq8djKd8CFodOXlfASH4byBXv5FjpSFabu2wi3VAoRXcTqzjt6LAnZTFE?= =?us-ascii?Q?Z0rZb6XMvdJd3xlbJD4d/jwliEltdYlBRkwo+OAUAMK4M/tMpKi1szOzTu7B?= =?us-ascii?Q?kUDgaHWv1I6FAGuszk029ja97BY1Do8dan+4jehySf8TgacyuZ8sFSeUGkQQ?= =?us-ascii?Q?kwSQjrAEAQDAyPRbFzfO4NUz0ZhCDuE0Tgwj0GXYVAgM8t9YwIS6lqRYioRy?= =?us-ascii?Q?ADKZmD1BjZSyQRMDAcXxnph6jsMSwEhpT/zHARqgu4l0hFb8p5ZiVOZxQQD4?= =?us-ascii?Q?tmMeln9aNPIUUoJYarCCCjz+HEquLB99jWEsi2mtVIf8GzMYaQjcaFMWqHBz?= =?us-ascii?Q?YmaPCzLQyezBeW5oV0pN1aQ9eyvHA/X/t7AXjACYiETNX5bf73V0WSZ3fhrB?= =?us-ascii?Q?Kf3zEEO62yXNS5tk330Ehn8k69RW0H7OCWpOcd752lhn0WCrTWSNCI8f+kh/?= =?us-ascii?Q?lQBD7VTUA0eb9LAxMCF9e5bpEx/MUi/f56WZb9EuFtcVa8+YH296SSYOR35B?= =?us-ascii?Q?l9SOxPEs4fk0MFe7/a3gWws2L5DgyHtpm1w2KWkHVT80DFL1kNwhCye8F7Zk?= =?us-ascii?Q?eQZena5z2Z6hnPGcJK0l7x9FekJ8HkPORYruiUgJhbVE0qaUMIy22GnD3Wme?= =?us-ascii?Q?h8soKFT9gtb5i/biXoLuw877dD7iqBPkXfLrIn4z9cSi5firkpJwuM2NCHZz?= =?us-ascii?Q?VUEStXLkuma0Ir9tnWcqeXMhyJl9fkmqm20ppQFptiyXsGz9c2WZMUySspR7?= =?us-ascii?Q?F4KQy3sDjIXaPGk2+y9yqzJlG3Z/rNT75/zMsp8ymN0QuD4aHq5nQ6sSdE6+?= =?us-ascii?Q?FmmKz4JbKodYogSwl68OFXnwWI8ziQEESdTZg01svv4az0HiqDERoaybD8Xk?= =?us-ascii?Q?1UGtjBLr4niDZKX9FApeqyB20MDQVbLp9L23W7hc47ByY0pU2c2b64C6VKYT?= =?us-ascii?Q?Un7q6oO18ZSy50CLjzzlpDFN0cY6ykADsx3d/EemxdZjy8SjtMzskKRzyRHo?= =?us-ascii?Q?y2B9ycA3pA=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0ca2fed-caa1-46d1-bd20-08de807817ba X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:44:01.7036 (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: aBLlv7y8XDtgqzxceLWNihQNhcb9MM5Nhc13P9vsQducmy3Lr8LLlv7ongMaCwwiM6IhXMYxUtE8VnDihEB9uw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6979 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348291306158500 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() --- 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:56:00 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=1773348277; cv=pass; d=zohomail.com; s=zohoarc; b=c3wshKTUYYtZJIgQSf90Tzt7I/RdmnTuyg2ufmrBLztNWYFjG2T563+gdiJIo84Sp0m3s/PeRyuAF2xIJqcJzBlsPJ5gTGKFD1N15TuTARKAszuMpfG2FuJoij9Vs9Rg3GQjolFV+hpQU2Hi9ky5lWYtBI13+CRL/Ix8C7/vRWI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348277; 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=U0o9ybYsubF19k60JOis6AlLc6jRcwgP3O3U/ssKhw4=; b=Gvj/+WU6fn00Wlh+jDUVERFz6HcqTuXC+BZYgl/1c/Dxa5g7ivxgS0J+D+2x/pyAXLtIByQzvXUNa+b+tYl1SRRHTN99bxn1USfr3Jz8Wo+vih7nbUcOb0QXBLhnevj9FFnF+tdCqXKbt6qsaFguOx/mSTXAOC1h8fhV8zf8PMM= 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 1773348277278580.3484289811527; Thu, 12 Mar 2026 13:44:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253006.1549442 (Exim 4.92) (envelope-from ) id 1w0mtD-0007kl-2K; Thu, 12 Mar 2026 20:44:15 +0000 Received: by outflank-mailman (output) from mailman id 1253006.1549442; Thu, 12 Mar 2026 20:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mtC-0007kd-SV; Thu, 12 Mar 2026 20:44:14 +0000 Received: by outflank-mailman (input) for mailman id 1253006; Thu, 12 Mar 2026 20:44:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mtB-0006Bj-PA for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:44:13 +0000 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazlp170110003.outbound.protection.outlook.com [2a01:111:f403:c10d::3]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 39ec5d5d-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:44:13 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6979.namprd03.prod.outlook.com (2603:10b6:510:169::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Thu, 12 Mar 2026 20:44:10 +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.010; Thu, 12 Mar 2026 20:44:10 +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: 39ec5d5d-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cwG5oXut7vqbXe8pKmroMCzc2RJRkWXAi0FWwK8tcLl/qL4gzhhcPomh+vMVZuU9YRNjof6IRH1mRdpU7igwScVhGc6ls+Rm5YKjiAKy1xWiX0nujIN3Q306xyQIFfAjgNTjDPTAztI3w1RzVPoQDRJ2MpLTvJTUoiTJwIHZHL6UPCROEyohQsEfzChUHDH3d5GrHVSxuQLbL/aMB2BxWIPRONC0IjqDTsPnGJMaKvEwUX8t/alKsBMaMqrbMh96zPCyrXfyYb3E/pezUQrXLMhyQxmR7SlMcfEPwpd4Y+RKivSJQm2tBmS0BTvrY+Pd9tnovOgI/8KSSXS1mqNacw== 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=U0o9ybYsubF19k60JOis6AlLc6jRcwgP3O3U/ssKhw4=; b=uinerQgjhulfa+OEa6ETFDEJPvfwyZy0CtX4wWA048lZVIUhdJIotVcbgKJtrYCetBMKFM+jldkXajsM+Ve9LcSDfcuEyxGvQ5qPcZNml+Gtm3WM3dS40TJzP/J4tc28qu7qyNh9y0OtmyplM4w/rVoOeCWukZAoWc8CC4NLX0AWG/JZ/BYuD5b/ioxmSafEc0OqnOda5PuNbBPhdw0ZV3oEH8kZmPV6Np8m+OAzLLQOXqdY6gt2syRmwHSEuCzk//Dcl1HhZk4HXf9BDUPZBCeYExcXsS6twOxSju4BIIAT5nogySi0nbo97ppXOZFQt/sD2+P7nj2+IDGpP6HJFg== 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=U0o9ybYsubF19k60JOis6AlLc6jRcwgP3O3U/ssKhw4=; b=y+HjgRKIjBB3dUFd5PB9yN757Q2AYaY9kuIb6kIp3A+8CKk/oxwIEVxKx/0gOdapDca7W8PAPPlkjMf68LAkCuno1EfJLzZ+4ricXWk9tJsHSVcerpfemyWAru6BiXL/nhrx4Jik+kl5mR9nuFOakW34qMkzBXyBgsTKxL4Nu+E= 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 v2 5/7] x86: Remove x86 prefixed names from x86/cpu/ files Date: Thu, 12 Mar 2026 20:43:37 +0000 Message-ID: <20260312204339.740403-6-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO0P265CA0008.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:355::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_|PH0PR03MB6979:EE_ X-MS-Office365-Filtering-Correlation-Id: fc3b4f0c-1591-4fbb-f92c-08de80781cc1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016|22082099003|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: 34l+ql4KHgVLMDMiqPXKo0oyvVGpL+bCXc6jcScFCyoPQWdrHuf4HLaddNAuuQ6FUXr44wHgFUhi5ibgB6U8BoGBaGcVMFQunc1Rx4hX6tgcQS068LVrsSam/o0M79RZ3BSBojR/4BXSwUGrt4PEy0/kZzSD7D43MRj6DQFQB+56rPjZ5o0oMZNy17QBKl6RtCh2LZIVVaYh1p/M+UnfyMUKG0nhS4TRWmBR87VOkSGf4SbACTes8D4ABEYzOYsIvyYVMMyqN5PB5o048Xw1jVfRQzZc8BRurPEND+atB1LQj4f4dK3b/st8Q6gUJhG9n6d/PYTh5wAoSuGg6d1yuP2YwQaQey/8z7PPoha304sCDmx1imb5fAvj5MDViGHU3a2nupg4IUYjgdP3Wbm0PStbCV8O4DQrjIg+OuyCxR5pHJlUpjV6XAKkoTvoGZCyy4Wh65VRGjV12K1KGCqdqOw5HddYphm5klwAjn/xwDkDXtYHi6Wipw5OARBh4S95rVnwLREfF1crr9Gz6/wkB1Pu6CE1XmMZGDQzIRLvjk4wifkWISZJGM8d2Z3ZywOsR1mU5IzaQdg9fxE7EpOb6PlzjBklBxW0/lThE/rm7XB2Jf3kZp43evYXtp0DDmug7fvbOePCeYGfv35p1u7FzPWMal2QRbkuzJtAJ/UgUw1Epm9zZe2AmyTJtjOawS+NbccKVdzhN6qoVCpvdFkb1hr+nQc7A0Mt3y/UbPzipTo= 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)(376014)(366016)(22082099003)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P8fNO/MINTdSdgkyGvrqrhQahlb9MG08lsQf9WCIOl0vLnNl6rcbrWk5WprI?= =?us-ascii?Q?OClFl8CDZA18J0wvcPd4VqlExrHU17Et/LLvYBaAcXcvFj0nYMV0IxXtZ265?= =?us-ascii?Q?vrkiHg1ycVw8LO5Auh7cYOwkTgH9/Gie3Fiepv65ileAUMzWHBvVQ8c/Ik5w?= =?us-ascii?Q?4CWjKp1tSsJkk/2PhSPS7Lm/JBTXkXFwlIpPdqtekwSAYBRiC+T9hFf+F7aY?= =?us-ascii?Q?LKb/0Aw33YSYyA08r7vDRUBCIjSkquCTsck3iiASgLfHIwUcDwzqYUjS70/U?= =?us-ascii?Q?o4k5aNhki1peiSc7LEG6LS+9RvpKngLbR1T+c03K87Wbl4Axe9WjxdUpSjgb?= =?us-ascii?Q?FArp6a1y565y7xvL064Rbc38yJrmtyQquGOQRyzDUocnC27vz+ovArPuB9aC?= =?us-ascii?Q?8fXXcT+TfRjg4DfNmJ5MEYjnB5FCNSztsW5Ro/sjaDe5tN1IgmT8F67M2BXx?= =?us-ascii?Q?7LEC+CN6GtraitXXWYZr6jSA8WBYRkRWspxt2UOUHYgUigb25Ij3Z2IFEqQo?= =?us-ascii?Q?XIn+Pc04R5+7GvpS9fc8KkEq1YsR0vhZko3QiuIvAkND+D5P8ByQ6NrQAc7e?= =?us-ascii?Q?j7dEGuziojMJvgcz351lHTrA35XPvP1KGN7uIFfU+EYoG8mitOdFWzkuL+IY?= =?us-ascii?Q?NAEV6vB7j7Bx3KISUzD/plm2+CEGWXJSB8+KDOKoxC8FDnudl2nmqC51GUFI?= =?us-ascii?Q?zqZLfEsCG6PqPs+V/9rzKNUsq27X5n3fUMoDfqDZ/9o/A0/dobaBriaLTzDz?= =?us-ascii?Q?OYaREx7XXLbgDgH1g0x0Oenp6TGqWFcBbaW+BTZ8W5UoN7YrAfFlQMG2nnNl?= =?us-ascii?Q?u4lzWxClKSBOLZuT4a6ARb83UASh1RygUxjAjETY84t8MgWQLPe3zRRuILu0?= =?us-ascii?Q?tBXsQ13lIWJsSUGoLgX/Gp69MQugP2gQhry4+S6b2JqGCZS0/DCfMo7wJXIX?= =?us-ascii?Q?1JP1Y1q3sqSy2Fw+4pn5B4XGdvZ60jyH6hKpuKBNegB+4OuMeqY6TP8Ch2Wm?= =?us-ascii?Q?8AGBcLCKP5MCtaNC0JhEj1gsl7/PQaMoONOWukvMOVZxUTun4Vy007J/Ylt2?= =?us-ascii?Q?9ETWe8QEqT1vcqFTqRKWr7jy/Zxvq2tgVZZ7NJRFf2Ut06IhBBFurY6CWZK0?= =?us-ascii?Q?+Qpu5Ftkt04sH12ktu8jlr7vgp4Hu82WvAlVU362gLbpyedD+E0xutAkEVE5?= =?us-ascii?Q?kIKh6wmbqbVKg4fCVIyfXvamTDGGKeiWEDoZOIaX9f1RoNnMrw3yawFt+vi6?= =?us-ascii?Q?5cvaJ3Q+z5JEHAJbDYLR03p3aW9krKRLokPyzFwB/bEZ2DA3O+VwHJD1OMBh?= =?us-ascii?Q?U6YMGBeSUcZhhsQYHx8mkqjQBxG5Q9d6fy0wFJ2E4wKC+soAI66ZpOnqG+De?= =?us-ascii?Q?85q+r1LWIlsbA1s2euJFEq140nW1M1yNgcDqv4lmrkCB3MgSWe/mutXHCpgd?= =?us-ascii?Q?ZhJSUdGtoTOAoN6TMcOIIUaX0c8AChxJ5z2SqLMGjN8SJWIwCRTzsz1e4O7+?= =?us-ascii?Q?9bc8xwh+TBMudfqZDNBcUzfio4KUmMUsOTI++sb5qPboQjt38A2hw23zbedI?= =?us-ascii?Q?F3eGuIxdC+zySaS9G8JidqXPOjnR/FsPPG1OY+scU/N9Uue8Ug2qhc2+iq6K?= =?us-ascii?Q?fXLDzdNDUwnBwHWD040VSj+cfI2UH9LYw9kXA7ecOVMMXZobeX+iv1TBXSfx?= =?us-ascii?Q?v37qyWbmiBfoOgeYHSu+jApTmdKOzJv7wys1ADZHCaNA4Z/iBzwNRuHuNgVQ?= =?us-ascii?Q?tf/UXC3QSw=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc3b4f0c-1591-4fbb-f92c-08de80781cc1 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:44:10.1132 (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: eKzbMzWF+yQ4WduBdhHupxlD54RuCX4hJjRi1w65mJIN7D+SJMH0mcGjifPrAvrLXL6Ja66ZR93fZGrQGWfGdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6979 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348278588158500 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: - Switch uint8_t to unsigned int in vpmu_arch_initialise() - Switch int to unsigned int in vpmu_init() - Remove XXX comments --- 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 | 6 +++--- 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, 19 insertions(+), 19 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 c587e9140e..190be7f1b4 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -218,9 +218,9 @@ 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) || - boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_HYGON) { + if ((boot_cpu_data.vendor =3D=3D X86_VENDOR_AMD && + boot_cpu_data.family >=3D 0xf) || + 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:56:00 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=1773348289; cv=pass; d=zohomail.com; s=zohoarc; b=Dw9lnmZKBlmdoFJHMoWCv8WxjlUBSSBU7rhYc8Rcd1NQI8BVzh1BYv+SUl4/2Kn1vdpbmdt5TiZJaE3ncJz6yueq0/lDELSPr8k3J1GKj85Tr0s0f/ya981HJVDDwQ0ZDaFDW7/uwJJYs6mlojOE2ZLwz6j73s5MAF5w00XMtno= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348289; 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=7fJg8okjUbsXwQL72YI3Ef64Z5xJVF476Y9inw/GDl0=; b=AYGpIwZtEh3Vs/8zuoZW/L8yBxdf8AcZAFUJ6l5orkRYTywIjdQu6saRgAROc3wIdEun/d3Q5BlEA+BBtqTiqxcRAXZcgEYTB894nDGu4rGTIkgZ9Ozihh5A8Y7LQzvql0VOFIKNcb3zjjAYi2RaU4shNwUNZ/0y8s6qI/Nh4ns= 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 1773348285299177.77476350046163; Thu, 12 Mar 2026 13:44:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253014.1549451 (Exim 4.92) (envelope-from ) id 1w0mtJ-0008Dn-B1; Thu, 12 Mar 2026 20:44:21 +0000 Received: by outflank-mailman (output) from mailman id 1253014.1549451; Thu, 12 Mar 2026 20:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mtJ-0008Dg-85; Thu, 12 Mar 2026 20:44:21 +0000 Received: by outflank-mailman (input) for mailman id 1253014; Thu, 12 Mar 2026 20:44:19 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mtH-0006Bj-9O for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:44:19 +0000 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azlp170120001.outbound.protection.outlook.com [2a01:111:f403:c107::1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3d1e406e-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:44:18 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6979.namprd03.prod.outlook.com (2603:10b6:510:169::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Thu, 12 Mar 2026 20:44:14 +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.010; Thu, 12 Mar 2026 20:44:14 +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: 3d1e406e-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RSye53M99Gu5WnsdM3B1OI2RnrAVDbjQBM2XAJuKdj0yPEnZAtRC251x2PifeQhFjyCpVtQueSIfpppCmzQEVE2OEKCD8mZ595L5KA/dD88+9YmO35KW7PMkXww3C3wv2UVShV8VGTp22OaKbkxHLbY6DQw6OrcNlsaMnog2JwaRREZMORfDhZW/Tl0jkz6lzvr0e75rtHW+huLToV8ao3sNCDVMngbcRw2FyFE1PJMVI2yI+PfyowJ8g2rCZlcmw66xYSHPZSSHddQ+c2H7tvTfldvRzO3SE/bGMxkxInF6MIkPLzwnwWUaLt0sb4E4vg6S/Yz5gAzzLg/So5HBHA== 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=7fJg8okjUbsXwQL72YI3Ef64Z5xJVF476Y9inw/GDl0=; b=Lc5qX6Y6lasGmrf3EWGg4V6TUPWIqtvOie1MkT1bA+tPc88WJkn2w38Nbvd4YkHtUS03QCWwG2YhjSPaSZpuWC2cK1XS0AWPEFag2ijYWXwORU3LcCcP0pkm0GciB9BmB9XIPJgACbx/+SFoJTN92CYpxSH8tcix56pXk4kxSzTP6SQQOmgK3SS8uqVuaL1NatVCTzCKA3c3DgsqFTwHEUtje4dKjdxezUWR4orLZRTu3TKfwtghKLykdk8SLNoiJ/wHLscr0CF2u3cw28sQ1fT7W1QV6NhcAmIMlMez1TWFnu0hdfgW1l5yCAPzbM7+VLxjj1OeRRlsGXKFrt6/Qw== 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=7fJg8okjUbsXwQL72YI3Ef64Z5xJVF476Y9inw/GDl0=; b=WtesFeQHiuzyP7YxDH0KEMVZ91VHup9b0yH8Uwizy1ZaaROxOlSGCcuN+ze04VAtVcs256Ias7nlQ4qOBqGBZQBIE8dx9zSuSBnWV1+S6bNGc9MYHRtZH1hzyEKRPbJXvNOxG/sxNphUFRlhsxdw7TF4iXI8+h/qfJKKreLpiJg= 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 v2 6/7] x86: Remove x86 prefixed names from cpuinfo Date: Thu, 12 Mar 2026 20:43:38 +0000 Message-ID: <20260312204339.740403-7-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0386.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18f::13) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|PH0PR03MB6979:EE_ X-MS-Office365-Filtering-Correlation-Id: 86638b2c-b4c2-49e1-fdeb-08de80781f79 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: FO136Cpi/WbXf8rWWQgutBD8IZFx9Zl1Tl0mg/d8NrBGINexHnUFtPfeA1HnkG2cDVZGkYS2w13eobL22gONpRtZZM+lL5YWaFCgHX6BTePhv0gKzdW7eCvJyZcNpGUGE/hMX9/4Sb5FGfOIlc6B8E7VHMHCHqDxEIqD5NTaHF1KfPa2/W9jwYM5Z3MgBDJOGXkoLLpCZxr64KaapIs151sRJ+ILuneD637uj4/ivzfrrJlKWpoNB0uEjH9MafY7m4xeIccaSVcyNTm3EFaSME4YWtMCcr/IxntkzJHq1jxiaPBxaY4MrEnoIHJTGuZNsGt2722wrJO8bovPDSBPngAsTBodCy6IPRb4CvopOnnzqtbBPkxYbtUMIi068LoZISPeK25qgKxAolHVwtPuTDMVXCO5zK4sjRUyHlwRNMvgrlBjqJafLE4uopCScGechYP/hscqrOGdZ27IWRsDVN3YGnYADLRWQUEQTzOaT5V+kVAPE6364dwd66FS6gZshshAF8lONJswwSLXb4vFhG7FuRgWMxB3hpfZPTy90+bxkFn/XeDp8MLREvutVDzipiqfZxrGfVB+PsVsxh4stEbH0zf6KsUI3AX2DEn28/skNO+KOgmOi41CkBwahgPMbf0Em2beAnXyQenUVVPffiGc691SMqcWUVVGSHaZFBe+2mHf2/07EsEr2W2FzWR37Qf3YAQMwzIvl/uV7TF0bznFyuMGJRe8n0ZxpMTg3TY= 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)(366016)(1800799024)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x9o2mq9G8OfQ3daj75c1gkpr6hawwAECZI96DQL9pYyIvDsSNf/V8ZtTJLsE?= =?us-ascii?Q?XhbrrNFm/LGhpWbhqYwMFEXoIZxLaU2adeNnzaQ49UqSKB7U+ylwY4Xuy1vU?= =?us-ascii?Q?EDkN9bUZga0EN5C+r3Zi9mroQwB9/0BrFiJjBGdRu2KYNWIviqZzSdzHnBYn?= =?us-ascii?Q?/+0PyfsMzqCvE7tOJruGf7wZ9QBHnUgkfy3QQHX5GCSy8+sRF5XW2ZLGn0KT?= =?us-ascii?Q?j9mPbbhOu4raBeHzqv6uv5C8oJaNLroiUizdIDqe8PSTGjLd2f+uhSxO4lVL?= =?us-ascii?Q?QnzMDM8VsxnsPk373jADclT7Z0o03kW/4EEnX5StfsCg5quyEymRYCKMMEXt?= =?us-ascii?Q?xmMLF6xB4Cl/tWFoUIkDrrxMskiDLDjUIrZ6K+zdXgf8w8s0XW8JxIXteguZ?= =?us-ascii?Q?k0Xatiiw+rncqqrbTWyeAN5hUhrm1MuPM3N4ZWp+GvMUHrE4NyhFnj6LxLdM?= =?us-ascii?Q?5ka75LqLNp/PsrUnQPUoHSk5sxOnwTIBHdPd41vBaIheHT8X9Ysea6FIolUK?= =?us-ascii?Q?rTnknwiYTbfDFDMzvWIsQjPAlv1EOxTn1P+/RRMfefe5ey0KmFqdVjVC+37n?= =?us-ascii?Q?eCYnOZvxnFjOP+3QTwACFSczxO67AxALR0OToG2NjmDWxUEjmbqPA5IB8SXp?= =?us-ascii?Q?wyhr63Lu7QZxJ+TqPJNCNC6WQ/Howb4Dm87e91IKH/edzL8J2mfmZRE3MG+O?= =?us-ascii?Q?r257g7bWwktd40ad0dJ8ytKMtncuaDsr5+vHduS1YoOg/uUXXDBnHir9UCQa?= =?us-ascii?Q?H/+cZrCxH4ywo4ChJdLRItD9dnjA7E/5AQx9JnljWxKbzAlwz8yyRIDl+I5w?= =?us-ascii?Q?nMR4m+AyFRyMaM4ZN1C19tp5FUuZ/ra+0JC2+l5ubP1vW4ybhzJ/BB3EVJCd?= =?us-ascii?Q?EaE7292zA7lK1GxkIH5xSSXWvTFGSAmvqkqM5un1a0Xm3g41k8mntSeFueEt?= =?us-ascii?Q?6DK8eACq74FJwMp+7fiQuLJ4eOcAusgyCDj58tA+aisrMe6ZxwruhWFpIRfS?= =?us-ascii?Q?o6yT5Qf/hpuR0DPxEfGaxjRr3SvabZmkHn0khDKZVoxwX4TXPOKL1WZ7Vqd8?= =?us-ascii?Q?89mhCgltkT+4Ttk2sh37JZCcxif/dN3LhaBN/Nw9YYRksesfI/tyHtE9z1Td?= =?us-ascii?Q?r/yEQmaXQxsDTGyPHlehaozf07XPdUqQXH9Ydskpu2t0Cz3SbJA7e5pdmDpy?= =?us-ascii?Q?r0lpdBoMPgY2kAzP/XomkQhuoSvxnF42N+aod0dPhQMY5WInoF4eytc/621x?= =?us-ascii?Q?dozFQQP0HubKfk+jiWaWY0V5DSBA1v9uz9KUJgBL+mXuOvezmFgmu2AZ3EUk?= =?us-ascii?Q?N6P/Wq4xCcKGSeddhFz7nmuKqghVRp4AGRGUH6DB7yem235aSQ8JzNs1+Qt7?= =?us-ascii?Q?1EdSUfp9kTEtgH/oMrfVqLzRSQfDQh7eLo9jQqAkkNPQd5kH7fa1iPED70ru?= =?us-ascii?Q?rdu/EiFCvha7ve97gAlTeKpX7sw+IV1M+1zOR7/qPry5x+p5qO30cY/7dFQZ?= =?us-ascii?Q?4fTvfZ2lXdCAIBNL1cEJyQ5WZuGpjRJb23ndt4bUdK40bZj8T4RPp26JqFv6?= =?us-ascii?Q?UMj1th67Zn1D9t/4q4Va6FfyW6NC27vI66b15YUaUKyuGwOaerEmOCnW7rwB?= =?us-ascii?Q?Cc32XVgXi7mQl6l48/m7Mky2kMNHA48cyoko3iDeENnh1xppxZIWiSMV6kC/?= =?us-ascii?Q?yjHVhrQPejbxWykhzUUIpdqRTXZ+O44h91PuZ1N8aNbUzdOlXHhhqZ3IGIdY?= =?us-ascii?Q?i9sDf0wmSw=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86638b2c-b4c2-49e1-fdeb-08de80781f79 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:44:14.6724 (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: Hq/BR2iWmf7kSh4xtWDbUlJfSmj1UI6BALpCU7FiyY/l6264P7hM0Blv0Z9z8m4UQZ8eEUN+ffIWvRXogFFAmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6979 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348296749154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kevin Lampis Acked-by: Jan Beulich --- Changes in v2: - Remove the unneeded unions --- 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 From nobody Mon Mar 23 19:56:00 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=1773348462; cv=pass; d=zohomail.com; s=zohoarc; b=Y/mu7BV6LADvjOLlHdTHmpvfqM/IqVg6OS2f6U8Vdjf9XjIWqskJ70E6S2rcrb4W8kBV9EjZdktlebKuTu9biwLXY0ZIuXnsGo39h1jiaNWd50hyxF6q824V2q/3ajrUoEn/6lJauRqSCstLCt9J5QJrrnhrGGo8kd7h8Z+x0l4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773348462; 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=pkexYGptCHbgLndtPlhEQnAVvgf8/mTkKb/te38N9IQ=; b=NnjIJtEAlH4fdh/GD4KCslzqOwjUTuomZDiyaWM1vFkt5IGVvjlvKqN2tGCHnARBCD57hMazvGeDdeJ/W9RA1tAp2iWgudJbk1n19RIEuMi1VLb5LBwbKT1sV5Xeygqumiloq68VdlJpYowtnKG0bsRr1WVuWyPxoIdnoWJTPyo= 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 1773348462182711.3201242207385; Thu, 12 Mar 2026 13:47:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1253046.1549460 (Exim 4.92) (envelope-from ) id 1w0mwH-0001RJ-Sx; Thu, 12 Mar 2026 20:47:25 +0000 Received: by outflank-mailman (output) from mailman id 1253046.1549460; Thu, 12 Mar 2026 20:47: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 1w0mwH-0001RC-PT; Thu, 12 Mar 2026 20:47:25 +0000 Received: by outflank-mailman (input) for mailman id 1253046; Thu, 12 Mar 2026 20:47:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w0mtJ-0006Bj-Ri for xen-devel@lists.xenproject.org; Thu, 12 Mar 2026 20:44:21 +0000 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azlp170120001.outbound.protection.outlook.com [2a01:111:f403:c107::1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3ebe399f-1e54-11f1-b164-2bf370ae4941; Thu, 12 Mar 2026 21:44:21 +0100 (CET) Received: from BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) by PH0PR03MB6979.namprd03.prod.outlook.com (2603:10b6:510:169::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Thu, 12 Mar 2026 20:44:18 +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.010; Thu, 12 Mar 2026 20:44:18 +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: 3ebe399f-1e54-11f1-b164-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Jm1T4zb/POnqnOUD0H0yjBgtkrb0ewgECKYD5Ctn7e+ioCVZgij/DaEp97a0ikN/zCmdpFAgtkZTWALB6imv1aOlbZ5BS2h2zbZCeQxmket5qwwWFE8TwyyjhFW1jX+5QztFSWkgXJMdDpSVVlevVcIS/zHETDEKB4Dz3OWp3H9xbHwzDufNwt3ZY4iOTRHH+yhcerYmSwOleQwddRRXx17a3+V0oz7pLybq3p5Ws81YHYtmL8o0ZYyHk7JH6HdpFrF2YXmpwtp6RJ/NhYpBQ9Sa9zvOk59fbpWhPlc5C6I0cf8zO71JLg0L2iWJfGvIHIYUBBQrJ4sXPunqo765IQ== 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=pkexYGptCHbgLndtPlhEQnAVvgf8/mTkKb/te38N9IQ=; b=gFAxtI7kWRhoLvKn69JokvtWXRdTugfINxrGGYZo1EbIO1ZOiO6MviNYoOTELLNKdTWpsnQLhZXyglnFPEx7LIuufuO0Ypsd2LaZf8DdlzmSAqNV0NLkVGEHGITloyYPdpMBhwUqr7uU0gJmOgiqO2gNgEwQ4zDgbEacaTj2tDAtkmc1BexP6OK5gKprSqJvgv33n4PB3yYSYwtQjyKDFg4obtwywLsZfcZg87rMNRuq3IaNcigiJ/nFfIwodvbyXKtrEFBBZJb4j7yCQwpENuw4jLynaK1c/8TUKLfNwWJvT7r99rGu4mGhbNUtWnQTv3i4VqztRHMnOXTKZtE6lQ== 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=pkexYGptCHbgLndtPlhEQnAVvgf8/mTkKb/te38N9IQ=; b=aaYnpm4hx66R4qehByBCcYn786JTN71LoB7QkiFaXTLo0LjfeLHe3G7nxU8oPmCC55FzAmOreO8zW+As75+KtvN7tO4GLClj7MUY6Dwe+lYIsGjGwkytKeIZ2lUfH/H4/Csd5iFJPyHOOUF1FCQDsD2vZ9MgRNBYdEnzvLBKgew= 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 v2 7/7] x86: relax some CPU checks for non-64 bit CPUs Date: Thu, 12 Mar 2026 20:43:39 +0000 Message-ID: <20260312204339.740403-8-kevin.lampis@citrix.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260312204339.740403-1-kevin.lampis@citrix.com> References: <20260312204339.740403-1-kevin.lampis@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0397.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:189::6) To BY1PR03MB7996.namprd03.prod.outlook.com (2603:10b6:a03:5b2::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PR03MB7996:EE_|PH0PR03MB6979:EE_ X-MS-Office365-Filtering-Correlation-Id: 336731d1-0c8c-4079-c365-08de807821e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: VYU0VFfgG1ayuXg3aofDvX0H0O8tsINDkbSa9GsFzFLtRLlUEOSLDtCud4vnHaijCec8eeXU1iDOdAPFrkyOah9QdPoYCePtzjGi72DZVQJAQsto0tO2hsxwJHrbHz++WL3BY5D8RhL6ckYkHyZJCYip1Yl9oLEi+D1YxBGgU9ted0o6641kFTw3P7+TflCnZU/v7ZJ2ZRRs8k5ZUr8cBWYfjQKMax74NUYoV2l8ANORHrvMto4Ejb1ueLGWNwa/7CQy+ceswl6SMB0YjOBaKMlB1Ns6NhN1xP/3YaKLZEASR6R3dG98Gi7vVqUIGaiWSBcDX2NsNGTpZi4mLllb8woNkIi99KmI7EhuSmRjpg5fYWCwogFjU9T8aiikAtt1Vh9KfbTjWUBabmCMy11tx7WGDxeHDqVI551Q6sxVYH3w0UCR9jA9V/n56bGi54q2npScYWxyN/K9UFZ3SaCkn4jhnhL+yIsIgPi6xsrweQ85FHj1g4rGd0EkaeqBSlmQx5GnV0PJKyzuts5md0MsXYLkCKGtNCU1YXh+peDIDUxNhPQhLROo/w578TaZ1qos9Ejsb18eMUk5Z2QBKkGh1b+DmUh7xOtdBAztfDu2n+dRnk4/SAe635sHlHWq06lARp6jFX4TGZRRnOUHEOEbYhhtNYOT527fKxPkpvuCJF4Wj+A5jw63V7cYfmD4Q6yYPWm28kucF9sSg19qGVWQ6tRp9qPekhnUvzrr50MUjJc= 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)(366016)(1800799024)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r2NY/es+XDL5AP9usvG06HXvhNHipNGL+bwqxPTWFKOFSDteNWwx+LBDOn9S?= =?us-ascii?Q?4QSH1n0Ii4KLb8PwvyV37lzui+jGuO8RyBdLpKxDVGyb3vc5T3LYUTLpU3oY?= =?us-ascii?Q?l8C9KSby4vujArD8o1TwyhJFiqCTf+KqOwGnz2Kx+bRQhojpWCMSGtHcj7uf?= =?us-ascii?Q?ZZBwaL4tuej1nJHe8MtpeaIrTFAHo+cYfByoXPHunlvTnGKUzN8mvgB0qnq/?= =?us-ascii?Q?GZfCGGsZ3sIkKVT+5oiHkMdSIrLOkyUR3cN/RlMjQOQGLWWrziou6XI7T7Y5?= =?us-ascii?Q?KAN8rJmbNlUwYbyXxfJXDYYfGjAfsjwOPL3AshCAqitQu1o87Q5tK52UBI6L?= =?us-ascii?Q?ZYEhZ9YjKV2mL54C3lC4BXNRSsvk2Lbr0YVX16++2/1KwIw64Z5dVOmQcWTO?= =?us-ascii?Q?8VpRd7sqIicVXHqmcjhvBrGooqINidGk8FESJjJ8mRhrcxYu4sMhnpONME3j?= =?us-ascii?Q?W4RlvT5rMWPE1wkFzZNtDwZuCJZb0cCZrCGpG0TtIshgcr+JSXIUnoaIiTMW?= =?us-ascii?Q?3tzNQcb79jkViBnMrkVjGyKnfz+/IjN70GyJagtm+yOVbVdH/lLvlrZUNjsQ?= =?us-ascii?Q?Nxw1GudgsIJhy2sT0+7YeeNnB0husr9IPHbF/2wxaO5XqVR/i2n0mNOQ6MmL?= =?us-ascii?Q?3ZeYPwkR+2Fg/xyIPd2yXaoQE/79pSVjq9MbCdH6u07kiSHemUZXOsw8H+xo?= =?us-ascii?Q?BDSEyrY+nG6RaWNnlM1BlQCRT7fsPENfbY/e1H7A7eX67TFnuV2TTz5shqVq?= =?us-ascii?Q?icvTGtkQZ2vAncWfSOx4R4nYn3FF85NkpF34g9Rm8K6qUMAE/Wkj0GYTsbmP?= =?us-ascii?Q?GJDZJWGv8ffGcEV5HoFL1Y5C6/4Q3h8LWwPUd56zQ4AiMtbRbWasmZtZHv05?= =?us-ascii?Q?NugN8FPs6Zc/Lnk2eOl8vAdPBPcwHHi9uQwp5/NpAp3jrEBIMCL8NF9BCBEU?= =?us-ascii?Q?EU01YmPaIdmS2ZJv+yX2DZzu1lc5HkGPTyDDGBgzy42Lij6Ze06Pu3ijLXYN?= =?us-ascii?Q?D4BGSZ79EO0ZNAw6NjiOu4fpI01kMMGvC3r1ZSkdPDOEKDMnLBsBEKbPpyJW?= =?us-ascii?Q?oNQqDeGxB3QqxNFhLcpZwsvTxEoMztJa0ch3ujqdCwtCE0nov2D5tq4pSjaK?= =?us-ascii?Q?iWYAJPXzDcZAHy8XnoCb/H48HJzQ4nb/LqiNi9bolBqRlfdIUcdXPOKra1yc?= =?us-ascii?Q?ze5pUNo0FFQg4Vhc5+vgG3d/d+wN2UpH8JRooO3NIBRJtFxVXhURfJ3rEyOp?= =?us-ascii?Q?LFATrIUOeKpgiANQtTH97jurovwFu/63NdWKbc18xP2x+9iUKB2fV4ysMi73?= =?us-ascii?Q?5fEU2Eeo/b0ajgnOUUs6NtF3ZASNa2TYZB8sIwDXjtwa+mD/rs5J0Lj64gfC?= =?us-ascii?Q?IJP6n4+Hwrw8y7ZQEtmWvdXiUS9ZJOqSE6lbc4mZEb7DjWAw+5JKZ7b90LpD?= =?us-ascii?Q?Fz/sxC6f8I9c5Nr0FsJj4gxGzZpHQKJQkV0nKvn18sH2OoYOszfyB+ydC7aR?= =?us-ascii?Q?zjdEOSn3ncdVSjx/RBXcMPexGiVpa2g+rr1SORohJS6EA0mHjKuxWrb5UAyf?= =?us-ascii?Q?GR8eteV/gr1kJKM6Bmh5J+Ssfu3bImvWnRB92Up7Y6hrVdpcBwDO5MWDA7UN?= =?us-ascii?Q?PktziG1jrVKeMGyLwfALg9dZ6bI/89tonvJEfjMyTSidRxUVCNhoUJq3YANX?= =?us-ascii?Q?UsI99jlsG7bSu2P4q/g2kpKonF2rJ5EfJHfklklrQaNPDzUkS0GnnKdhNyEO?= =?us-ascii?Q?LLco3ENkgA=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 336731d1-0c8c-4079-c365-08de807821e7 X-MS-Exchange-CrossTenant-AuthSource: BY1PR03MB7996.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2026 20:44:18.7532 (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: k/TJmI2lvtRfRZ9fkGCWh7cB7QO+E5xeFwXDD0JMMN7uzvH5UruxqOQVmYXk0lTgLYfJ8hgm1DNWR1wwWTt/eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6979 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1773348463388154100 Content-Type: text/plain; charset="utf-8" These old non-64 bit CPU models are not supported by Xen anymore so the checks are no longer needed. Signed-off-by: Kevin Lampis --- Changes in v2: - New patch based on review comments --- xen/arch/x86/acpi/cpu_idle.c | 2 +- xen/arch/x86/cpu/mcheck/mce.c | 8 +------- xen/arch/x86/cpu/mtrr/generic.c | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 6622965ace..640935c40c 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -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->vendor =3D=3D X86_VENDOR_INTEL && c->vfm >=3D INTEL_CORE_YONAH= ) + if ( c->vendor =3D=3D X86_VENDOR_INTEL ) flags->bm_control =3D 0; } =20 diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 8a41116aa4..9f45ca5be1 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->family ) - { - 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 190be7f1b4..23c279eb9a 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.vendor =3D=3D X86_VENDOR_AMD && - boot_cpu_data.family >=3D 0xf) || + if (boot_cpu_data.vendor =3D=3D X86_VENDOR_AMD || boot_cpu_data.vendor =3D=3D X86_VENDOR_HYGON) { uint64_t syscfg, tom2; =20 --=20 2.51.1