SecurityPkg: INF/DEC file updates to EDK II packages

1. Usage information in INF file comment blocks are either incomplete or incorrect.  
This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes.  
The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dong, Guo <guo.dong@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>

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

11 files changed, 247 insertions, 135 deletions

diff --git a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
index 1aa296b47c..78e3f9b1cd 100644
--- a/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
+++ b/SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
@@ -1,7 +1,9 @@
 ## @file

-#  Component description file for Memory Overwrite Control driver.

+#  Initilizes MemoryOverwriteRequestControl variable

 #

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

+#  This module will clear MOR_CLEAR_MEMORY_BIT bit if it is set.

+#

+# Copyright (c) 2009 - 2014, 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

@@ -14,6 +16,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TcgMor

+  MODULE_UNI_FILE                = TcgMor.uni

   FILE_GUID                      = AD416CE3-A483-45b1-94C2-4B4E4D575562

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -42,10 +45,13 @@
   UefiLib

 

 [Guids]

-  gEfiMemoryOverwriteControlDataGuid            # GUID ALWAYS_CONSUMED

+  ## SOMETIMES_CONSUMES      ## Variable:L"MemoryOverwriteRequestControl"

+  ## PRODUCES                ## Variable:L"MemoryOverwriteRequestControl"

+  gEfiMemoryOverwriteControlDataGuid

 

 [Depex]

   gEfiVariableArchProtocolGuid AND

-  gEfiVariableWriteArchProtocolGuid AND

-  ( gEfiTcgProtocolGuid OR gEfiTrEEProtocolGuid )

+  gEfiVariableWriteArchProtocolGuid

 

+[UserExtensions.TianoCore."ExtraFiles"]

+  TcgMorExtra.uni

diff --git a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
index da4e032299..cac1abea34 100644
--- a/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
+++ b/SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
@@ -1,7 +1,11 @@
 ## @file

-#  Component description file for physical presence PEI module.

+#  Produces a PPI to indicate whether to lock TPM in PEI phase

 #

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

+#  This module produces PEI_LOCK_PHYSICAL_PRESENCE_PPI to indicate whether

+#  TPM physical presence needs to be locked. It can be replaced by a 

+#  platform specific module.

+#

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

@@ -15,6 +19,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = PhysicalPresencePei

+  MODULE_UNI_FILE                = PhysicalPresencePei.uni

   FILE_GUID                      = 4FE772E8-FE3E-4086-B638-8C493C490488

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

@@ -40,16 +45,20 @@
   PeiServicesLib

 

 [Ppis]

-  gPeiLockPhysicalPresencePpiGuid

-  gEfiPeiReadOnlyVariable2PpiGuid

+  gPeiLockPhysicalPresencePpiGuid                       ## PRODUCES

+  gEfiPeiReadOnlyVariable2PpiGuid                       ## CONSUMES

 

 [Guids]

-  gEfiPhysicalPresenceGuid

+  gEfiPhysicalPresenceGuid                              ## SOMETIMES_CONSUMES    ## Variable:L"PhysicalPresence"

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence  ## SOMETIMES_CONSUMES

 

 [Depex] 

   gEfiPeiMemoryDiscoveredPpiGuid AND

   gEfiPeiReadOnlyVariable2PpiGuid AND

   gPeiTpmInitializedPpiGuid

+

+[UserExtensions.TianoCore."ExtraFiles"]

+  PhysicalPresencePeiExtra.uni

+  
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
index ba62017413..bd655c8870 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
@@ -1,5 +1,6 @@
 ## @file

-#  Component name for Tcg configuration module.

+#  Provides the capability to update TPM state setup browser

+#  By this module, user may enable/disable/activate/deactivate/clear TPM, etc.

 #

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

 # This program and the accompanying materials

@@ -14,6 +15,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TcgConfigDxe

+  MODULE_UNI_FILE                = TcgConfigDxe.uni

   FILE_GUID                      = 1FA4DAFE-FA5D-4d75-BEA6-5863862C520A

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -53,21 +55,29 @@
   TpmCommLib

 

 [Guids]

+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"

+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"

   gEfiPhysicalPresenceGuid

