Create PCDs in MdeModulePkg for ACPI table OEM_ID/OEM_TABLE_ID/OEM_REVISION/CREATOR_ID/CREATOR_REVISION customization.

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

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

6 files changed, 31 insertions, 8 deletions

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 6779230917..4f3568ba84 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -8,7 +8,7 @@ buffer overflow, integer overflow.
 

 TcgDxePassThroughToTpm() will receive untrusted input and do basic validation.

 

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

+Copyright (c) 2005 - 2013, 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 

@@ -1177,6 +1177,7 @@ InstallAcpiTable (
   EFI_STATUS                        Status;

   EFI_ACPI_TABLE_PROTOCOL           *AcpiTable;

   UINT8                             Checksum;

+  UINT64                            OemTableId;

 

   Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **)&AcpiTable);

   if (EFI_ERROR (Status)) {

@@ -1184,7 +1185,12 @@ InstallAcpiTable (
   }

 

   if (PcdGet8 (PcdTpmPlatformClass) == TCG_PLATFORM_TYPE_CLIENT) {

- 

+    CopyMem (mTcgClientAcpiTemplate.Header.OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (mTcgClientAcpiTemplate.Header.OemId));

+    OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);

+    CopyMem (&mTcgClientAcpiTemplate.Header.OemTableId, &OemTableId, sizeof (UINT64));

+    mTcgClientAcpiTemplate.Header.OemRevision      = PcdGet32 (PcdAcpiDefaultOemRevision);

+    mTcgClientAcpiTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);

+    mTcgClientAcpiTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);

     //

     // The ACPI table must be checksumed before calling the InstallAcpiTable() 

     // service of the ACPI table protocol to install it.

@@ -1199,7 +1205,12 @@ InstallAcpiTable (
                             &TableKey

                             );

   } else {

-

+    CopyMem (mTcgServerAcpiTemplate.Header.OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (mTcgServerAcpiTemplate.Header.OemId));

+    OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);

+    CopyMem (&mTcgServerAcpiTemplate.Header.OemTableId, &OemTableId, sizeof (UINT64));

+    mTcgServerAcpiTemplate.Header.OemRevision      = PcdGet32 (PcdAcpiDefaultOemRevision);

+    mTcgServerAcpiTemplate.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);

+    mTcgServerAcpiTemplate.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);

     //

     // The ACPI table must be checksumed before calling the InstallAcpiTable() 

     // service of the ACPI table protocol to install it.

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
index ba53d328d6..6d5febf962 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
@@ -2,7 +2,7 @@
 #  Component file for module TcgDxe.

 #  This module will produce TCG protocol and measure boot environment.

 #

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

+# Copyright (c) 2006 - 2013, 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

@@ -49,6 +49,7 @@
   TpmCommLib

   PrintLib

   UefiLib

+  PcdLib

 

 [Guids]

   gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED

@@ -66,6 +67,11 @@
 

 [Pcd]

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision

 

 [Depex]

   TRUE

diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.c b/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
index 97cd916d07..06df822e99 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.c
@@ -339,6 +339,7 @@ PublishAcpiTable (
 

 

   ASSERT (Table->OemTableId == SIGNATURE_64 ('T', 'c', 'g', 'T', 'a', 'b', 'l', 'e'));

+  CopyMem (Table->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (Table->OemId) );

   mTcgNvs = AssignOpRegion (Table, SIGNATURE_32 ('T', 'N', 'V', 'S'), (UINT16) sizeof (TCG_NVS));

   ASSERT (mTcgNvs != NULL);

 

diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h b/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
index b03e49d6c9..582b18214d 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
@@ -1,7 +1,7 @@
 /** @file

   The header file for TCG SMM driver.

   

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

+Copyright (c) 2012 - 2013, 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 

@@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/DxeServicesLib.h>

 #include <Library/TpmMeasurementLib.h>

+#include <Library/PcdLib.h>

 

 #pragma pack(1)

 typedef struct {

diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
index ff20a43193..075f298f53 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
@@ -7,7 +7,7 @@
 #  This driver will have external input - variable and ACPINvs data in SMM mode.

 #  This external input must be validated carefully to avoid security issue.

 #

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

+# Copyright (c) 2011 - 2013, 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

@@ -45,6 +45,7 @@
   DebugLib

   DxeServicesLib

   TpmMeasurementLib

+  PcdLib

 

 [Guids]

   gEfiPhysicalPresenceGuid

@@ -55,6 +56,9 @@
   gEfiSmmVariableProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

 

+[Pcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId

+

 [Depex]

   gEfiAcpiTableProtocolGuid AND

   gEfiSmmSwDispatch2ProtocolGuid AND

diff --git a/SecurityPkg/Tcg/TcgSmm/Tpm.asl b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
index 6dafa0277d..b90288f4ae 100644
--- a/SecurityPkg/Tcg/TcgSmm/Tpm.asl
+++ b/SecurityPkg/Tcg/TcgSmm/Tpm.asl
@@ -2,7 +2,7 @@
   The TPM definition block in ACPI table for physical presence  

   and MemoryClear.

 

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

+Copyright (c) 2011 - 2013, 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 

@@ -17,7 +17,7 @@ DefinitionBlock (
   "Tpm.aml",

   "SSDT",

   1,

-  "Intel_",

+  "INTEL ",

   "TcgTable",

   0x1000

   )