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 6FC48941068 for ; Wed, 15 Nov 2023 04:12:29 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=y7iNQRyvsVOKD/2u7K+XsDzaMxDNE1Xzm+fAxHWmFVc=; 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=1700021548; v=1; b=xSYXd9wGUAWdKHPvma82eWFfEl//MZ6lrZNS0E/wVpTAJ3jDjX2sBJoF7h7bps7EeNbx3S/3 2y5R5EKfu6rNVO2ouHd07KB3ChJWqWwL5Ep9K8gsbKUGnhy9ncQ0yAs97gcPUlO48tLJ5lvaXib pPJXTDd/ohkfam+20jPVx4MQ= X-Received: by 127.0.0.2 with SMTP id M7cuYY7687511xBFcn53suV2; Tue, 14 Nov 2023 20:12:28 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.5844.1700021541097014257 for ; Tue, 14 Nov 2023 20:12:27 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="393666247" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="393666247" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 20:12:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="882266132" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="882266132" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by fmsmga002.fm.intel.com with ESMTP; 14 Nov 2023 20:12:25 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v5 4/6] UefiCpuPkg: Only change CR4.CET bit for enable and disable CET. Date: Wed, 15 Nov 2023 12:12:14 +0800 Message-Id: <20231115041216.2016-5-w.sheng@intel.com> In-Reply-To: <20231115041216.2016-1-w.sheng@intel.com> References: <20231115041216.2016-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: F36DyCG9j4UfuMXXmNpWuofgx7686176AA= 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=xSYXd9wG; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Signed-off-by: Sheng Wei Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Wu Jiaxin Cc: Tan Dun Reviewed-by: Laszlo Ersek --- 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 (#111238): https://edk2.groups.io/g/devel/message/111238 Mute This Topic: https://groups.io/mt/102599354/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-