-  gEfiIfrTianoGuid

+  

+  gEfiIfrTianoGuid                                    ## SOMETIMES_PRODUCES  ## GUID       # HII opcode

+  ## PRODUCES            ## HII

+  ## CONSUMES            ## HII

   gTcgConfigFormSetGuid

-  gEfiTpmDeviceInstanceTpm12Guid

+  gEfiTpmDeviceInstanceTpm12Guid                      ## CONSUMES     ## GUID       # TPM device identifier

 

 [Protocols]

-  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES

-  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES

-  gEfiTcgProtocolGuid                           ## CONSUMES

+  gEfiHiiConfigAccessProtocolGuid                     ## PRODUCES

+  gEfiDevicePathProtocolGuid                          ## PRODUCES

+  gEfiTcgProtocolGuid                                 ## CONSUMES

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid    ## CONSUMES

 

 [Depex]

   gEfiHiiConfigRoutingProtocolGuid  AND

   gEfiHiiDatabaseProtocolGuid       AND

   gEfiVariableArchProtocolGuid      AND

-  gEfiVariableWriteArchProtocolGuid
\ No newline at end of file
+  gEfiVariableWriteArchProtocolGuid

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  TcgConfigDxeExtra.uni

diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
index 40984291f8..6cb49124a8 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
@@ -1,8 +1,8 @@
 ## @file

-#  Component file for module TcgDxe.

+#  Produces TCG protocol and measures boot environment

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

 #

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

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

@@ -15,6 +15,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TcgDxe

+  MODULE_UNI_FILE                = TcgDxe.uni

   FILE_GUID                      = A5683620-7998-4bb2-A377-1C1E31E1E215

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -52,29 +53,33 @@
   PcdLib

 

 [Guids]

-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED

-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED

-  gTcgEventEntryHobGuid

-  gEfiEventReadyToBootGuid

-  gEfiEventExitBootServicesGuid

-  gEventExitBootServicesFailedGuid              # ALWAYS_CONSUMED

-  gEfiTpmDeviceInstanceTpm12Guid

+  ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table

+  ## SOMETIMES_CONSUMES     ## GUID                  # Handoff Table for measurement.

+  gEfiSmbiosTableGuid

+  

+  gEfiGlobalVariableGuid                             ## SOMETIMES_CONSUMES  ## Variable:L"BootXXXX"

+  gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB

+  gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event

+  gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event

+  gEfiTpmDeviceInstanceTpm12Guid                     ## PRODUCES            ## GUID       # TPM device identifier

 

 [Protocols]

-  gEfiTcgProtocolGuid                           ## PRODUCES

-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

-  gEfiMpServiceProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

-

+  gEfiTcgProtocolGuid                                ## PRODUCES

+  gEfiAcpiTableProtocolGuid                          ## NOTIFY

+  gEfiMpServiceProtocolGuid                          ## SOMETIMES_CONSUMES

+  

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass              ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid               ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId             ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId        ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision       ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId         ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision   ## SOMETIMES_CONSUMES

 

 [Depex]

   TRUE

 

+[UserExtensions.TianoCore."ExtraFiles"]

+  TcgDxeExtra.uni

+  
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index d05a5b7b43..c68c9056cf 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -1,5 +1,8 @@
 ## @file

-#  This module will initialize TPM device and measure FVs in PEI phase.

+#  Initializes TPM device and measures FVs in PEI phase

+#

+#  This module will initialize TPM device, measure reported FVs and BIOS version.

+#  This module may also lock TPM physical presence and physicalPresenceLifetimeLock.

 #

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

 # This program and the accompanying materials

@@ -14,6 +17,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TcgPei

+  MODULE_UNI_FILE                = TcgPei.uni

   FILE_GUID                      = 2BE1E4A6-6505-43b3-9FFC-A3C8330E0432

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

@@ -24,6 +28,9 @@
 #

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

+# [BootMode]

+#   S3_RESUME                 ## SOMETIMES_CONSUMES

+#

 

 [Sources]

   TcgPei.c

@@ -51,29 +58,33 @@
   MemoryAllocationLib

 

 [Guids]

-  gTcgEventEntryHobGuid

