MdeModulePkg: Add SMBIOS 64-bit support for SMBIOS 3.0.

Add SMBIOS 64-bit entry point and 64-bit table support for SMBIOS 3.0.
Introduce PcdSmbiosEntryPointProvideMethod to produce 32-bit or 64-bit
SMBIOS table.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17051 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 420 insertions, 95 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 02b2c25d88..c00319a7f3 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -1165,6 +1165,16 @@
   # @Prompt SMBIOS version.

   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0300|UINT16|0x00010055

 

+  ## SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.

+  # @Prompt SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0|UINT8|0x0001006A

+

+  ## SMBIOS produce method.

+  #  BIT0 set indicates 32-bit entry point and table are produced.<BR>

+  #  BIT1 set indicates 64-bit entry point and table are produced.<BR>

+  # @Prompt The policy to produce SMBIOS entry point and table.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x3|UINT32|0x00010069

+

   ## This PCD specifies the additional pad size in FPDT Basic Boot Performance Table for

   #  the extension FPDT boot records received after ReadyToBoot and before ExitBootService.

   # @Prompt Pad size for extension FPDT boot records.

diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni
index 10e89cb5a1..1aab112223 100644
--- a/MdeModulePkg/MdeModulePkg.uni
+++ b/MdeModulePkg/MdeModulePkg.uni
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index c0128f088f..43d78a6a07 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -2,7 +2,7 @@
   This code produces the Smbios protocol. It also responsible for constructing 

   SMBIOS table into system table.

   

-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 2015, Intel Corporation. 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        

@@ -22,7 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 SMBIOS_INSTANCE mPrivateData;

 

-UINTN mPreAllocatedPages = 0;

+UINTN mPreAllocatedPages      = 0;

+UINTN mPre64BitAllocatedPages = 0;

 

 //

 // Chassis for SMBIOS entry point structure that is to be installed into EFI system config table.

@@ -104,8 +105,55 @@ SMBIOS_TABLE_ENTRY_POINT EntryPointStructureData = {
   0

 };

 

-

-

+SMBIOS_TABLE_3_0_ENTRY_POINT *Smbios30EntryPointStructure    = NULL;

