1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH 0/3] Enable 64bit PEI for BoardX58Ich10
  4. View patch

[edk2-devel] [PATCH 3/3] SimicsOpenBoardPkg: Remove unused PCD PcdSimicsSecPageTablesBase

Zhiguang Liu posted 3 patches 2 years, 9 months ago
[edk2-devel] [PATCH 3/3] SimicsOpenBoardPkg: Remove unused PCD PcdSimicsSecPageTablesBase
Posted by Zhiguang Liu 2 years, 9 months ago 
Currently, for 64-bit PEI, pagetable is created in reset vector and
stored in SPI flash. No need this PCD now

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf     | 3 ---
 Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec        | 1 -
 Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c       | 8 --------
 Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf     | 1 -
 Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf | 1 -
 5 files changed, 14 deletions(-)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
index ccb7fe7e59..a74c355e09 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
+++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
@@ -79,9 +79,6 @@ ErasePolarity = 1
 BlockSize     = 0x10000
 NumBlocks     = 0xB0
 
-0x000000|0x006000
-gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase|gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesSize
-
 0x006000|0x001000
 gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageBase|gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageSize
 
diff --git a/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
index 421c464023..e8aefdd893 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
+++ b/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
@@ -38,7 +38,6 @@
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsFlashNvStorageFtwSpareBase|0x0|UINT32|0xd
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsFlashNvStorageFtwWorkingBase|0x0|UINT32|0xe
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsFdBaseAddress|0x0|UINT32|0xf
-  gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase|0x0|UINT32|0x11
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesSize|0x0|UINT32|0x12
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamBase|0x0|UINT32|0x13
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamSize|0x0|UINT32|0x14
diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
index 6b572b38a8..39e879e922 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
@@ -759,14 +759,6 @@ SecCoreStartupWithStack (
 
   AsmWriteIdtr (&IdtDescriptor);
 
-#if defined (MDE_CPU_X64)
-  //
-  // ASSERT that the Page Tables were set by the reset vector code to
-  // the address we expect.
-  //
-  ASSERT (AsmReadCr3 () == (UINTN) PcdGet32 (PcdSimicsSecPageTablesBase));
-#endif
-
   //
   // |-------------|       <-- TopOfCurrentStack
   // |   Stack     | 32k
diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
index 1de3d012a7..af1c0f2b55 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
@@ -62,7 +62,6 @@
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsPeiMemFvSize
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsDxeMemFvBase
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsDxeMemFvSize
-  gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamBase
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamSize
   gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress
diff --git a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
index cdc30ad582..49f441fe9d 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
@@ -65,7 +65,6 @@
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsDxeMemFvSize
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageBase
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageSize
-  gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamBase
   gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamSize
   gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress
-- 
2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103521): https://edk2.groups.io/g/devel/message/103521
Mute This Topic: https://groups.io/mt/98488023/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 3/3] SimicsOpenBoardPkg: Remove unused PCD PcdSimicsSecPageTablesBase
Posted by Ni, Ray 2 years, 9 months ago 
Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Tuesday, April 25, 2023 2:40 PM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [PATCH 3/3] SimicsOpenBoardPkg: Remove unused PCD
> PcdSimicsSecPageTablesBase
> 
> Currently, for 64-bit PEI, pagetable is created in reset vector and
> stored in SPI flash. No need this PCD now
> 
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf     | 3 ---
>  Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec        | 1 -
>  Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c       | 8 --------
>  Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf     | 1 -
>  Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf | 1 -
>  5 files changed, 14 deletions(-)
> 
> diff --git
> a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> index ccb7fe7e59..a74c355e09 100644
> --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> +++
> b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
> @@ -79,9 +79,6 @@ ErasePolarity = 1
>  BlockSize     = 0x10000
>  NumBlocks     = 0xB0
> 
> -0x000000|0x006000
> -
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase|gSimic
> sOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesSize
> -
>  0x006000|0x001000
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageBase|gSimi
> csOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageSize
> 
> diff --git a/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
> index 421c464023..e8aefdd893 100644
> --- a/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/SimicsOpenBoardPkg/OpenBoardPkg.dec
> @@ -38,7 +38,6 @@
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsFlashNvStorageFtwSpareBa
> se|0x0|UINT32|0xd
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsFlashNvStorageFtwWorkin
> gBase|0x0|UINT32|0xe
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsFdBaseAddress|0x0|UINT3
> 2|0xf
> -
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase|0x0|UI
> NT32|0x11
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesSize|0x0|UI
> NT32|0x12
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamBase|0x0|
> UINT32|0x13
> 
> gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamSize|0x0|
> UINT32|0x14
> diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
> b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
> index 6b572b38a8..39e879e922 100644
> --- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
> +++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
> @@ -759,14 +759,6 @@ SecCoreStartupWithStack (
> 
>    AsmWriteIdtr (&IdtDescriptor);
> 
> -#if defined (MDE_CPU_X64)
> -  //
> -  // ASSERT that the Page Tables were set by the reset vector code to
> -  // the address we expect.
> -  //
> -  ASSERT (AsmReadCr3 () == (UINTN) PcdGet32
> (PcdSimicsSecPageTablesBase));
> -#endif
> -
>    //
>    // |-------------|       <-- TopOfCurrentStack
>    // |   Stack     | 32k
> diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
> b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
> index 1de3d012a7..af1c0f2b55 100644
> --- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
> +++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
> @@ -62,7 +62,6 @@
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsPeiMemFvSize
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsDxeMemFvBase
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsDxeMemFvSize
> -  gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamBase
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamSize
>    gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress
> diff --git a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
> b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
> index cdc30ad582..49f441fe9d 100644
> --- a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
> +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf
> @@ -65,7 +65,6 @@
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsDxeMemFvSize
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageBase
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsLockBoxStorageSize
> -  gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPageTablesBase
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamBase
>    gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsSecPeiTempRamSize
>    gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress
> --
> 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103534): https://edk2.groups.io/g/devel/message/103534
Mute This Topic: https://groups.io/mt/98488023/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.