Re: [edk2-devel] [PATCH v6 3/6] UefiCpuPkg: Use CET macro definitions in Cet.inc for SmiEntry.nasm files.

["Ni, Ray" <ray.ni@intel.com>]

Reviewed-by: Ray Ni <ray.ni@intel.com>

Thanks,
Ray
> -----Original Message-----
> From: Sheng, W <w.sheng@intel.com>
> Sent: Tuesday, November 21, 2023 3:03 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Laszlo
> Ersek <lersek@redhat.com>; Wu, Jiaxin <jiaxin.wu@intel.com>; Tan, Dun
> <dun.tan@intel.com>
> Subject: [PATCH v6 3/6] UefiCpuPkg: Use CET macro definitions in Cet.inc for
> SmiEntry.nasm files.
> 
> Signed-off-by: Sheng Wei <w.sheng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Tan Dun <dun.tan@intel.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  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/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
> index 19de5f614e..6368982433 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
> @@ -15,19 +15,7 @@
> 
> 
>  %include "StuffRsbNasm.inc"
> 
>  %include "Nasm.inc"
> 
> -
> 
> -%define MSR_IA32_S_CET                     0x6A2
> 
> -%define   MSR_IA32_CET_SH_STK_EN             0x1
> 
> -%define   MSR_IA32_CET_WR_SHSTK_EN           0x2
> 
> -%define   MSR_IA32_CET_ENDBR_EN              0x4
> 
> -%define   MSR_IA32_CET_LEG_IW_EN             0x8
> 
> -%define   MSR_IA32_CET_NO_TRACK_EN           0x10
> 
> -%define   MSR_IA32_CET_SUPPRESS_DIS          0x20
> 
> -%define   MSR_IA32_CET_SUPPRESS              0x400
> 
> -%define   MSR_IA32_CET_TRACKER               0x800
> 
> -%define MSR_IA32_PL0_SSP                   0x6A4
> 
> -
> 
> -%define CR4_CET                            0x800000
> 
> +%include "Cet.inc"
> 
> 
> 
>  %define MSR_IA32_MISC_ENABLE 0x1A0
> 
>  %define MSR_EFER      0xc0000080
> 
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> index d302ca8d01..9a225bc3be 100644
> --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
> @@ -15,25 +15,12 @@
> 
> 
>  %include "StuffRsbNasm.inc"
> 
>  %include "Nasm.inc"
> 
> +%include "Cet.inc"
> 
> 
> 
>  ;
> 
>  ; Variables referenced by C code
> 
>  ;
> 
> 
> 
> -%define MSR_IA32_S_CET                     0x6A2
> 
> -%define   MSR_IA32_CET_SH_STK_EN             0x1
> 
> -%define   MSR_IA32_CET_WR_SHSTK_EN           0x2
> 
> -%define   MSR_IA32_CET_ENDBR_EN              0x4
> 
> -%define   MSR_IA32_CET_LEG_IW_EN             0x8
> 
> -%define   MSR_IA32_CET_NO_TRACK_EN           0x10
> 
> -%define   MSR_IA32_CET_SUPPRESS_DIS          0x20
> 
> -%define   MSR_IA32_CET_SUPPRESS              0x400
> 
> -%define   MSR_IA32_CET_TRACKER               0x800
> 
> -%define MSR_IA32_PL0_SSP                   0x6A4
> 
> -%define MSR_IA32_INTERRUPT_SSP_TABLE_ADDR  0x6A8
> 
> -
> 
> -%define CR4_CET                            0x800000
> 
> -
> 
>  %define MSR_IA32_MISC_ENABLE 0x1A0
> 
>  %define MSR_EFER      0xc0000080
> 
>  %define MSR_EFER_XD   0x800
> 
> --
> 2.26.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111527): https://edk2.groups.io/g/devel/message/111527
Mute This Topic: https://groups.io/mt/102724274/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-