+SMBIOS_TABLE_3_0_ENTRY_POINT Smbios30EntryPointStructureData = {

+  //

+  // AnchorString _SM3_

+  //

+  {

+    0x5f,

+    0x53,

+    0x4d,

+    0x33,

+    0x5f,

+  },

+  //

+  // EntryPointStructureChecksum,TO BE FILLED

+  //

+  0,

+  //

+  // EntryPointLength

+  //

+  0x18,

+  //

+  // MajorVersion

+  //

+  0,

+  //

+  // MinorVersion

+  //

+  0,

+  //

+  // DocRev

+  //

+  0,

+  //

+  // EntryPointRevision

+  //

+  0x01,

+  //

+  // Reserved

+  //

+  0,

+  //

+  // TableMaximumSize,TO BE FILLED

+  //

+  0,

+  //

+  // TableAddress,TO BE FILLED

+  //

+  0

+};

 /**

 

   Get the full size of SMBIOS structure including optional strings that follow the formatted structure.

@@ -153,7 +201,7 @@ GetSmbiosStructureSize (
 

     if (This->MajorVersion < 2 || (This->MajorVersion == 2 && This->MinorVersion < 7)){

       MaxLen = SMBIOS_STRING_MAX_LENGTH;

-    } else {

+    } else if (This->MajorVersion < 3) {

       //

       // Reference SMBIOS 2.7, chapter 6.1.3, it will have no limit on the length of each individual text string.

       // However, the length of the entire structure table (including all strings) must be reported

@@ -161,6 +209,12 @@ GetSmbiosStructureSize (
       // which is a WORD field limited to 65,535 bytes.

       //

       MaxLen = SMBIOS_TABLE_MAX_LENGTH;

+    } else {

+      //

+      // SMBIOS 3.0 defines the Structure table maximum size as DWORD field limited to 0xFFFFFFFF bytes.

+      // Locate the end of string as long as possible.

+      //

+      MaxLen = SMBIOS_3_0_TABLE_MAX_LENGTH;

     }

 

     for (StrLen = 0 ; StrLen < MaxLen; StrLen++) {

@@ -319,6 +373,8 @@ SmbiosAdd (
   EFI_SMBIOS_HANDLE           MaxSmbiosHandle;

   SMBIOS_HANDLE_ENTRY         *HandleEntry;

   EFI_SMBIOS_RECORD_HEADER    *InternalRecord;

+  BOOLEAN                     Smbios32BitTable;

+  BOOLEAN                     Smbios64BitTable;

   

   if (SmbiosHandle == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -359,11 +415,44 @@ SmbiosAdd (
     return Status;

   }

 

-  if (EntryPointStructure->TableLength + StructureSize > SMBIOS_TABLE_MAX_LENGTH) {

+  Smbios32BitTable = FALSE;

+  Smbios64BitTable = FALSE;

+  if ((This->MajorVersion < 0x3) || 

+      ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {

     //

-    // The length of the entire structure table (including all strings) must be reported

+    // For SMBIOS 32-bit table, the length of the entire structure table (including all strings) must be reported

     // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,

-    // which is a WORD field limited to 65,535 bytes.

+    // which is a WORD field limited to 65,535 bytes. So the max size of 32-bit table should not exceed 65,535 bytes.

+    //

+    if ((EntryPointStructure != NULL) && 

+        (EntryPointStructure->TableLength + StructureSize > SMBIOS_TABLE_MAX_LENGTH)) {

+      DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 32-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));

+    } else {

+      Smbios32BitTable = TRUE;

+      DEBUG ((EFI_D_INFO, "SmbiosAdd: Smbios type %d with size 0x%x is added to 32-bit table\n", Record->Type, StructureSize));

+    }

+  }

+  

+  //

+  // For SMBIOS 3.0, Structure table maximum size in Entry Point structure is DWORD field limited to 0xFFFFFFFF bytes.

+  //

+  if ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT1) == BIT1)) {

+    //

+    // For SMBIOS 64-bit table, Structure table maximum size in SMBIOS 3.0 (64-bit) Entry Point

+    // is a DWORD field limited to 0xFFFFFFFF bytes. So the max size of 64-bit table should not exceed 0xFFFFFFFF bytes.

+    //

+    if ((Smbios30EntryPointStructure != NULL) && 

+        (Smbios30EntryPointStructure->TableMaximumSize + StructureSize > SMBIOS_3_0_TABLE_MAX_LENGTH)) {

+      DEBUG ((EFI_D_INFO, "SmbiosAdd: Total length exceeds max 64-bit table length with type = %d size = 0x%x\n", Record->Type, StructureSize));

+    } else {

+      DEBUG ((EFI_D_INFO, "SmbiosAdd: Smbios type %d with size 0x%x is added to 64-bit table\n", Record->Type, StructureSize));

+      Smbios64BitTable = TRUE;

+    }

+  }

+

+  if ((!Smbios32BitTable) && (!Smbios64BitTable)) {

+    //

+    // If both 32-bit and 64-bit table are not updated, quit

     //

     return EFI_OUT_OF_RESOURCES;

   }

@@ -417,6 +506,8 @@ SmbiosAdd (
   SmbiosEntry->Signature    = EFI_SMBIOS_ENTRY_SIGNATURE;

   SmbiosEntry->RecordHeader = InternalRecord;

   SmbiosEntry->RecordSize   = TotalSize;

+  SmbiosEntry->Smbios32BitTable = Smbios32BitTable;

+  SmbiosEntry->Smbios64BitTable = Smbios64BitTable;

   InsertTailList (&Private->DataListHead, &SmbiosEntry->Link);

 

   CopyMem (Raw, Record, StructureSize);

@@ -428,7 +519,7 @@ SmbiosAdd (
   // configuration table, so other UEFI drivers can get SMBIOS table from

   // configuration table without depending on PI SMBIOS protocol.

   //

-  SmbiosTableConstruction ();

+  SmbiosTableConstruction (Smbios32BitTable, Smbios64BitTable);

   

   //

   // Leave critical section

@@ -500,7 +591,7 @@ SmbiosUpdateString (
     if (InputStrLen > SMBIOS_STRING_MAX_LENGTH) {

       return EFI_UNSUPPORTED;

     }

-  } else {

+  } else if (This->MajorVersion < 3) {

     //

     // Reference SMBIOS 2.7, chapter 6.1.3, it will have no limit on the length of each individual text string.

     // However, the length of the entire structure table (including all strings) must be reported 

@@ -510,6 +601,14 @@ SmbiosUpdateString (
     if (InputStrLen > SMBIOS_TABLE_MAX_LENGTH) {

       return EFI_UNSUPPORTED;

     }

+  } else {

+    if (InputStrLen > SMBIOS_3_0_TABLE_MAX_LENGTH) {

+      //

+      // SMBIOS 3.0 defines the Structure table maximum size as DWORD field limited to 0xFFFFFFFF bytes.

+      // The input string length should not exceed 0xFFFFFFFF bytes.

+      // 

+      return EFI_UNSUPPORTED;

+    }

   }

 

   Private = SMBIOS_INSTANCE_FROM_THIS (This);

@@ -573,17 +672,47 @@ SmbiosUpdateString (
         // configuration table, so other UEFI drivers can get SMBIOS table from

         // configuration table without depending on PI SMBIOS protocol.

         //

-        SmbiosTableConstruction ();

+        SmbiosTableConstruction (SmbiosEntry->Smbios32BitTable, SmbiosEntry->Smbios64BitTable);

         EfiReleaseLock (&Private->DataLock);

         return EFI_SUCCESS;

       }

+      

+      SmbiosEntry->Smbios32BitTable = FALSE;

+      SmbiosEntry->Smbios64BitTable = FALSE;

+      if ((This->MajorVersion < 0x3) || 

+          ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT0) == BIT0))) {

+        //

+        // 32-bit table is produced, check the valid length.

+        //

+        if ((EntryPointStructure != NULL) && 

+            (EntryPointStructure->TableLength + InputStrLen - TargetStrLen > SMBIOS_TABLE_MAX_LENGTH)) {

+          //

+          // The length of the entire structure table (including all strings) must be reported

+          // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,

+          // which is a WORD field limited to 65,535 bytes.

+          //

+          DEBUG ((EFI_D_INFO, "SmbiosUpdateString: Total length exceeds max 32-bit table length\n"));

+        } else {

+          DEBUG ((EFI_D_INFO, "SmbiosUpdateString: New smbios record add to 32-bit table\n"));

+          SmbiosEntry->Smbios32BitTable = TRUE;

+        }

+      } 

 

-      if (EntryPointStructure->TableLength + InputStrLen - TargetStrLen > SMBIOS_TABLE_MAX_LENGTH) {

+      if ((This->MajorVersion >= 0x3) && ((PcdGet32 (PcdSmbiosEntryPointProvideMethod) & BIT1) == BIT1)) {

         //

-        // The length of the entire structure table (including all strings) must be reported

-        // in the Structure Table Length field of the SMBIOS Structure Table Entry Point,

-        // which is a WORD field limited to 65,535 bytes.

+        // 64-bit table is produced, check the valid length.

         //

+        if ((Smbios30EntryPointStructure != NULL) && 

+            (Smbios30EntryPointStructure->TableMaximumSize + InputStrLen - TargetStrLen > SMBIOS_3_0_TABLE_MAX_LENGTH)) {

+          DEBUG ((EFI_D_INFO, "SmbiosUpdateString: Total length exceeds max 64-bit table length\n"));

+        } else {

+          DEBUG ((EFI_D_INFO, "SmbiosUpdateString: New smbios record add to 64-bit table\n"));

+          SmbiosEntry->Smbios64BitTable = TRUE;

+        }

+      }

+

+      if ((!SmbiosEntry->Smbios32BitTable) && (!SmbiosEntry->Smbios64BitTable)) {

+        EfiReleaseLock (&Private->DataLock);

         return EFI_UNSUPPORTED;

       }

 

@@ -626,6 +755,8 @@ SmbiosUpdateString (
       ResizedSmbiosEntry->Signature    = EFI_SMBIOS_ENTRY_SIGNATURE;

       ResizedSmbiosEntry->RecordHeader = InternalRecord;

       ResizedSmbiosEntry->RecordSize   = NewEntrySize;

+      ResizedSmbiosEntry->Smbios32BitTable = SmbiosEntry->Smbios32BitTable;

+      ResizedSmbiosEntry->Smbios64BitTable = SmbiosEntry->Smbios64BitTable;

       InsertTailList (Link->ForwardLink, &ResizedSmbiosEntry->Link);

 

       //

@@ -639,7 +770,7 @@ SmbiosUpdateString (
       // configuration table, so other UEFI drivers can get SMBIOS table from

       // configuration table without depending on PI SMBIOS protocol.

       //

-      SmbiosTableConstruction ();

+      SmbiosTableConstruction (ResizedSmbiosEntry->Smbios32BitTable, ResizedSmbiosEntry->Smbios64BitTable);

       EfiReleaseLock (&Private->DataLock);

       return EFI_SUCCESS;

     }

@@ -702,7 +833,6 @@ SmbiosRemove (
       // Remove specified smobios record from DataList

       //

       RemoveEntryList(Link);

-      FreePool(SmbiosEntry);

       // 

       // Remove this handle from AllocatedHandleList

       //

@@ -721,7 +851,17 @@ SmbiosRemove (
       // configuration table, so other UEFI drivers can get SMBIOS table from

       // configuration table without depending on PI SMBIOS protocol.

       //

-      SmbiosTableConstruction ();

+      if (SmbiosEntry->Smbios32BitTable) {

+        DEBUG ((EFI_D_INFO, "SmbiosRemove: remove from 32-bit table\n"));

+      }

+      if (SmbiosEntry->Smbios64BitTable) {

+        DEBUG ((EFI_D_INFO, "SmbiosRemove: remove from 64-bit table\n"));

+      }

+      //

+      // Update the whole SMBIOS table again based on which table the removed SMBIOS record is in.

+      //

+      SmbiosTableConstruction (SmbiosEntry->Smbios32BitTable, SmbiosEntry->Smbios64BitTable);

+      FreePool(SmbiosEntry);

       EfiReleaseLock (&Private->DataLock);

       return EFI_SUCCESS;

     }

@@ -889,7 +1029,6 @@ GetNextSmbiosRecord (
   @param  TableEntryPointStructure   On exit, points to the SMBIOS entrypoint structure.

                                 

   @retval EFI_SUCCESS                Structure created sucessfully.

-  @retval EFI_NOT_READY              Some of The SMBIOS records was not available yet.

   @retval EFI_OUT_OF_RESOURCES       No enough memory.

   

 **/