-  gMeasuredFvHobGuid

-  gEfiTpmDeviceInstanceTpm12Guid

+  gTcgEventEntryHobGuid                                               ## PRODUCES               ## HOB

+  gMeasuredFvHobGuid                                                  ## PRODUCES               ## HOB

+  gEfiTpmDeviceInstanceTpm12Guid                                      ## PRODUCES               ## GUID       # TPM device identifier

 

 [Ppis]

-  gPeiLockPhysicalPresencePpiGuid

-  gEfiPeiFirmwareVolumeInfoPpiGuid

-  gEfiPeiFirmwareVolumeInfo2PpiGuid

-  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid

-  gPeiTpmInitializedPpiGuid

-  gEfiEndOfPeiSignalPpiGuid

+  gPeiLockPhysicalPresencePpiGuid                                     ## SOMETIMES_CONSUMES     ## NOTIFY

+  gEfiPeiFirmwareVolumeInfoPpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY

+  gEfiPeiFirmwareVolumeInfo2PpiGuid                                   ## SOMETIMES_CONSUMES     ## NOTIFY

+  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                 ## SOMETIMES_CONSUMES

+  gPeiTpmInitializedPpiGuid                                           ## PRODUCES

+  gEfiEndOfPeiSignalPpiGuid                                           ## SOMETIMES_CONSUMES     ## NOTIFY

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock

-  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable

-  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy

+  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock       ## SOMETIMES_CONSUMES 

+  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable          ## SOMETIMES_CONSUMES 

+  gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable           ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                    ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy            ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy                     ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES

 

 [Depex]

   gEfiPeiMasterBootModePpiGuid AND

   gEfiPeiReadOnlyVariable2PpiGuid AND

   gEfiTpmDeviceSelectedGuid

+

+[UserExtensions.TianoCore."ExtraFiles"]

+  TcgPeiExtra.uni

+  
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
index 5a862b41b2..f39e089bed 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
@@ -1,13 +1,15 @@
 ## @file

-#  This driver implements TPM definition block in ACPI table and 

-#  registers SMI callback functions for physical presence and 

-#  MemoryClear to handle the requests from ACPI method.

+#  Implements ACPI metholds for the TCG feature

+#

+#  This driver implements TPM definition block in ACPI table and registers SMI 

+#  callback functions for physical presence and MemoryClear to handle the requests 

+#  from ACPI method.

 #

 #  Caution: This module requires additional review when modified.

 #  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 - 2013, Intel Corporation. All rights reserved.<BR>

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

@@ -20,6 +22,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TcgSmm

+  MODULE_UNI_FILE                = TcgSmm.uni

   FILE_GUID                      = 42293093-76B9-4482-8C02-3BEFDEA9B35D

   MODULE_TYPE                    = DXE_SMM_DRIVER

   PI_SPECIFICATION_VERSION       = 0x0001000A

@@ -48,21 +51,32 @@
   PcdLib

 

 [Guids]

+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"

+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"

+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"

   gEfiPhysicalPresenceGuid

+

+  ## SOMETIMES_PRODUCES ## Variable:L"MemoryOverwriteRequestControl"

+  ## SOMETIMES_CONSUMES ## Variable:L"MemoryOverwriteRequestControl"

   gEfiMemoryOverwriteControlDataGuid

-  gEfiTpmDeviceInstanceTpm12Guid

+  

+  gEfiTpmDeviceInstanceTpm12Guid                        ## PRODUCES           ## GUID       # TPM device identifier

 

 [Protocols]

-  gEfiSmmSwDispatch2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiSmmVariableProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

+  gEfiSmmSwDispatch2ProtocolGuid                        ## CONSUMES

+  gEfiSmmVariableProtocolGuid                           ## CONSUMES

+  gEfiAcpiTableProtocolGuid                             ## CONSUMES

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid      ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId    ## SOMETIMES_CONSUMES

 

 [Depex]

   gEfiAcpiTableProtocolGuid AND

   gEfiSmmSwDispatch2ProtocolGuid AND

   gEfiSmmVariableProtocolGuid AND

-  gEfiTcgProtocolGuid
\ No newline at end of file
+  gEfiTcgProtocolGuid

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  TcgSmmExtra.uni

