[edk2-devel] [PATCH v1 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only

Bret Barkelew posted 16 patches 4 years, 3 months ago
There is a newer version of this series
[edk2-devel] [PATCH v1 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only
Posted by Bret Barkelew 4 years, 3 months ago
From: Bret Barkelew <brbarkel@microsoft.com>

Drop X64 references. Update GUID.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3652

Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Signed-off-by: Bret Barkelew <bret.barkelew@microsoft.com>
---
 ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c | 71 --------------------
 ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf   |  6 +-
 2 files changed, 2 insertions(+), 75 deletions(-)

diff --git a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c
deleted file mode 100644
index dffa965b8425..000000000000
--- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/** @file
-  Entry point to the Standalone Mm Core.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-Copyright (c) Microsoft Corporation.
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-
-#include <PiMm.h>
-
-#include <Library/StandaloneMmCoreEntryPoint.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseLib.h>
-
-//
-// Cache copy of HobList pointer.
-//
-VOID *gHobList = NULL;
-
-/**
-  The entry point of PE/COFF Image for the STANDALONE MM Core.
-
-  This function is the entry point for the STANDALONE MM Core. This function is required to call
-  ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never expected to return.
-  The STANDALONE MM Core is responsible for calling ProcessLibraryConstructorList() as soon as the EFI
-  System Table and the image handle for the STANDALONE MM Core itself have been established.
-  If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.
-
-  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.
-
-**/
-VOID
-EFIAPI
-_ModuleEntryPoint (
-  IN VOID  *HobStart
-  )
-{
-  //
-  // Cache a pointer to the HobList
-  //
-  gHobList = HobStart;
-
-  //
-  // Call the Standalone MM Core entry point
-  //
-  ProcessModuleEntryPointList (HobStart);
-
-  //
-  // TODO: Set page table here?? AARCH64 has this step for some reason
-  //
-}
-
-
-/**
-  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().
-
-  This function is required to call _ModuleEntryPoint() passing in HobStart.
-
-  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.
-
-**/
-VOID
-EFIAPI
-EfiMain (
-  IN VOID  *HobStart
-  )
-{
-  _ModuleEntryPoint (HobStart);
-}
diff --git a/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
index a0629cbc1a6f..c6b283653882 100644
--- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
+++ b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
@@ -10,8 +10,8 @@
 
 [Defines]
   INF_VERSION                    = 0x0001001A
-  BASE_NAME                      = StandaloneMmCoreEntryPoint
-  FILE_GUID                      = C97AC593-109A-4C63-905C-675FDE2689E8
+  BASE_NAME                      = ArmStandaloneMmCoreEntryPoint
+  FILE_GUID                      = 0D7C6883-E1A8-4A7A-A35C-E0C200775B43
   MODULE_TYPE                    = MM_CORE_STANDALONE
   VERSION_STRING                 = 1.0
   PI_SPECIFICATION_VERSION       = 0x00010032
@@ -26,8 +26,6 @@ [Sources.AARCH64, Sources.ARM]
   Arm/SetPermissions.c
   Arm/CreateHobList.c
 
-[Sources.X64]
-  X64/StandaloneMmCoreEntryPoint.c
 
 [Packages]
   MdePkg/MdePkg.dec
-- 
2.31.1.windows.1



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


Re: [edk2-devel] [PATCH v1 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only
Posted by Leif Lindholm 4 years, 3 months ago
+ StandaloneMmPkg maintianers - this is their code.

Sami: can you submit a patch to drop Supreeth please?

/
    Leif

On Mon, Nov 01, 2021 at 12:56:46 -0700, brbarkel@microsoft.com wrote:
> From: Bret Barkelew <brbarkel@microsoft.com>
> 
> Drop X64 references. Update GUID.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3652
> 
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Signed-off-by: Bret Barkelew <bret.barkelew@microsoft.com>
> ---
>  ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c | 71 --------------------
>  ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf   |  6 +-
>  2 files changed, 2 insertions(+), 75 deletions(-)
> 
> diff --git a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c
> deleted file mode 100644
> index dffa965b8425..000000000000
> --- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -/** @file
> -  Entry point to the Standalone Mm Core.
> -
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> -Copyright (c) Microsoft Corporation.
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -
> -#include <PiMm.h>
> -
> -#include <Library/StandaloneMmCoreEntryPoint.h>
> -#include <Library/DebugLib.h>
> -#include <Library/BaseLib.h>
> -
> -//
> -// Cache copy of HobList pointer.
> -//
> -VOID *gHobList = NULL;
> -
> -/**
> -  The entry point of PE/COFF Image for the STANDALONE MM Core.
> -
> -  This function is the entry point for the STANDALONE MM Core. This function is required to call
> -  ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never expected to return.
> -  The STANDALONE MM Core is responsible for calling ProcessLibraryConstructorList() as soon as the EFI
> -  System Table and the image handle for the STANDALONE MM Core itself have been established.
> -  If ProcessModuleEntryPointList() returns, then ASSERT() and halt the system.
> -
> -  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.
> -
> -**/
> -VOID
> -EFIAPI
> -_ModuleEntryPoint (
> -  IN VOID  *HobStart
> -  )
> -{
> -  //
> -  // Cache a pointer to the HobList
> -  //
> -  gHobList = HobStart;
> -
> -  //
> -  // Call the Standalone MM Core entry point
> -  //
> -  ProcessModuleEntryPointList (HobStart);
> -
> -  //
> -  // TODO: Set page table here?? AARCH64 has this step for some reason
> -  //
> -}
> -
> -
> -/**
> -  Required by the EBC compiler and identical in functionality to _ModuleEntryPoint().
> -
> -  This function is required to call _ModuleEntryPoint() passing in HobStart.
> -
> -  @param  HobStart  Pointer to the beginning of the HOB List passed in from the PEI Phase.
> -
> -**/
> -VOID
> -EFIAPI
> -EfiMain (
> -  IN VOID  *HobStart
> -  )
> -{
> -  _ModuleEntryPoint (HobStart);
> -}
> diff --git a/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
> index a0629cbc1a6f..c6b283653882 100644
> --- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
> +++ b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
> @@ -10,8 +10,8 @@
>  
>  [Defines]
>    INF_VERSION                    = 0x0001001A
> -  BASE_NAME                      = StandaloneMmCoreEntryPoint
> -  FILE_GUID                      = C97AC593-109A-4C63-905C-675FDE2689E8
> +  BASE_NAME                      = ArmStandaloneMmCoreEntryPoint
> +  FILE_GUID                      = 0D7C6883-E1A8-4A7A-A35C-E0C200775B43
>    MODULE_TYPE                    = MM_CORE_STANDALONE
>    VERSION_STRING                 = 1.0
>    PI_SPECIFICATION_VERSION       = 0x00010032
> @@ -26,8 +26,6 @@ [Sources.AARCH64, Sources.ARM]
>    Arm/SetPermissions.c
>    Arm/CreateHobList.c
>  
> -[Sources.X64]
> -  X64/StandaloneMmCoreEntryPoint.c
>  
>  [Packages]
>    MdePkg/MdePkg.dec
> -- 
> 2.31.1.windows.1
> 


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