From nobody Mon Feb 9 09:09:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111124+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111124+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699856573; cv=none; d=zohomail.com; s=zohoarc; b=ZxCkXkROPfOmXn0X/nUjOFroUln59UY3Un05PvFDBEbgDhvYiGBcse3gPLDQM+GxAqIIVEcfnDgddIPCCizx4Q1xzjkqfSdX9nmBHLAt1/+c2OjYRCmn0eAMln06TWtxknO55YI3QcgTOdNrAPVwwRD8VoV0yFNJb9HGtvq1Zi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699856573; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=fha5CY1tlHTI6IY7kgtdrQ6QD5M7ueKn5PdKTH+A7R8=; b=GwlehgKHRB8llwUYNQRFG1J9LDO5AvNAiBGnmMYExioj1OeLqdvBPgSmeSCK5raWpHqTDrGnGSIv66aMH+dF5ndq0KuddUj8sRBNyhrznygi0WMeHHGsyQ3+Qk5L1oILToeeuIbp5d19oeqkNXHgHUw//yDnMV1f7h8JkpStIWM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111124+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699856573859952.9600397994182; Sun, 12 Nov 2023 22:22:53 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=fq4WtJ54fav+1H8UL2unqRUOC7WlQBsTJpDxUBrGqC4=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1699856573; v=1; b=wsd91Urb5LVV2fkKXI/6c3kmaogn3e6VzqrQt3AZI5UhxIosBxtUaF87PJA0sQlDSYk1F2x2 031Bn+3JF8mtlSMAj6Si5dqRkgp2KnT6usMCTvG994TsZsawtu8qvKF85F8HJvrQJ/hoM9axHQ6 63cRk8RIX2rcv7ks9fgn3sXo= X-Received: by 127.0.0.2 with SMTP id fmADYY1788612xIbtozDUPBj; Sun, 12 Nov 2023 22:22:53 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.31729.1699856568636155442 for ; Sun, 12 Nov 2023 22:22:53 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028392" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028392" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 22:22:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849601" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849601" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:50 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v4 2/5] UefiCpuPkg: Use macro CR4_CET_BIT to replace hard code value in Cet.nasm. Date: Mon, 13 Nov 2023 14:22:42 +0800 Message-Id: <20231113062245.649-3-w.sheng@intel.com> In-Reply-To: <20231113062245.649-1-w.sheng@intel.com> References: <20231113062245.649-1-w.sheng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,w.sheng@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ZihQvmIHI2FdUxP5ArpbTaVHx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699856575164100011 Content-Type: text/plain; charset="utf-8" Signed-off-by: Sheng Wei Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Wu Jiaxin Cc: Tan Dun --- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm | 5 +++-- UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm b/UefiCpuPkg/PiSmmCpuD= xeSmm/Ia32/Cet.nasm index 9d66b9c5da..3d07da1cd4 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm @@ -5,6 +5,7 @@ ;-------------------------------------------------------------------------= ------ =20 %include "Nasm.inc" +%include "Cet.inc" =20 SECTION .text =20 @@ -16,7 +17,7 @@ ASM_PFX(DisableCet): incsspd eax =20 mov eax, cr4 - btr eax, 23 ; clear CET + btr eax, CR4_CET_BIT ; clear CET mov cr4, eax ret =20 @@ -24,7 +25,7 @@ global ASM_PFX(EnableCet) ASM_PFX(EnableCet): =20 mov eax, cr4 - bts eax, 23 ; set CET + bts eax, CR4_CET_BIT ; set CET mov cr4, eax =20 ; use jmp to skip the check for ret diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm b/UefiCpuPkg/PiSmmCpuDx= eSmm/X64/Cet.nasm index 8bbdbb31cc..700aef4703 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm @@ -5,6 +5,7 @@ ;-------------------------------------------------------------------------= ------ =20 %include "Nasm.inc" +%include "Cet.inc" =20 DEFAULT REL SECTION .text @@ -17,7 +18,7 @@ ASM_PFX(DisableCet): incsspq rax =20 mov rax, cr4 - btr eax, 23 ; clear CET + btr eax, CR4_CET_BIT ; clear CET mov cr4, rax ret =20 @@ -25,7 +26,7 @@ global ASM_PFX(EnableCet) ASM_PFX(EnableCet): =20 mov rax, cr4 - bts eax, 23 ; set CET + bts eax, CR4_CET_BIT ; set CET mov cr4, rax =20 ; use jmp to skip the check for ret --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111124): https://edk2.groups.io/g/devel/message/111124 Mute This Topic: https://groups.io/mt/102556834/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-