+  
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
index 042ad878d6..9935e40497 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf
@@ -1,8 +1,10 @@
 ## @file

-#  Component name for TrEE configuration module.

+#  TPM device configuration for TPM 2.0

+#  

+#  By this module, user may select TPM device, clear TPM state, etc.

 #  NOTE: This module is only for reference only, each platform should have its own setup page.

 #

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

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

@@ -15,6 +17,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TrEEConfigDxe

+  MODULE_UNI_FILE                = TrEEConfigDxe.uni

   FILE_GUID                      = 3141FD4D-EA02-4a70-9BCE-97EE837319AC

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -52,24 +55,34 @@
   PcdLib

   PrintLib

   Tpm2DeviceLib

-  Tpm12DeviceLib

   Tpm2CommandLib

 

 [Guids]

+  ## SOMETIMES_PRODUCES ## Variable:L"TrEEPhysicalPresence"

+  ## SOMETIMES_CONSUMES ## Variable:L"TrEEPhysicalPresence"

   gEfiTrEEPhysicalPresenceGuid

+  

+  ## PRODUCES           ## HII

+  ## SOMETIMES_PRODUCES ## Variable:L"TREE_CONFIGURATION"

+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_CONFIGURATION"

+  ## PRODUCES           ## Variable:L"TREE_DEVICE_DETECTION"

+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"

   gTrEEConfigFormSetGuid

 

 [Protocols]

   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES

-  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES

+  gEfiDevicePathProtocolGuid                    ## PRODUCES

   gEdkiiVariableLockProtocolGuid                ## CONSUMES

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid            ## CONSUMES

 

 [Depex]

   gEfiTrEEProtocolGuid              AND

   gEfiHiiConfigRoutingProtocolGuid  AND

   gEfiHiiDatabaseProtocolGuid       AND

   gEfiVariableArchProtocolGuid      AND

-  gEfiVariableWriteArchProtocolGuid
\ No newline at end of file
+  gEfiVariableWriteArchProtocolGuid

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  TrEEConfigDxeExtra.uni
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
index c3a8435391..31807cb06e 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
@@ -1,5 +1,7 @@
 ## @file

-#  Component name for TrEE configuration module.

+#  Set TPM device type

+#

+#  This module initializes TPM device type based on variable and detection.

 #  NOTE: This module is only for reference only, each platform should have its own setup page.

 #

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

@@ -15,6 +17,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TrEEConfigPei

+  MODULE_UNI_FILE                = TrEEConfigPei.uni

   FILE_GUID                      = A5C1EF72-9379-4370-B4C7-0F5126CAC38E

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

@@ -23,6 +26,9 @@
 #

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

+# [BootMode]

+#   S3_RESUME                 ## SOMETIMES_CONSUMES

+#

 

 [Sources]

   TrEEConfigPeim.c

@@ -48,19 +54,23 @@
   Tpm12DeviceLib

 

 [Guids]

-  gEfiTrEEPhysicalPresenceGuid

+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_CONFIGURATION"

+  ## SOMETIMES_CONSUMES ## Variable:L"TREE_DEVICE_DETECTION"

   gTrEEConfigFormSetGuid

-  gEfiTpmDeviceSelectedGuid

+  gEfiTpmDeviceSelectedGuid           ## PRODUCES             ## GUID    # Used as a PPI GUID

 

 [Ppis]

-  gEfiPeiReadOnlyVariable2PpiGuid

+  gEfiPeiReadOnlyVariable2PpiGuid     ## CONSUMES

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                 ## PRODUCES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy         ## PRODUCES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection                ## CONSUMES 

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress                  ## SOMETIMES_CONSUMES

 

 [Depex]

   gEfiPeiMasterBootModePpiGuid AND

-  gEfiPeiReadOnlyVariable2PpiGuid
\ No newline at end of file
+  gEfiPeiReadOnlyVariable2PpiGuid

+  

+[UserExtensions.TianoCore."ExtraFiles"]

+  TrEEConfigPeiExtra.uni
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
index a1f174192b..ef8505cf39 100644
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
@@ -1,5 +1,5 @@
 ## @file