@@ -913,6 +1052,45 @@ SmbiosCreateTable (
   Status            = EFI_SUCCESS;

   BufferPointer     = NULL;

 

+  if (EntryPointStructure == NULL) {

+    //

+    // Initialize the EntryPointStructure with initial values.

+    // It should be done only once.

+    // Allocate memory (below 4GB).

+    //

+    DEBUG ((EFI_D_INFO, "SmbiosCreateTable: Initialize 32-bit entry point structure\n"));

+    EntryPointStructureData.MajorVersion  = mPrivateData.Smbios.MajorVersion;

+    EntryPointStructureData.MinorVersion  = mPrivateData.Smbios.MinorVersion;

+    EntryPointStructureData.SmbiosBcdRevision = (UINT8) ((PcdGet16 (PcdSmbiosVersion) >> 4) & 0xf0) | (UINT8) (PcdGet16 (PcdSmbiosVersion) & 0x0f);

+    PhysicalAddress = 0xffffffff;

+    Status = gBS->AllocatePages (

+                    AllocateMaxAddress,

+                    EfiRuntimeServicesData,

+                    EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_ENTRY_POINT)),

+                    &PhysicalAddress

+                    );

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "SmbiosCreateTable () could not allocate EntryPointStructure < 4GB\n"));

+      Status = gBS->AllocatePages (

+                      AllocateAnyPages,

+                      EfiRuntimeServicesData,

+                      EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_ENTRY_POINT)),

+                      &PhysicalAddress

+                      );

+     if (EFI_ERROR (Status)) {

+        return EFI_OUT_OF_RESOURCES;

+      }

+    }

+    

+    EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) (UINTN) PhysicalAddress;

+    

+    CopyMem (

+      EntryPointStructure,

+      &EntryPointStructureData,

+      sizeof (SMBIOS_TABLE_ENTRY_POINT)

+      );

+  }

+

   //

   // Get Smbios protocol to traverse SMBIOS records.

   //

@@ -932,7 +1110,7 @@ SmbiosCreateTable (
   do {

     Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);

                                

-    if (Status == EFI_SUCCESS) {

+    if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios32BitTable)) {

       GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);

       //

       // Record NumberOfSmbiosStructures, TableLength and MaxStructureSize

@@ -962,12 +1140,13 @@ SmbiosCreateTable (
 

   if ((UINTN) EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength) > mPreAllocatedPages) {

     //

-    // If new SMBIOS talbe size exceeds the original pre-allocated page, 

+    // If new SMBIOS table size exceeds the previous allocated page, 

     // it is time to re-allocate memory (below 4GB).

     // 

+    DEBUG ((EFI_D_ERROR, "SmbiosCreateTable() re-allocate SMBIOS 32-bit table\n"));

     if (EntryPointStructure->TableAddress != 0) {

       //

-      // Free the original pre-allocated page

+      // Free the previous allocated page

       //      

       FreePages (

             (VOID*)(UINTN)EntryPointStructure->TableAddress,

@@ -1003,7 +1182,7 @@ SmbiosCreateTable (
   do {

     Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);

 

-    if (Status == EFI_SUCCESS) {

+    if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios32BitTable)) {

       GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);

       CopyMem (BufferPointer, SmbiosRecord, RecordSize);

       BufferPointer = BufferPointer + RecordSize;

@@ -1035,20 +1214,201 @@ SmbiosCreateTable (
 }

 

 /**

-  Create SMBIOS Table and install it to the System Table.

+  Assembles SMBIOS 64-bit table from the SMBIOS protocol. Produce Table

+  Entry Point and return the pointer to it.

+

+  @param  TableEntryPointStructure   On exit, points to the SMBIOS entrypoint structure.

+

+  @retval EFI_SUCCESS                Structure created sucessfully.

+  @retval EFI_OUT_OF_RESOURCES       No enough memory.

+

+**/

+EFI_STATUS

+EFIAPI

+SmbiosCreate64BitTable (

+  OUT VOID    **TableEntryPointStructure

+  )

+{

+  UINT8                           *BufferPointer;

+  UINTN                           RecordSize;

+  UINTN                           NumOfStr;

+  EFI_STATUS                      Status;

+  EFI_SMBIOS_HANDLE               SmbiosHandle;

+  EFI_SMBIOS_PROTOCOL             *SmbiosProtocol;

+  EFI_PHYSICAL_ADDRESS            PhysicalAddress;

+  EFI_SMBIOS_TABLE_HEADER         *SmbiosRecord;

+  EFI_SMBIOS_TABLE_END_STRUCTURE  EndStructure;

+  EFI_SMBIOS_ENTRY                *CurrentSmbiosEntry;

+  

+  Status            = EFI_SUCCESS;

+  BufferPointer     = NULL;

+

+  if (Smbios30EntryPointStructure == NULL) {

+    //

+    // Initialize the Smbios30EntryPointStructure with initial values.

+    // It should be done only once.

+    // Allocate memory at any address.

+    //

+    DEBUG ((EFI_D_INFO, "SmbiosCreateTable: Initialize 64-bit entry point structure\n"));

+    Smbios30EntryPointStructureData.MajorVersion  = mPrivateData.Smbios.MajorVersion;

+    Smbios30EntryPointStructureData.MinorVersion  = mPrivateData.Smbios.MinorVersion;

+    Smbios30EntryPointStructureData.DocRev        = PcdGet8 (PcdSmbiosDocRev);

+    Status = gBS->AllocatePages (

+                    AllocateAnyPages,

+                    EfiRuntimeServicesData,

+                    EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_3_0_ENTRY_POINT)),

+                    &PhysicalAddress

+                    );

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "SmbiosCreate64BitTable() could not allocate Smbios30EntryPointStructure\n"));

+      return EFI_OUT_OF_RESOURCES;

+    }

