diff options
| author | Jian J Wang <jian.j.wang@intel.com> | 2018-09-25 16:49:19 +0800 |
|---|---|---|
| committer | Jian J Wang <jian.j.wang@intel.com> | 2018-09-26 08:55:10 +0800 |
| commit | 5267926134d17e86672b84fd57b438f05ffa68e1 (patch) | |
| tree | b4611d820e1af0c69b3caa87d4d5a910b26e991f /MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | |
| parent | b888c57a053f41b33fcaa13da66f8de470e9a1c8 (diff) | |
| download | edk2-5267926134d17e86672b84fd57b438f05ffa68e1.tar.gz edk2-5267926134d17e86672b84fd57b438f05ffa68e1.tar.bz2 edk2-5267926134d17e86672b84fd57b438f05ffa68e1.zip | |
MdeModulePkg/DxeIpl: support more NX related PCDs
BZ#1116: https://bugzilla.tianocore.org/show_bug.cgi?id=1116
Currently IA32_EFER.NXE is only set against PcdSetNxForStack. This
confuses developers because following two other PCDs also need NXE
to be set, but actually not.
PcdDxeNxMemoryProtectionPolicy
PcdImageProtectionPolicy
This patch solves this issue by adding logic to enable IA32_EFER.NXE
if any of those PCDs have anything enabled.
Cc: Star Zeng <star.zeng@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf')
| -rw-r--r-- | MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf index fd82657404..068e700074 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -117,6 +117,8 @@ [Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64]
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIMES_CONSUMES
+ gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy ## SOMETIMES_CONSUMES
+ gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy ## SOMETIMES_CONSUMES
[Depex]
gEfiPeiLoadFilePpiGuid AND gEfiPeiMasterBootModePpiGuid
|