-#  Component file for module TrEEDxe.

+#  Produces TrEE protocol and measure boot environment

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

 #

 #  Caution: This module requires additional review when modified.

@@ -7,7 +7,7 @@
 #  This external input must be validated carefully to avoid security issue like

 #  buffer overflow, integer overflow.

 #

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

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

@@ -20,6 +20,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TrEEDxe

+  MODULE_UNI_FILE                = TrEEDxe.uni

   FILE_GUID                      = 2A7946E3-1AB2-49a9-ACCB-C6275139C1A5

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -58,34 +59,45 @@
   PerformanceLib

 

 [Guids]

-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED

-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED

-  gTcgEventEntryHobGuid

-  gEfiEventReadyToBootGuid

-  gEfiEventExitBootServicesGuid

-  gEventExitBootServicesFailedGuid              # ALWAYS_CONSUMED

+  ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table

+  ## SOMETIMES_CONSUMES     ## GUID                  # Handoff Table for measurement.

+  gEfiSmbiosTableGuid

+  

+  ## SOMETIMES_CONSUMES     ## Variable:L"SecureBoot"

+  ## SOMETIMES_CONSUMES     ## Variable:L"PK"

+  ## SOMETIMES_CONSUMES     ## Variable:L"KEK"

+  ## SOMETIMES_CONSUMES     ## Variable:L"BootXXXX"

+  gEfiGlobalVariableGuid

+

+  ## SOMETIMES_CONSUMES      ## Variable:L"db"

+  ## SOMETIMES_CONSUMES      ## Variable:L"dbx"

   gEfiImageSecurityDatabaseGuid

-  gEfiTpmDeviceInstanceNoneGuid

-  gEfiTpmDeviceInstanceTpm12Guid

+    

+  gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB

+  gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event

+  gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event

+  gEfiTpmDeviceInstanceNoneGuid                      ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier

+  gEfiTpmDeviceInstanceTpm12Guid                     ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier

 

 [Protocols]

-  gEfiTrEEProtocolGuid                          ## PRODUCES

-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

-  gEfiMpServiceProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED

+  gEfiTrEEProtocolGuid                               ## PRODUCES

+  gEfiAcpiTableProtocolGuid                          ## NOTIFY

+  gEfiMpServiceProtocolGuid                          ## SOMETIMES_CONSUMES

+  gEfiVariableWriteArchProtocolGuid                  ## NOTIFY

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass

-  gEfiSecurityPkgTokenSpaceGuid.PcdFirmwareDebuggerInitialized

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass                         ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdFirmwareDebuggerInitialized              ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                          ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress                           ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId                        ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId                   ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision                  ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId                    ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision              ## SOMETIMES_CONSUMES

 

 [Depex]

   TRUE

 

+[UserExtensions.TianoCore."ExtraFiles"]

+  TrEEDxeExtra.uni

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index cf53ad124d..faa9fb33b0 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
@@ -1,5 +1,7 @@
 ## @file

-#  This module will initialize TPM2 device and measure FVs in PEI phase.

+#  Initializes TPM 2.0 device and measure FVs in PEI phase

+#

+#  This module will initialize TPM device, measure reported FVs and BIOS version.

 #

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

 # This program and the accompanying materials

@@ -14,6 +16,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TrEEPei

+  MODULE_UNI_FILE                = TrEEPei.uni

   FILE_GUID                      = CA5A1928-6523-409d-A9FE-5DCC87387222

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

@@ -24,6 +27,9 @@
 #

 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

+# [BootMode]

+#   S3_RESUME                 ## SOMETIMES_CONSUMES

+#

 

 [Sources]

   TrEEPei.c

@@ -47,27 +53,30 @@
   MemoryAllocationLib

 

 [Guids]

-  gTcgEventEntryHobGuid

-  gMeasuredFvHobGuid

-  gEfiTpmDeviceInstanceNoneGuid

-  gEfiTpmDeviceInstanceTpm12Guid

+  gTcgEventEntryHobGuid                                                ## PRODUCES               ## HOB

+  gMeasuredFvHobGuid                                                   ## PRODUCES               ## HOB