+    

+    Smbios30EntryPointStructure = (SMBIOS_TABLE_3_0_ENTRY_POINT *) (UINTN) PhysicalAddress;

+    

+    CopyMem (

+      Smbios30EntryPointStructure,

+      &Smbios30EntryPointStructureData,

+      sizeof (SMBIOS_TABLE_3_0_ENTRY_POINT)

+      );

+  }

+

+  //

+  // Get Smbios protocol to traverse SMBIOS records.

+  //

+  SmbiosProtocol = &mPrivateData.Smbios;

+  Smbios30EntryPointStructure->TableMaximumSize = 0;

+

+  //

+  // Calculate EPS Table Length

+  //

+  CurrentSmbiosEntry = NULL;

+  do {

+    Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);

+                               

+    if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios64BitTable)) {

+      GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);

+      //

+      // Record TableMaximumSize

+      //

+      Smbios30EntryPointStructure->TableMaximumSize = (UINT32) (Smbios30EntryPointStructure->TableMaximumSize + RecordSize);

+    }

+  } while (!EFI_ERROR(Status));

+

+  //

+  // Create End-Of-Table structure

+  //

+  GetMaxSmbiosHandle(SmbiosProtocol, &SmbiosHandle);

+  EndStructure.Header.Type = EFI_SMBIOS_TYPE_END_OF_TABLE;

