| Message ID | 20190305133248.4828-5-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | StandaloneMmPkg, ArmPkg: cleanups and improvements | expand |
Reviewed-by: jiewen.yao@intel.com > -----Original Message----- > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] > Sent: Tuesday, March 5, 2019 5:33 AM > To: edk2-devel@lists.01.org > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Achin Gupta > <achin.gupta@arm.com>; Supreeth Venkatesh > <supreeth.venkatesh@arm.com>; Yao, Jiewen <jiewen.yao@intel.com>; > Leif Lindholm <leif.lindholm@linaro.org>; Jagadeesh Ujja > <jagadeesh.ujja@arm.com> > Subject: [PATCH 04/10] StandaloneMmPkg: remove redundant > StandaloneMmDriverEntryPoint driver > > StandaloneMmDriverEntryPoint is implemented in MdePkg now, so let's > drop the redundant StandaloneMmPkg version. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > > StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmD > riverEntryPoint.inf | 41 -------- > > StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmD > riverEntryPoint.c | 99 -------------------- > 2 files changed, 140 deletions(-) > > diff --git > a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneM > mDriverEntryPoint.inf > b/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneM > mDriverEntryPoint.inf > deleted file mode 100644 > index 4d1896db10ba..000000000000 > --- > a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneM > mDriverEntryPoint.inf > +++ /dev/null > @@ -1,41 +0,0 @@ > -## @file > -# Module entry point library for Standalone MM driver. > -# > -# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR> > -# Copyright (c) 2016-2018, ARM Ltd. All rights reserved.<BR> > -# > -# This program and the accompanying materials > -# are licensed and made available under the terms and conditions of the > BSD License > -# which accompanies this distribution. The full text of the license may be > found at > -# http://opensource.org/licenses/bsd-license.php. > -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > BASIS, > -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > EXPRESS OR IMPLIED. > -# > -# > -## > - > -[Defines] > - INF_VERSION = 0x0001001A > - BASE_NAME = StandaloneMmDriverEntryPoint > - FILE_GUID = > BBC33478-98F8-4B78-B29D-574D681B7E43 > - MODULE_TYPE = MM_STANDALONE > - VERSION_STRING = 1.0 > - PI_SPECIFICATION_VERSION = 0x00010032 > - LIBRARY_CLASS = > StandaloneMmDriverEntryPoint|MM_STANDALONE > - > -# > -# The following information is for reference only and not required by the > build tools. > -# > -# VALID_ARCHITECTURES = IA32 X64 IPF EBC > -# > - > -[Sources] > - StandaloneMmDriverEntryPoint.c > - > -[Packages] > - MdePkg/MdePkg.dec > - > -[LibraryClasses] > - BaseLib > - DebugLib > - > diff --git > a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneM > mDriverEntryPoint.c > b/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneM > mDriverEntryPoint.c > deleted file mode 100644 > index 64bffcfccc8a..000000000000 > --- > a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneM > mDriverEntryPoint.c > +++ /dev/null > @@ -1,99 +0,0 @@ > -/** @file > - Entry point to a Standalone MM driver. > - > -Copyright (c) 2015, Intel Corporation. All rights reserved.<BR> > -Copyright (c) 2016 - 2018, ARM Ltd. All rights reserved.<BR> > - > -This program and the accompanying materials > -are licensed and made available under the terms and conditions of the BSD > License > -which accompanies this distribution. The full text of the license may be > found at > -http://opensource.org/licenses/bsd-license.php > - > -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > BASIS, > -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > EXPRESS OR IMPLIED. > - > -**/ > - > -#include <PiMm.h> > - > -#include <Library/BaseLib.h> > -#include <Library/DebugLib.h> > - > -VOID > -EFIAPI > -ProcessLibraryConstructorList ( > - IN EFI_HANDLE ImageHandle, > - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable > - ); > - > -EFI_STATUS > -EFIAPI > -ProcessModuleEntryPointList ( > - IN EFI_HANDLE ImageHandle, > - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable > - ); > - > -VOID > -EFIAPI > -ProcessLibraryDestructorList ( > - IN EFI_HANDLE ImageHandle, > - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable > - ); > - > -/** > - The entry point of PE/COFF Image for a Standalone MM Driver. > - > - This function is the entry point for a Standalone MM Driver. > - This function must call ProcessLibraryConstructorList() and > - ProcessModuleEntryPointList(). > - If the return status from ProcessModuleEntryPointList() > - is an error status, then ProcessLibraryDestructorList() must be called. > - The return value from ProcessModuleEntryPointList() is returned. > - If _gDriverUnloadImageCount is greater than zero, then an unload > - handler must be registered for this image > - and the unload handler must invoke ProcessModuleUnloadList(). > - If _gUefiDriverRevision is not zero and SystemTable->Hdr.Revision is less > - than _gUefiDriverRevison, then return EFI_INCOMPATIBLE_VERSION. > - > - > - @param ImageHandle The image handle of the Standalone MM > Driver. > - @param SystemTable A pointer to the EFI System Table. > - > - @retval EFI_SUCCESS The Standalone MM Driver > exited normally. > - @retval EFI_INCOMPATIBLE_VERSION _gUefiDriverRevision is > greater than > - SystemTable->Hdr.Revision. > - @retval Other Return value from > ProcessModuleEntryPointList(). > - > -**/ > -EFI_STATUS > -EFIAPI > -_ModuleEntryPoint ( > - IN EFI_HANDLE ImageHandle, > - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable > - ) > -{ > - EFI_STATUS Status; > - > - // > - // Call constructor for all libraries > - // > - ProcessLibraryConstructorList (ImageHandle, MmSystemTable); > - > - // > - // Call the driver entry point > - // > - Status = ProcessModuleEntryPointList (ImageHandle, MmSystemTable); > - > - // > - // If all of the drivers returned errors, then invoke all of the library > destructors > - // > - if (EFI_ERROR (Status)) { > - ProcessLibraryDestructorList (ImageHandle, MmSystemTable); > - } > - > - // > - // Return the cumulative return status code from all of the driver entry > points > - // > - return Status; > -} > - > -- > 2.20.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf b/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf deleted file mode 100644 index 4d1896db10ba..000000000000 --- a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf +++ /dev/null @@ -1,41 +0,0 @@ -## @file -# Module entry point library for Standalone MM driver. -# -# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR> -# Copyright (c) 2016-2018, ARM Ltd. All rights reserved.<BR> -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php. -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# -## - -[Defines] - INF_VERSION = 0x0001001A - BASE_NAME = StandaloneMmDriverEntryPoint - FILE_GUID = BBC33478-98F8-4B78-B29D-574D681B7E43 - MODULE_TYPE = MM_STANDALONE - VERSION_STRING = 1.0 - PI_SPECIFICATION_VERSION = 0x00010032 - LIBRARY_CLASS = StandaloneMmDriverEntryPoint|MM_STANDALONE - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -[Sources] - StandaloneMmDriverEntryPoint.c - -[Packages] - MdePkg/MdePkg.dec - -[LibraryClasses] - BaseLib - DebugLib - diff --git a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c b/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c deleted file mode 100644 index 64bffcfccc8a..000000000000 --- a/StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c +++ /dev/null @@ -1,99 +0,0 @@ -/** @file - Entry point to a Standalone MM driver. - -Copyright (c) 2015, Intel Corporation. All rights reserved.<BR> -Copyright (c) 2016 - 2018, ARM Ltd. All rights reserved.<BR> - -This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include <PiMm.h> - -#include <Library/BaseLib.h> -#include <Library/DebugLib.h> - -VOID -EFIAPI -ProcessLibraryConstructorList ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ); - -EFI_STATUS -EFIAPI -ProcessModuleEntryPointList ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ); - -VOID -EFIAPI -ProcessLibraryDestructorList ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ); - -/** - The entry point of PE/COFF Image for a Standalone MM Driver. - - This function is the entry point for a Standalone MM Driver. - This function must call ProcessLibraryConstructorList() and - ProcessModuleEntryPointList(). - If the return status from ProcessModuleEntryPointList() - is an error status, then ProcessLibraryDestructorList() must be called. - The return value from ProcessModuleEntryPointList() is returned. - If _gDriverUnloadImageCount is greater than zero, then an unload - handler must be registered for this image - and the unload handler must invoke ProcessModuleUnloadList(). - If _gUefiDriverRevision is not zero and SystemTable->Hdr.Revision is less - than _gUefiDriverRevison, then return EFI_INCOMPATIBLE_VERSION. - - - @param ImageHandle The image handle of the Standalone MM Driver. - @param SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The Standalone MM Driver exited normally. - @retval EFI_INCOMPATIBLE_VERSION _gUefiDriverRevision is greater than - SystemTable->Hdr.Revision. - @retval Other Return value from ProcessModuleEntryPointList(). - -**/ -EFI_STATUS -EFIAPI -_ModuleEntryPoint ( - IN EFI_HANDLE ImageHandle, - IN IN EFI_MM_SYSTEM_TABLE *MmSystemTable - ) -{ - EFI_STATUS Status; - - // - // Call constructor for all libraries - // - ProcessLibraryConstructorList (ImageHandle, MmSystemTable); - - // - // Call the driver entry point - // - Status = ProcessModuleEntryPointList (ImageHandle, MmSystemTable); - - // - // If all of the drivers returned errors, then invoke all of the library destructors - // - if (EFI_ERROR (Status)) { - ProcessLibraryDestructorList (ImageHandle, MmSystemTable); - } - - // - // Return the cumulative return status code from all of the driver entry points - // - return Status; -} -
StandaloneMmDriverEntryPoint is implemented in MdePkg now, so let's drop the redundant StandaloneMmPkg version. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf | 41 -------- StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.c | 99 -------------------- 2 files changed, 140 deletions(-) -- 2.20.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel