MdeModulePkg SmmLockBoxDxeLib: Get SmmCommRegion for COMM buffer

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

Currently, SmmCommunciate fails in RestoreLockBox after
SmmReadyToLock since COMM buffer is in stack instead of
using SmmCommRegion by gEdkiiPiSmmCommunicationRegionTableGuid.

This patch is to get SmmCommRegion by
gEdkiiPiSmmCommunicationRegionTableGuid for COMM buffer

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Baraneedharan Anbazhagan <anbazhagan@hp.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
index 9659f014e937c86afe27f42978362f6a497152ad..b75f81e69e04b7b78082aa58790552432389b1f6 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -20,11 +20,108 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/LockBoxLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/UefiLib.h>\r
 #include <Protocol/SmmCommunication.h>\r
 #include <Guid/SmmLockBox.h>\r
+#include <Guid/PiSmmCommunicationRegionTable.h>\r
 \r
 #include "SmmLockBoxLibPrivate.h"\r
 \r
+EFI_SMM_COMMUNICATION_PROTOCOL  *mLockBoxSmmCommProtocol = NULL;\r
+UINT8                           *mLockBoxSmmCommBuffer   = NULL;\r
+\r
+/**\r
+  Get smm communication protocol for lockbox.\r
+\r
+  @return Pointer to smm communication protocol, NULL if not found.\r
+\r
+**/\r
+EFI_SMM_COMMUNICATION_PROTOCOL *\r
+LockBoxGetSmmCommProtocol (\r
+  VOID\r
+  )\r
+{\r
+  EFI_STATUS    Status;\r
+\r
+  //\r
+  // If the protocol has been got previously, return it.\r
+  //\r
+  if (mLockBoxSmmCommProtocol != NULL) {\r
+    return mLockBoxSmmCommProtocol;\r
+  }\r
+\r
+  Status = gBS->LocateProtocol (\r
+                  &gEfiSmmCommunicationProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&mLockBoxSmmCommProtocol\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    mLockBoxSmmCommProtocol = NULL;\r
+  }\r
+  return mLockBoxSmmCommProtocol;\r
+}\r
+\r
+/**\r
+  Get smm communication buffer for lockbox.\r
+\r
+  @return Pointer to smm communication buffer, NULL if not found.\r
+\r
+**/\r
+UINT8 *\r
+LockBoxGetSmmCommBuffer (\r
+  VOID\r
+  )\r
+{\r
+  EFI_STATUS                                Status;\r
+  UINTN                                     MinimalSizeNeeded;\r
+  EDKII_PI_SMM_COMMUNICATION_REGION_TABLE   *PiSmmCommunicationRegionTable;\r
+  UINT32                                    Index;\r
+  EFI_MEMORY_DESCRIPTOR                     *Entry;\r
+  UINTN                                     Size;\r
+\r
+  //\r
+  // If the buffer has been got previously, return it.\r
+  //\r
+  if (mLockBoxSmmCommBuffer != NULL) {\r
+    return mLockBoxSmmCommBuffer;\r
+  }\r
+\r
+  MinimalSizeNeeded = sizeof (EFI_GUID) +\r
+                      sizeof (UINTN) +\r
+                      MAX (sizeof (EFI_SMM_LOCK_BOX_PARAMETER_SAVE),\r
+                           MAX (sizeof (EFI_SMM_LOCK_BOX_PARAMETER_SET_ATTRIBUTES),\r
+                                MAX (sizeof (EFI_SMM_LOCK_BOX_PARAMETER_UPDATE),\r
+                                     MAX (sizeof (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE),\r
+                                          sizeof (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE_ALL_IN_PLACE)))));\r
+\r
+  Status = EfiGetSystemConfigurationTable (\r
+             &gEdkiiPiSmmCommunicationRegionTableGuid,\r
+             (VOID **) &PiSmmCommunicationRegionTable\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    mLockBoxSmmCommBuffer = NULL;\r
+    return mLockBoxSmmCommBuffer;\r
+  }\r
+  ASSERT (PiSmmCommunicationRegionTable != NULL);\r
+  Entry = (EFI_MEMORY_DESCRIPTOR *) (PiSmmCommunicationRegionTable + 1);\r
+  Size = 0;\r
+  for (Index = 0; Index < PiSmmCommunicationRegionTable->NumberOfEntries; Index++) {\r
+    if (Entry->Type == EfiConventionalMemory) {\r
+      Size = EFI_PAGES_TO_SIZE ((UINTN) Entry->NumberOfPages);\r
+      if (Size >= MinimalSizeNeeded) {\r
+        break;\r
+      }\r
+    }\r
+    Entry = (EFI_MEMORY_DESCRIPTOR *) ((UINT8 *) Entry + PiSmmCommunicationRegionTable->DescriptorSize);\r
+  }\r
+  if (Index >= PiSmmCommunicationRegionTable->NumberOfEntries) {\r
+    mLockBoxSmmCommBuffer = NULL;\r
+  } else {\r
+    mLockBoxSmmCommBuffer = (UINT8 *) (UINTN) Entry->PhysicalStart;\r
+  }\r
+  return mLockBoxSmmCommBuffer;\r
+}\r
+\r
 /**\r
   This function will save confidential information to lockbox.\r
 \r
@@ -52,7 +149,8 @@ SaveLockBox (
   EFI_SMM_COMMUNICATION_PROTOCOL  *SmmCommunication;\r
   EFI_SMM_LOCK_BOX_PARAMETER_SAVE *LockBoxParameterSave;\r
   EFI_SMM_COMMUNICATE_HEADER      *CommHeader;\r
-  UINT8                           CommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_SAVE)];\r
+  UINT8                           TempCommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_SAVE)];\r
+  UINT8                           *CommBuffer;\r
   UINTN                           CommSize;\r
 \r
   DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n"));\r
@@ -64,21 +162,18 @@ SaveLockBox (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Get needed resource\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiSmmCommunicationProtocolGuid,\r
-                  NULL,\r
-                  (VOID **)&SmmCommunication\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
+  SmmCommunication = LockBoxGetSmmCommProtocol ();\r
+  if (SmmCommunication == NULL) {\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
   //\r
   // Prepare parameter\r
   //\r
+  CommBuffer = LockBoxGetSmmCommBuffer ();\r
+  if (CommBuffer == NULL) {\r
+    CommBuffer = &TempCommBuffer[0];\r
+  }\r
   CommHeader = (EFI_SMM_COMMUNICATE_HEADER *)&CommBuffer[0];\r
   CopyMem (&CommHeader->HeaderGuid, &gEfiSmmLockBoxCommunicationGuid, sizeof(gEfiSmmLockBoxCommunicationGuid));\r
   CommHeader->MessageLength = sizeof(*LockBoxParameterSave);\r
@@ -94,7 +189,7 @@ SaveLockBox (
   //\r
   // Send command\r
   //\r
-  CommSize = sizeof(CommBuffer);\r
+  CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_SAVE);\r
   Status = SmmCommunication->Communicate (\r
                                SmmCommunication,\r
                                &CommBuffer[0],\r
@@ -136,7 +231,8 @@ SetLockBoxAttributes (
   EFI_SMM_COMMUNICATION_PROTOCOL            *SmmCommunication;\r
   EFI_SMM_LOCK_BOX_PARAMETER_SET_ATTRIBUTES *LockBoxParameterSetAttributes;\r
   EFI_SMM_COMMUNICATE_HEADER                *CommHeader;\r
-  UINT8                                     CommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_SET_ATTRIBUTES)];\r
+  UINT8                                     TempCommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_SET_ATTRIBUTES)];\r
+  UINT8                                     *CommBuffer;\r
   UINTN                                     CommSize;\r
 \r
   DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Enter\n"));\r
@@ -149,21 +245,18 @@ SetLockBoxAttributes (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Get needed resource\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiSmmCommunicationProtocolGuid,\r
-                  NULL,\r
-                  (VOID **)&SmmCommunication\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
+  SmmCommunication = LockBoxGetSmmCommProtocol ();\r
+  if (SmmCommunication == NULL) {\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
   //\r
   // Prepare parameter\r
   //\r
+  CommBuffer = LockBoxGetSmmCommBuffer ();\r
+  if (CommBuffer == NULL) {\r
+    CommBuffer = &TempCommBuffer[0];\r
+  }\r
   CommHeader = (EFI_SMM_COMMUNICATE_HEADER *)&CommBuffer[0];\r
   CopyMem (&CommHeader->HeaderGuid, &gEfiSmmLockBoxCommunicationGuid, sizeof(gEfiSmmLockBoxCommunicationGuid));\r
   CommHeader->MessageLength = sizeof(*LockBoxParameterSetAttributes);\r
@@ -178,7 +271,7 @@ SetLockBoxAttributes (
   //\r
   // Send command\r
   //\r
-  CommSize = sizeof(CommBuffer);\r
+  CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_SET_ATTRIBUTES);\r
   Status = SmmCommunication->Communicate (\r
                                SmmCommunication,\r
                                &CommBuffer[0],\r
@@ -225,7 +318,8 @@ UpdateLockBox (
   EFI_SMM_COMMUNICATION_PROTOCOL    *SmmCommunication;\r
   EFI_SMM_LOCK_BOX_PARAMETER_UPDATE *LockBoxParameterUpdate;\r
   EFI_SMM_COMMUNICATE_HEADER        *CommHeader;\r
-  UINT8                             CommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_UPDATE)];\r
+  UINT8                             TempCommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_UPDATE)];\r
+  UINT8                             *CommBuffer;\r
   UINTN                             CommSize;\r
 \r
   DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n"));\r
@@ -237,21 +331,18 @@ UpdateLockBox (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Get needed resource\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiSmmCommunicationProtocolGuid,\r
-                  NULL,\r
-                  (VOID **)&SmmCommunication\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
+  SmmCommunication = LockBoxGetSmmCommProtocol ();\r
+  if (SmmCommunication == NULL) {\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
   //\r
   // Prepare parameter\r
   //\r
+  CommBuffer = LockBoxGetSmmCommBuffer ();\r
+  if (CommBuffer == NULL) {\r
+    CommBuffer = &TempCommBuffer[0];\r
+  }\r
   CommHeader = (EFI_SMM_COMMUNICATE_HEADER *)&CommBuffer[0];\r
   CopyMem (&CommHeader->HeaderGuid, &gEfiSmmLockBoxCommunicationGuid, sizeof(gEfiSmmLockBoxCommunicationGuid));\r
   CommHeader->MessageLength = sizeof(*LockBoxParameterUpdate);\r
@@ -268,7 +359,7 @@ UpdateLockBox (
   //\r
   // Send command\r
   //\r
-  CommSize = sizeof(CommBuffer);\r
+  CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_UPDATE);\r
   Status = SmmCommunication->Communicate (\r
                                SmmCommunication,\r
                                &CommBuffer[0],\r
@@ -316,7 +407,8 @@ RestoreLockBox (
   EFI_SMM_COMMUNICATION_PROTOCOL     *SmmCommunication;\r
   EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *LockBoxParameterRestore;\r
   EFI_SMM_COMMUNICATE_HEADER         *CommHeader;\r
-  UINT8                              CommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_RESTORE)];\r
+  UINT8                              TempCommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_RESTORE)];\r
+  UINT8                              *CommBuffer;\r
   UINTN                              CommSize;\r
 \r
   DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n"));\r
@@ -330,21 +422,18 @@ RestoreLockBox (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Get needed resource\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiSmmCommunicationProtocolGuid,\r
-                  NULL,\r
-                  (VOID **)&SmmCommunication\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
+  SmmCommunication = LockBoxGetSmmCommProtocol ();\r
+  if (SmmCommunication == NULL) {\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
   //\r
   // Prepare parameter\r
   //\r
+  CommBuffer = LockBoxGetSmmCommBuffer ();\r
+  if (CommBuffer == NULL) {\r
+    CommBuffer = &TempCommBuffer[0];\r
+  }\r
   CommHeader = (EFI_SMM_COMMUNICATE_HEADER *)&CommBuffer[0];\r
   CopyMem (&CommHeader->HeaderGuid, &gEfiSmmLockBoxCommunicationGuid, sizeof(gEfiSmmLockBoxCommunicationGuid));\r
   CommHeader->MessageLength = sizeof(*LockBoxParameterRestore);\r
@@ -364,7 +453,7 @@ RestoreLockBox (
   //\r
   // Send command\r
   //\r
-  CommSize = sizeof(CommBuffer);\r
+  CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_RESTORE);\r
   Status = SmmCommunication->Communicate (\r
                                SmmCommunication,\r
                                &CommBuffer[0],\r
@@ -403,26 +492,24 @@ RestoreAllLockBoxInPlace (
   EFI_SMM_COMMUNICATION_PROTOCOL                  *SmmCommunication;\r
   EFI_SMM_LOCK_BOX_PARAMETER_RESTORE_ALL_IN_PLACE *LockBoxParameterRestoreAllInPlace;\r
   EFI_SMM_COMMUNICATE_HEADER                      *CommHeader;\r
-  UINT8                                           CommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_RESTORE_ALL_IN_PLACE)];\r
+  UINT8                                           TempCommBuffer[sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_RESTORE_ALL_IN_PLACE)];\r
+  UINT8                                           *CommBuffer;\r
   UINTN                                           CommSize;\r
 \r
   DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Enter\n"));\r
 \r
-  //\r
-  // Get needed resource\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiSmmCommunicationProtocolGuid,\r
-                  NULL,\r
-                  (VOID **)&SmmCommunication\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
+  SmmCommunication = LockBoxGetSmmCommProtocol ();\r
+  if (SmmCommunication == NULL) {\r
     return EFI_NOT_STARTED;\r
   }\r
 \r
   //\r
   // Prepare parameter\r
   //\r
+  CommBuffer = LockBoxGetSmmCommBuffer ();\r
+  if (CommBuffer == NULL) {\r
+    CommBuffer = &TempCommBuffer[0];\r
+  }\r
   CommHeader = (EFI_SMM_COMMUNICATE_HEADER *)&CommBuffer[0];\r
   CopyMem (&CommHeader->HeaderGuid, &gEfiSmmLockBoxCommunicationGuid, sizeof(gEfiSmmLockBoxCommunicationGuid));\r
   CommHeader->MessageLength = sizeof(*LockBoxParameterRestoreAllInPlace);\r
@@ -435,7 +522,7 @@ RestoreAllLockBoxInPlace (
   //\r
   // Send command\r
   //\r
-  CommSize = sizeof(CommBuffer);\r
+  CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + sizeof(EFI_SMM_LOCK_BOX_PARAMETER_RESTORE_ALL_IN_PLACE);\r
   Status = SmmCommunication->Communicate (\r
                                SmmCommunication,\r
                                &CommBuffer[0],\r

diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
index 48cdb9c66ab76345fe386105c6caa955388deb83..f3120ccb42d58bf20f9bd7a2391d2e998f13fd8a 100644 (file)
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  DXE LockBox library instance.\r
 #\r
-#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions\r
@@ -42,9 +42,11 @@
   BaseLib\r
   BaseMemoryLib\r
   DebugLib\r
+  UefiLib\r
 \r
 [Guids]\r
-  gEfiSmmLockBoxCommunicationGuid       ## SOMETIMES_CONSUMES ## GUID # Used to do smm communication\r
+  gEfiSmmLockBoxCommunicationGuid            ## SOMETIMES_CONSUMES ## GUID # Used to do smm communication\r
+  gEdkiiPiSmmCommunicationRegionTableGuid    ## SOMETIMES_CONSUMES ## SystemTable\r
 \r
 [Protocols]\r
   gEfiSmmCommunicationProtocolGuid      ## SOMETIMES_CONSUMES\r