StandaloneMmPkg/Core: drop support for dispatching FVs into MM

Remove the support that permits calls into the MM context to dispatch
firmware volumes that are not part of the initial standalone MM firmware
volume.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: Achin Gupta <achin.gupta@arm.com>

diff --git a/StandaloneMmPkg/Core/Dispatcher.c b/StandaloneMmPkg/Core/Dispatcher.c
index bede4832cfb767db4c9c4655fac9149ce4e29a84..4b2f38f700a086c2dfb31401fc57a33509b9e1ba 100644 (file)
--- a/StandaloneMmPkg/Core/Dispatcher.c
+++ b/StandaloneMmPkg/Core/Dispatcher.c
@@ -883,52 +883,6 @@ MmAddToDriverList (
   return EFI_SUCCESS;\r
 }\r
 \r
-/**\r
-  This function is the main entry point for an MM handler dispatch\r
-  or communicate-based callback.\r
-\r
-  @param  DispatchHandle  The unique handle assigned to this handler by SmiHandlerRegister().\r
-  @param  Context         Points to an optional handler context which was specified when the handler was registered.\r
-  @param  CommBuffer      A pointer to a collection of data in memory that will\r
-                          be conveyed from a non-MM environment into an MM environment.\r
-  @param  CommBufferSize  The size of the CommBuffer.\r
-\r
-  @return Status Code\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-MmFvDispatchHandler (\r
-  IN     EFI_HANDLE               DispatchHandle,\r
-  IN     CONST VOID               *Context,        OPTIONAL\r
-  IN OUT VOID                     *CommBuffer,     OPTIONAL\r
-  IN OUT UINTN                    *CommBufferSize  OPTIONAL\r
-  )\r
-{\r
-  EFI_STATUS                            Status;\r
-  EFI_MM_COMMUNICATE_FV_DISPATCH_DATA  *CommunicationFvDispatchData;\r
-  EFI_FIRMWARE_VOLUME_HEADER            *FwVolHeader;\r
-\r
-  DEBUG ((DEBUG_INFO, "MmFvDispatchHandler\n"));\r
-\r
-  CommunicationFvDispatchData = CommBuffer;\r
-\r
-  DEBUG ((DEBUG_INFO, "  Dispatch - 0x%016lx - 0x%016lx\n", CommunicationFvDispatchData->Address,\r
-          CommunicationFvDispatchData->Size));\r
-\r
-  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)CommunicationFvDispatchData->Address;\r
-\r
-  MmCoreFfsFindMmDriver (FwVolHeader);\r
-\r
-  //\r
-  // Execute the MM Dispatcher on any newly discovered FVs and previously\r
-  // discovered MM drivers that have been discovered but not dispatched.\r
-  //\r
-  Status = MmDispatcher ();\r
-\r
-  return Status;\r
-}\r
-\r
 /**\r
   Traverse the discovered list for any drivers that were discovered but not loaded\r
   because the dependency experessions evaluated to false.\r

diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.c b/StandaloneMmPkg/Core/StandaloneMmCore.c
index ec53b8d8bec4dbc45d6486fa30ab886a7762c193..766cdb5c848c22b23d5c4a9d625cde6252eb5637 100644 (file)
--- a/StandaloneMmPkg/Core/StandaloneMmCore.c
+++ b/StandaloneMmPkg/Core/StandaloneMmCore.c
@@ -99,7 +99,6 @@ BOOLEAN  mInLegacyBoot = FALSE;
 // Table of MMI Handlers that are registered by the MM Core when it is initialized\r
 //\r
 MM_CORE_MMI_HANDLERS  mMmCoreMmiHandlers[] = {\r
-  { MmFvDispatchHandler,     &gMmFvDispatchGuid,                 NULL, TRUE  },\r
   { MmReadyToLockHandler,    &gEfiDxeMmReadyToLockProtocolGuid,  NULL, TRUE  },\r
   { MmEndOfDxeHandler,       &gEfiEndOfDxeEventGroupGuid,        NULL, FALSE },\r
   { MmLegacyBootHandler,     &gEfiEventLegacyBootGuid,           NULL, FALSE },\r

diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.h b/StandaloneMmPkg/Core/StandaloneMmCore.h
index 0d20bcaa6be5487095eba4e1743495432491ea69..74338dc9da0d7442b793cf5d5cef9a4533913373 100644 (file)
--- a/StandaloneMmPkg/Core/StandaloneMmCore.h
+++ b/StandaloneMmPkg/Core/StandaloneMmCore.h
@@ -635,28 +635,6 @@ MmDriverDispatchHandler (
 \r
   @return Status Code\r
 \r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-MmFvDispatchHandler (\r
-  IN     EFI_HANDLE               DispatchHandle,\r
-  IN     CONST VOID               *Context,        OPTIONAL\r
-  IN OUT VOID                     *CommBuffer,     OPTIONAL\r
-  IN OUT UINTN                    *CommBufferSize  OPTIONAL\r
-  );\r
-\r
-/**\r
-  This function is the main entry point for an MM handler dispatch\r
-  or communicate-based callback.\r
-\r
-  @param  DispatchHandle  The unique handle assigned to this handler by MmiHandlerRegister().\r
-  @param  Context         Points to an optional handler context which was specified when the handler was registered.\r
-  @param  CommBuffer      A pointer to a collection of data in memory that will\r
-                          be conveyed from a non-MM environment into an MM environment.\r
-  @param  CommBufferSize  The size of the CommBuffer.\r
-\r
-  @return Status Code\r
-\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r