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 F0CB4941071 for ; Wed, 15 Nov 2023 04:12:27 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=hH3Nbf3P4ue4Y2beIJjSSbRqSwbq1xTmKJO34tdAvKU=; 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=1700021546; v=1; b=oPYM8e0Z+CQ5idDUv/OOYa1BQtukNuGWVxO03kXvtP5hxq19he1YUZazNm8V1TPewIR7/rfq ogTdSv9fXbq6xuvY5CPj33Hk98J9cNKtIToiFfOUBRsudvIYGDJXTXuy9K4wDhHLGAW7FSyLYq8 eEfRUE4MUBgiwymx2jxOUEY4= X-Received: by 127.0.0.2 with SMTP id ybHtYY7687511xMMsamYK5zH; Tue, 14 Nov 2023 20:12:26 -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:25 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="393666244" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="393666244" 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:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="882266123" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="882266123" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by fmsmga002.fm.intel.com with ESMTP; 14 Nov 2023 20:12:23 -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 3/6] UefiCpuPkg: Use CET macro definitions in Cet.inc for SmiEntry.nasm files. Date: Wed, 15 Nov 2023 12:12:13 +0800 Message-Id: <20231115041216.2016-4-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: 6A3jGAbzrVV1aLKzMbChpFMEx7686176AA= 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=oPYM8e0Z; 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 | 14 +------------- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 15 +-------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm b/UefiCpuPkg/PiSm= mCpuDxeSmm/Ia32/SmiEntry.nasm index 19de5f614e..6368982433 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm @@ -15,19 +15,7 @@ =0D %include "StuffRsbNasm.inc"=0D %include "Nasm.inc"=0D -=0D -%define MSR_IA32_S_CET 0x6A2=0D -%define MSR_IA32_CET_SH_STK_EN 0x1=0D -%define MSR_IA32_CET_WR_SHSTK_EN 0x2=0D -%define MSR_IA32_CET_ENDBR_EN 0x4=0D -%define MSR_IA32_CET_LEG_IW_EN 0x8=0D -%define MSR_IA32_CET_NO_TRACK_EN 0x10=0D -%define MSR_IA32_CET_SUPPRESS_DIS 0x20=0D -%define MSR_IA32_CET_SUPPRESS 0x400=0D -%define MSR_IA32_CET_TRACKER 0x800=0D -%define MSR_IA32_PL0_SSP 0x6A4=0D -=0D -%define CR4_CET 0x800000=0D +%include "Cet.inc"=0D =0D %define MSR_IA32_MISC_ENABLE 0x1A0=0D %define MSR_EFER 0xc0000080=0D diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmm= CpuDxeSmm/X64/SmiEntry.nasm index d302ca8d01..9a225bc3be 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm @@ -15,25 +15,12 @@ =0D %include "StuffRsbNasm.inc"=0D %include "Nasm.inc"=0D +%include "Cet.inc"=0D =0D ;=0D ; Variables referenced by C code=0D ;=0D =0D -%define MSR_IA32_S_CET 0x6A2=0D -%define MSR_IA32_CET_SH_STK_EN 0x1=0D -%define MSR_IA32_CET_WR_SHSTK_EN 0x2=0D -%define MSR_IA32_CET_ENDBR_EN 0x4=0D -%define MSR_IA32_CET_LEG_IW_EN 0x8=0D -%define MSR_IA32_CET_NO_TRACK_EN 0x10=0D -%define MSR_IA32_CET_SUPPRESS_DIS 0x20=0D -%define MSR_IA32_CET_SUPPRESS 0x400=0D -%define MSR_IA32_CET_TRACKER 0x800=0D -%define MSR_IA32_PL0_SSP 0x6A4=0D -%define MSR_IA32_INTERRUPT_SSP_TABLE_ADDR 0x6A8=0D -=0D -%define CR4_CET 0x800000=0D -=0D %define MSR_IA32_MISC_ENABLE 0x1A0=0D %define MSR_EFER 0xc0000080=0D %define MSR_EFER_XD 0x800=0D --=20 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111237): https://edk2.groups.io/g/devel/message/111237 Mute This Topic: https://groups.io/mt/102599352/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-