From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 31DCBD802C8 for ; Mon, 13 Nov 2023 06:22:58 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=NYQ6r+uwfQyt4Qhzn8laYF/TWrkQ+kndWZ3C/7U9Qfw=; 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=1699856576; v=1; b=VNifFtVWNMFV5W8LCWbB9NIVauwTJBOl8jj/dx1OaYn8eiMDoi+L73E/kGRpMcpRL442LWAp nka2yKcauSuuZA0pbjEp5eBRs/xuAqDwQtng9kK970RlceP4+pz6Qx35ZvksarjcwQqqqZUBN4V /uMs83reWMMhkhvrPEfz/vTs= X-Received: by 127.0.0.2 with SMTP id n1BsYY7687511xur1OFmsHbS; Sun, 12 Nov 2023 22:22:56 -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:56 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028405" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028405" 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:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849655" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849655" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:54 -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 4/5] UefiCpuPkg: Only change CR4.CET bit for enable and disable CET. Date: Mon, 13 Nov 2023 14:22:44 +0800 Message-Id: <20231113062245.649-5-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: q7g8gaiCasbRFjDL0YXAAOXTx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=VNifFtVW; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) Signed-off-by: Sheng Wei Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Wu Jiaxin Cc: Tan Dun --- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm | 10 +++++++--- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm b/UefiCpuPkg/PiSm= mCpuDxeSmm/Ia32/SmiEntry.nasm index 6368982433..1da9afab97 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm @@ -237,7 +237,9 @@ CetInterruptDone: bts ecx, 16 ; set WP=0D mov cr0, ecx=0D =0D - mov eax, 0x668 | CR4_CET=0D + ; set CR4.CET bit for enable CET=0D + mov eax, cr4=0D + bts eax, CR4_CET_BIT=0D mov cr4, eax=0D =0D setssbsy=0D @@ -264,8 +266,10 @@ CetDone: cmp al, 0=0D jz CetDone2=0D =0D - mov eax, 0x668=0D - mov cr4, eax ; disable CET=0D + ; clear CR4.CET bit for disable CET=0D + mov eax, cr4=0D + btr eax, CR4_CET_BIT=0D + mov cr4, eax=0D =0D mov ecx, MSR_IA32_PL0_SSP=0D pop eax=0D diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmm= CpuDxeSmm/X64/SmiEntry.nasm index 9a225bc3be..abf9f1a90a 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm @@ -263,7 +263,9 @@ CetInterruptDone: bts ecx, 16 ; set WP=0D mov cr0, rcx=0D =0D - mov eax, 0x668 | CR4_CET=0D + ; set CR4.CET bit for enable CET=0D + mov rax, cr4=0D + bts rax, CR4_CET_BIT=0D mov cr4, rax=0D =0D setssbsy=0D @@ -308,8 +310,10 @@ mCetSupportedAbsAddr: cmp al, 0=0D jz CetDone2=0D =0D - mov eax, 0x668=0D - mov cr4, rax ; disable CET=0D + ; clear CR4.CET bit for disable CET=0D + mov rax, cr4=0D + btr rax, CR4_CET_BIT=0D + mov cr4, rax=0D =0D mov ecx, MSR_IA32_INTERRUPT_SSP_TABLE_ADDR=0D pop rax=0D --=20 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111126): https://edk2.groups.io/g/devel/message/111126 Mute This Topic: https://groups.io/mt/102556837/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-