OvmfPkg: remove handling of properties table

The UEFI properties table and the associated memory protection feature was
severely broken from the start, and has been deprecated for a while. Let's
drop all references to it from OVMF so we can safely remove it from the
DXE core as well.

Link: https://bugzilla.tianocore.org/show_bug.cgi?id=2633
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
Acked-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 60f372e0f80bff701ed04fa8c46d611d06926280..cbc5f0e583bc43d35cce3751febc72f3c8e670c0 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -577,7 +577,6 @@
 \r
   # Noexec settings for DXE.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable|FALSE\r
 \r
   # UefiCpuPkg PCDs related to initial AP bringup and general AP management.\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 51da349022d82eaf428aef0fd1180c64da77cd02..6d69cc6cb56fc2f0d613695f9a1182841a655813 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -588,7 +588,6 @@
 \r
   # Noexec settings for DXE.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable|FALSE\r
 \r
   # UefiCpuPkg PCDs related to initial AP bringup and general AP management.\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 221e15c3b9c1eaf758334e64cd306a77df4cdfe0..5ad4f461ce52d8c42a99d5a01512cbe99d35e3d8 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -587,7 +587,6 @@
 \r
   # Noexec settings for DXE.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable|FALSE\r
 \r
   # UefiCpuPkg PCDs related to initial AP bringup and general AP management.\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64\r

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index f997a196e2ef02c5fbdbfd85bb3b0a5a9dddc9d5..47ee8db8b8848d8b6bc7a19d36b315990c22285c 100644 (file)
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -487,7 +487,6 @@
 \r
   # Noexec settings for DXE.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable|FALSE\r
 \r
   # Set memory encryption mask\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0\r

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 587ca68fc2104e49dc4a10646292b836fa790318..088e616a980c4ef5cd2a7c1a85b7154bfabfd0e1 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -315,7 +315,6 @@ NoexecDxeInitialization (
   VOID\r
   )\r
 {\r
-  UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdPropertiesTableEnable);\r
   UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdSetNxForStack);\r
 }\r
 \r

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 8531c63995c13ddc929fdd355ff5676eee695144..19f2424981bca6352f4d4ce94bfb132215bc3bbd 100644 (file)
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -94,7 +94,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask\r
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy\r