+  EndStructure.Header.Length = (UINT8) sizeof (EFI_SMBIOS_TABLE_HEADER);

+  EndStructure.Header.Handle = SmbiosHandle;

+  EndStructure.Tailing[0] = 0;

+  EndStructure.Tailing[1] = 0;

+  Smbios30EntryPointStructure->TableMaximumSize = (UINT32) (Smbios30EntryPointStructure->TableMaximumSize + sizeof (EndStructure));

+

+  if ((UINTN) EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize) > mPre64BitAllocatedPages) {

+    //

+    // If new SMBIOS table size exceeds the previous allocated page, 

+    // it is time to re-allocate memory at anywhere.

+    //

+    DEBUG ((EFI_D_ERROR, "SmbiosCreate64BitTable() re-allocate SMBIOS 64-bit table\n"));

+    if (Smbios30EntryPointStructure->TableAddress != 0) {

+      //

+      // Free the previous allocated page

+      //      

+      FreePages (

+            (VOID*)(UINTN)Smbios30EntryPointStructure->TableAddress,

+            mPre64BitAllocatedPages

+            );

+      Smbios30EntryPointStructure->TableAddress = 0;

+      mPre64BitAllocatedPages = 0;

+    }

+

+    Status = gBS->AllocatePages (

+                    AllocateAnyPages,

+                    EfiRuntimeServicesData,

+                    EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize),

+                    &PhysicalAddress

+                    );

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "SmbiosCreateTable() could not allocate SMBIOS 64-bit table\n"));

+      Smbios30EntryPointStructure->TableAddress = 0;

+      return EFI_OUT_OF_RESOURCES;

+    } else {

+      Smbios30EntryPointStructure->TableAddress = PhysicalAddress;

+      mPre64BitAllocatedPages = EFI_SIZE_TO_PAGES (Smbios30EntryPointStructure->TableMaximumSize);

+    }

+  }

+

+  //

+  // Assemble the tables

+  //

+  ASSERT (Smbios30EntryPointStructure->TableAddress != 0);

+  BufferPointer = (UINT8 *) (UINTN) Smbios30EntryPointStructure->TableAddress;

+  CurrentSmbiosEntry = NULL;

+  do {

+    Status = GetNextSmbiosRecord (SmbiosProtocol, &CurrentSmbiosEntry, &SmbiosRecord);

+

+    if ((Status == EFI_SUCCESS) && (CurrentSmbiosEntry->Smbios64BitTable)) {

+      //

+      // This record can be added to 64-bit table

+      //

+      GetSmbiosStructureSize(SmbiosProtocol, SmbiosRecord, &RecordSize, &NumOfStr);

+      CopyMem (BufferPointer, SmbiosRecord, RecordSize);

+      BufferPointer = BufferPointer + RecordSize;

+    }

+  } while (!EFI_ERROR(Status));

+

+  //

+  // Assemble End-Of-Table structure

+  //

