From nobody Sat Feb 7 06:55:08 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; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1769450074; cv=none; d=zohomail.com; s=zohoarc; b=ETyb6p7Xn6Ucn5IP0KVIm5cN5rC3pLMUnfFhPExuUUSUmjFiNmBQZb+HuLYbsz2jltmUurwvcRMEcHH5AfJb3+U9RgKV/1O3paKoBpwMghP2oqH1lgvjiloWRiJisThk2i2G8rgvx74ajqif8eLmEkGo0z7HJ8nOURROOEchCl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769450074; 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=oCtWZ5jsIOSUx1eQSxD4nCRKX4JQJ1b+ozb5fk5XF6E=; b=WXbVPyFcYzmmfItpYEoKBhgBBzoKznaZ5ng7tHQ64vE7wHAU38FPYT3M0fu5/sETxOVNHZQBA7q4IaOgOSZkNslU1egWkqy3UFJR94JzJTXJb8mEy8InLd8BcJaaexEFJLxX9mUMbn3226h7DrIwKyicNqlCNq63IPrPLiB5GPY= ARC-Authentication-Results: i=1; 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; 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 1769450074293550.9773545089932; Mon, 26 Jan 2026 09:54:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1213843.1524398 (Exim 4.92) (envelope-from ) id 1vkQms-0007Sj-JT; Mon, 26 Jan 2026 17:54:06 +0000 Received: by outflank-mailman (output) from mailman id 1213843.1524398; Mon, 26 Jan 2026 17:54:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vkQmr-0007OB-OR; Mon, 26 Jan 2026 17:54:05 +0000 Received: by outflank-mailman (input) for mailman id 1213843; Mon, 26 Jan 2026 17:54:02 +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 1vkQmo-0004HW-KW for xen-devel@lists.xenproject.org; Mon, 26 Jan 2026 17:54:02 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id fec40fdb-fadf-11f0-b15f-2bf370ae4941; Mon, 26 Jan 2026 18:54:00 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4805ef35864so11603905e9.0 for ; Mon, 26 Jan 2026 09:54:00 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48066c10dbasm3896455e9.15.2026.01.26.09.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 09:53:59 -0800 (PST) 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: fec40fdb-fadf-11f0-b15f-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1769450040; x=1770054840; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oCtWZ5jsIOSUx1eQSxD4nCRKX4JQJ1b+ozb5fk5XF6E=; b=Hxh1cCQHWBqWBiwzUbkftqMBtcyLrl0t8N/iMtZQYEKDxP1e5biIgvFMoxCU6uu0R/ TiRYZzV9qOl1xEszYskDPdn4F0X8cDIdVbZi9VMcaeJZ4PNUjNdNOWOg42Vt5kM0XSG+ raSdmamK8Vv/XgnBpEwCPeenP7PuaL60CGRlM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769450040; x=1770054840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=oCtWZ5jsIOSUx1eQSxD4nCRKX4JQJ1b+ozb5fk5XF6E=; b=a0IYXUnbTdaczKnhuzBZ+/vW2uJhSsw95UnDZ3MJ7aAcWgI99J9oHVZz/EJU7rGkCs 4o3OKRdn6X4EA/GrPwIY7exEHR8cCrhnCavTV45wKQOP098zF6KZqGmJet9ulOFNMRdB IVZP7EWQgvbpaWklpWSY143KNS6pooKHcdOKp1+f3myW0xUitgvUFEWkaed3WFaiQ7j2 hi+fxTaWHPz9e6xHGx2H8iAXfQIibaWk2loRcXIZKVqAvnXvp1nHm1soyv18LilokZfj hwnNBL+pJC7lGFeLzn1DC+L8x9heArEoGS93oPKXW1FYcfNIYvLJbbEoZM+sksI0yJZH RmiA== X-Gm-Message-State: AOJu0YyO7D2CfSk88BlTjTIajfKNNauREt71mQtNJvJDgQl6lhHxKedQ dN5TOVkBrrFgiOLc1N2zMO3/laMtLOZuAcjE1fKylU3z3h7BuPTDWptStspca37aYe7Qo11GknB Z4VAb X-Gm-Gg: AZuq6aK85J3u/zTw2d4XrPg9pMahaPUojx2hhWFpGgMMP1IDQjPdmKs7DKOjTSgFEwQ h9E9L5vWkdHgU1nDxY7NSXDw3DlZKdyaDxIo1r7Ztj/isOvcDUy2Ii2XDfQg9nNpDtSE7Wd43ma L4nypfBAM1DamRLDTq7WTDCbmpwF1DbmtuaXAOQkyaCaT5JTMCt/Bry8vgCq1iG6cEvRUQt7lYb CYvtUqGK2qiciY8t51gwdANkwi7uwkVEvLDGAeG5/GkqPjSDUgYESwiolbsMPcl/JXWnfqOaTsC 5k1JArskuWdVescYuRB2yLpXzQsUcZTHRtiH9n/BAqaRljYj9EEEfJ5eObbxITnzR4YGUJSVRQg qbnkg4SIiY038lFwrQ07KmvHNDUMlGPFr3720HaUKAuxUxIpILgoIhhnX5LBP+KpvrZkodycFMY 7KsljQOTEpoh3Q73EhK8HdNkcIz0qYa03saF5klaXCYEn+zuUVfahCe54hRzslcw== X-Received: by 2002:a05:600c:b96:b0:480:1e8f:d15f with SMTP id 5b1f17b1804b1-4805cd40a06mr82761325e9.2.1769450039908; Mon, 26 Jan 2026 09:53:59 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Julian Vetter , Teddy Astie Subject: [PATCH 15/16] x86/cpu: Clean up use of LCAP_* constants Date: Mon, 26 Jan 2026 17:53:44 +0000 Message-Id: <20260126175345.2078371-16-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260126175345.2078371-1-andrew.cooper3@citrix.com> References: <20260126175345.2078371-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1769450074590158500 Now that the LCAP_* constants are single bits, we can simplify the expressi= ons using them. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Julian Vetter CC: Teddy Astie --- xen/arch/x86/cpu/amd.c | 12 ++++++------ xen/arch/x86/domain.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 06646fc1af93..f259a2112a16 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -171,7 +171,7 @@ void cf_check amd_ctxt_switch_masking(const struct vcpu= *next) (nextd && is_pv_domain(nextd) && nextd->arch.pv.cpuidmasks) ? nextd->arch.pv.cpuidmasks : &cpuidmask_defaults; =20 - if ((levelling_caps & LCAP_1cd) =3D=3D LCAP_1cd) { + if (levelling_caps & LCAP_1cd) { uint64_t val =3D masks->_1cd; =20 /* @@ -192,7 +192,7 @@ void cf_check amd_ctxt_switch_masking(const struct vcpu= *next) #define LAZY(cap, msr, field) \ ({ \ if (unlikely(these_masks->field !=3D masks->field) && \ - ((levelling_caps & cap) =3D=3D cap)) \ + (levelling_caps & cap)) \ { \ wrmsr_amd(msr, masks->field); \ these_masks->field =3D masks->field; \ @@ -251,7 +251,7 @@ static void __init amd_init_levelling(void) */ probe_masking_msrs(); =20 - if ((levelling_caps & LCAP_1cd) =3D=3D LCAP_1cd) { + if (levelling_caps & LCAP_1cd) { uint32_t ecx, edx, tmp; =20 cpuid(0x00000001, &tmp, &tmp, &ecx, &edx); @@ -264,7 +264,7 @@ static void __init amd_init_levelling(void) cpuidmask_defaults._1cd =3D ((uint64_t)ecx << 32) | edx; } =20 - if ((levelling_caps & LCAP_e1cd) =3D=3D LCAP_e1cd) { + if (levelling_caps & LCAP_e1cd) { uint32_t ecx, edx, tmp; =20 cpuid(0x80000001, &tmp, &tmp, &ecx, &edx); @@ -275,7 +275,7 @@ static void __init amd_init_levelling(void) cpuidmask_defaults.e1cd =3D ((uint64_t)ecx << 32) | edx; } =20 - if ((levelling_caps & LCAP_7ab0) =3D=3D LCAP_7ab0) { + if (levelling_caps & LCAP_7ab0) { uint32_t eax, ebx, tmp; =20 cpuid(0x00000007, &eax, &ebx, &tmp, &tmp); @@ -283,7 +283,7 @@ static void __init amd_init_levelling(void) cpuidmask_defaults._7ab0 &=3D ((uint64_t)eax << 32) | ebx; } =20 - if ((levelling_caps & LCAP_6c) =3D=3D LCAP_6c) { + if (levelling_caps & LCAP_6c) { uint32_t ecx =3D cpuid_ecx(6); =20 cpuidmask_defaults._6c &=3D (~0ULL << 32) | ecx; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index c29a6b0decee..441f99e92088 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -303,7 +303,7 @@ void domain_cpu_policy_changed(struct domain *d) =20 if ( is_pv_domain(d) ) { - if ( ((levelling_caps & LCAP_1cd) =3D=3D LCAP_1cd) ) + if ( levelling_caps & LCAP_1cd ) { uint64_t mask =3D cpuidmask_defaults._1cd; uint32_t ecx =3D p->basic._1c; @@ -368,7 +368,7 @@ void domain_cpu_policy_changed(struct domain *d) d->arch.pv.cpuidmasks->_1cd =3D mask; } =20 - if ( ((levelling_caps & LCAP_6c) =3D=3D LCAP_6c) ) + if ( levelling_caps & LCAP_6c ) { uint64_t mask =3D cpuidmask_defaults._6c; =20 @@ -378,7 +378,7 @@ void domain_cpu_policy_changed(struct domain *d) d->arch.pv.cpuidmasks->_6c =3D mask; } =20 - if ( ((levelling_caps & LCAP_7ab0) =3D=3D LCAP_7ab0) ) + if ( levelling_caps & LCAP_7ab0 ) { uint64_t mask =3D cpuidmask_defaults._7ab0; =20 @@ -395,7 +395,7 @@ void domain_cpu_policy_changed(struct domain *d) d->arch.pv.cpuidmasks->_7ab0 =3D mask; } =20 - if ( ((levelling_caps & LCAP_Da1) =3D=3D LCAP_Da1) ) + if ( levelling_caps & LCAP_Da1 ) { uint64_t mask =3D cpuidmask_defaults.Da1; uint32_t eax =3D p->xstate.Da1; @@ -406,7 +406,7 @@ void domain_cpu_policy_changed(struct domain *d) d->arch.pv.cpuidmasks->Da1 =3D mask; } =20 - if ( ((levelling_caps & LCAP_e1cd) =3D=3D LCAP_e1cd) ) + if ( levelling_caps & LCAP_e1cd ) { uint64_t mask =3D cpuidmask_defaults.e1cd; uint32_t ecx =3D p->extd.e1c; --=20 2.39.5