+  gEfiTpmDeviceInstanceNoneGuid                                        ## SOMETIMES_PRODUCES     ## GUID       # TPM device identifier

+  gEfiTpmDeviceInstanceTpm12Guid                                       ## SOMETIMES_PRODUCES     ## GUID       # TPM device identifier

 

 [Ppis]

-  gEfiPeiFirmwareVolumeInfoPpiGuid

-  gEfiPeiFirmwareVolumeInfo2PpiGuid

-  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid

-  gPeiTpmInitializedPpiGuid

-  gEfiEndOfPeiSignalPpiGuid

+  gEfiPeiFirmwareVolumeInfoPpiGuid                                     ## SOMETIMES_CONSUMES     ## NOTIFY

+  gEfiPeiFirmwareVolumeInfo2PpiGuid                                    ## SOMETIMES_CONSUMES     ## NOTIFY

+  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid                  ## SOMETIMES_CONSUMES

+  gPeiTpmInitializedPpiGuid                                            ## PRODUCES

+  gEfiEndOfPeiSignalPpiGuid                                            ## SOMETIMES_CONSUMES     ## NOTIFY

 

 [Pcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString              ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                     ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy            ## CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy                  ## SOMETIMES_CONSUMES

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy                     ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported              ## CONSUMES

 

 [Depex]

   gEfiPeiMasterBootModePpiGuid AND

   gEfiPeiReadOnlyVariable2PpiGuid AND

   gEfiTpmDeviceSelectedGuid

+

+[UserExtensions.TianoCore."ExtraFiles"]

+  TrEEPeiExtra.uni
\ No newline at end of file
diff --git a/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf b/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
index bb251d423a..0436ba5c51 100644
--- a/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
+++ b/SecurityPkg/Tcg/TrEESmm/TrEESmm.inf
@@ -1,5 +1,7 @@
 ## @file

-#  This driver implements TPM2 definition block in ACPI table and 

+#  Provides ACPI metholds for TPM 2.0 support

+#

+#  This driver implements TPM 2.0 definition block in ACPI table and 

 #  registers SMI callback functions for TrEE physical presence and 

 #  MemoryClear to handle the requests from ACPI method.

 #

@@ -7,7 +9,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) 2013, Intel Corporation. All rights reserved.<BR>

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

@@ -20,6 +22,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = TrEESmm

+  MODULE_UNI_FILE                = TrEESmm.uni

   FILE_GUID                      = 114B7105-6CC9-453c-BADC-16DF227BB4EF

   MODULE_TYPE                    = DXE_SMM_DRIVER

   PI_SPECIFICATION_VERSION       = 0x0001000A

@@ -48,24 +51,34 @@
   Tpm2DeviceLib

 

 [Guids]

+  ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"

+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresence"

+  ## SOMETIMES_CONSUMES ## Variable:L"PhysicalPresenceFlags"

   gEfiTrEEPhysicalPresenceGuid

+

+  ## SOMETIMES_PRODUCES ## Variable:L"MemoryOverwriteRequestControl"

+  ## SOMETIMES_CONSUMES ## Variable:L"MemoryOverwriteRequestControl"  

   gEfiMemoryOverwriteControlDataGuid

-  gEfiTpmDeviceInstanceTpm20DtpmGuid

+  

+  gEfiTpmDeviceInstanceTpm20DtpmGuid                            ## PRODUCES           ## GUID       # TPM device identifier

 

 [Protocols]

-  gEfiSmmSwDispatch2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiSmmVariableProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

+  gEfiSmmSwDispatch2ProtocolGuid                                ## CONSUMES

+  gEfiSmmVariableProtocolGuid                                   ## CONSUMES

+  gEfiAcpiTableProtocolGuid                                     ## CONSUMES

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId

-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid              ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId            ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId       ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision      ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId        ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision  ## SOMETIMES_CONSUMES

 

 [Depex]

   gEfiAcpiTableProtocolGuid AND

   gEfiSmmSwDispatch2ProtocolGuid AND

   gEfiSmmVariableProtocolGuid

+

+[UserExtensions.TianoCore."ExtraFiles"]

+  TrEESmmExtra.uni
\ No newline at end of file