+  CopyMem (BufferPointer, &EndStructure, sizeof (EndStructure));

+

+  //

+  // Fixup checksums in the Entry Point Structure

+  //

+  Smbios30EntryPointStructure->EntryPointStructureChecksum = 0;

+  Smbios30EntryPointStructure->EntryPointStructureChecksum =

+    CalculateCheckSum8 ((UINT8 *) Smbios30EntryPointStructure, Smbios30EntryPointStructure->EntryPointLength);

+

+  //

+  // Returns the pointer

+  //

+  *TableEntryPointStructure = Smbios30EntryPointStructure;

+

+  return EFI_SUCCESS;

+}

+

+/**

+  Create Smbios Table and installs the Smbios Table to the System Table.

+  

+  @param  Smbios32BitTable    The flag to update 32-bit table.

+  @param  Smbios64BitTable    The flag to update 64-bit table.

+

 **/

 VOID

 EFIAPI

 SmbiosTableConstruction (

-  VOID

+  BOOLEAN     Smbios32BitTable,

+  BOOLEAN     Smbios64BitTable

   )

 {

   UINT8       *Eps;

+  UINT8       *Eps64Bit;

   EFI_STATUS  Status;

 

-  Status = SmbiosCreateTable ((VOID **) &Eps);

-  if (!EFI_ERROR (Status)) {

-    gBS->InstallConfigurationTable (&gEfiSmbiosTableGuid, Eps);

+  if (Smbios32BitTable) {

+    Status = SmbiosCreateTable ((VOID **) &Eps);

+    if (!EFI_ERROR (Status)) {

+      gBS->InstallConfigurationTable (&gEfiSmbiosTableGuid, Eps);

+    }

+  }

+

+  if (Smbios64BitTable) {

+    Status = SmbiosCreate64BitTable ((VOID **) &Eps64Bit);

+    if (!EFI_ERROR (Status)) {

+      gBS->InstallConfigurationTable (&gEfiSmbios3TableGuid, Eps64Bit);

+    }

   }

 }

 

@@ -1071,7 +1431,6 @@ SmbiosDriverEntryPoint (
   )

 {

   EFI_STATUS            Status;

-  EFI_PHYSICAL_ADDRESS  PhysicalAddress;

 

   mPrivateData.Signature                = SMBIOS_INSTANCE_SIGNATURE;

   mPrivateData.Smbios.Add               = SmbiosAdd;

@@ -1080,72 +1439,10 @@ SmbiosDriverEntryPoint (
   mPrivateData.Smbios.GetNext           = SmbiosGetNext;

   mPrivateData.Smbios.MajorVersion      = (UINT8) (PcdGet16 (PcdSmbiosVersion) >> 8);

   mPrivateData.Smbios.MinorVersion      = (UINT8) (PcdGet16 (PcdSmbiosVersion) & 0x00ff);

-  EntryPointStructureData.MajorVersion  = mPrivateData.Smbios.MajorVersion;

-  EntryPointStructureData.MinorVersion  = mPrivateData.Smbios.MinorVersion;

-  EntryPointStructureData.SmbiosBcdRevision = (UINT8) ((PcdGet16 (PcdSmbiosVersion) >> 4) & 0xf0) | (UINT8) (PcdGet16 (PcdSmbiosVersion) & 0x0f);

 

   InitializeListHead (&mPrivateData.DataListHead);

   InitializeListHead (&mPrivateData.AllocatedHandleListHead);

   EfiInitializeLock (&mPrivateData.DataLock, TPL_NOTIFY);

-

-  //

-  // Initialize the EntryPointStructure with initial values.

-  // Allocate memory (below 4GB).

-  //

-  PhysicalAddress = 0xffffffff;

-  Status = gBS->AllocatePages (

-                  AllocateMaxAddress,

-                  EfiRuntimeServicesData,

-                  EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_ENTRY_POINT)),

-                  &PhysicalAddress

-                  );

-  if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "SmbiosDriverEntryPoint() could not allocate EntryPointStructure < 4GB\n"));

-    Status = gBS->AllocatePages (

-                    AllocateAnyPages,

-                    EfiRuntimeServicesData,

-                    EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_ENTRY_POINT)),

-                    &PhysicalAddress

-                    );

-   if (EFI_ERROR (Status)) {   

-      return EFI_OUT_OF_RESOURCES;

-    }

-  }

-

-  EntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) (UINTN) PhysicalAddress;

-  

-  CopyMem (

-    EntryPointStructure,

-    &EntryPointStructureData,

-    sizeof (SMBIOS_TABLE_ENTRY_POINT)

-    );

-

-  //

-  // Pre-allocate 1 page for SMBIOS table below 4GB.

-  // SMBIOS table will be updated when new SMBIOS type is added or 

-  // existing SMBIOS type is updated. If the total size of SMBIOS table exceeds 1 page,

-  // we will re-allocate new memory when creating whole SMBIOS table.

-  //

-  PhysicalAddress = 0xffffffff;

-  Status = gBS->AllocatePages (

-                  AllocateMaxAddress,

-                  EfiRuntimeServicesData,

-                  1,

-                  &PhysicalAddress

-                  );

-  if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "SmbiosDriverEntryPoint() could not allocate SMBIOS table < 4GB\n"));

-    EntryPointStructure->TableAddress = 0;

-  } else {

-    EntryPointStructure->TableAddress = (UINT32) PhysicalAddress;

-    mPreAllocatedPages = 1;

-  }

-

-  //

-  // Init TableLength to the length of End-Of-Table structure for SmbiosAdd() called at the first time

-  // to check the TableLength limitation.

-  //

-  EntryPointStructure->TableLength  = sizeof (EFI_SMBIOS_TABLE_END_STRUCTURE);

   

   //

   // Make a new handle and install the protocol

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
index e81b543672..f87c8de8ca 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
@@ -1,7 +1,7 @@
 /** @file

   This code supports the implementation of the Smbios protocol

   

-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 2015, Intel Corporation. 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        

@@ -38,6 +38,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 #define SMBIOS_TABLE_MAX_LENGTH 0xFFFF

 

+//

+// For SMBIOS 3.0, Structure table maximum size in Entry Point structure is DWORD field limited to 0xFFFFFFFF bytes.

+//

+#define SMBIOS_3_0_TABLE_MAX_LENGTH 0xFFFFFFFF

+

 #define SMBIOS_INSTANCE_SIGNATURE SIGNATURE_32 ('S', 'B', 'i', 's')

 typedef struct {

   UINT32                Signature;

@@ -89,6 +94,11 @@ typedef struct {
   LIST_ENTRY                Link;

   EFI_SMBIOS_RECORD_HEADER  *RecordHeader;

   UINTN                     RecordSize;

+  //

+  // Indicate which table this record is added to.

+  //

+  BOOLEAN                   Smbios32BitTable;

+  BOOLEAN                   Smbios64BitTable;

 } EFI_SMBIOS_ENTRY;

 

 #define SMBIOS_ENTRY_FROM_LINK(link)  CR (link, EFI_SMBIOS_ENTRY, Link, EFI_SMBIOS_ENTRY_SIGNATURE)

@@ -117,11 +127,16 @@ typedef struct {
 

 /**

   Create Smbios Table and installs the Smbios Table to the System Table.

+  

+  @param  Smbios32BitTable    The flag to update 32-bit table.

+  @param  Smbios64BitTable    The flag to update 64-bit table.

+  

 **/

 VOID

 EFIAPI

 SmbiosTableConstruction (

-  VOID

+  BOOLEAN     Smbios32BitTable,

+  BOOLEAN     Smbios64BitTable

   );

 

 #endif

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
index 4e48bfc3ef..cabc9d7791 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 # This driver initializes and installs the SMBIOS protocol, constructs SMBIOS table into system configuration table.

 #

-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -51,10 +51,13 @@
   gEfiSmbiosProtocolGuid                            ## PRODUCES

   

 [Guids]

-  gEfiSmbiosTableGuid                               ## PRODUCES ## SystemTable

+  gEfiSmbiosTableGuid                               ## SOMETIMES_PRODUCES ## SystemTable

+  gEfiSmbios3TableGuid                              ## SOMETIMES_PRODUCES ## SystemTable

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion   ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev    ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod   ## CONSUMES

 

 [Depex]

   TRUE