Handle TPM device error and avoid deadloop in BDS.

[mirror_edk2.git] / SecurityPkg / Tcg / TrEEDxe / TrEEDxe.inf

diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
index a1f174192b38b87f3b311a7a7ba368904fd1bc60..e564c8f2a561f19c9769749e34f82c1109c8eeea 100644 (file)
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf
@@ -1,5 +1,5 @@
 ## @file\r
-#  Component file for module TrEEDxe.\r
+#  Produces TrEE protocol and measure boot environment\r
 #  This module will produce TrEE protocol and measure boot environment.\r
 #\r
 #  Caution: This module requires additional review when modified.\r
@@ -7,7 +7,7 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r
@@ -20,6 +20,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = TrEEDxe\r
+  MODULE_UNI_FILE                = TrEEDxe.uni\r
   FILE_GUID                      = 2A7946E3-1AB2-49a9-ACCB-C6275139C1A5\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
@@ -56,36 +57,50 @@
   Tpm2DeviceLib\r
   HashLib\r
   PerformanceLib\r
+  ReportStatusCodeLib\r
 \r
 [Guids]\r
-  gEfiSmbiosTableGuid                           # ALWAYS_CONSUMED\r
-  gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED\r
-  gTcgEventEntryHobGuid\r
-  gEfiEventReadyToBootGuid\r
-  gEfiEventExitBootServicesGuid\r
-  gEventExitBootServicesFailedGuid              # ALWAYS_CONSUMED\r
+  ## SOMETIMES_CONSUMES     ## SystemTable           # Smbios Table\r
+  ## SOMETIMES_CONSUMES     ## GUID                  # Handoff Table for measurement.\r
+  gEfiSmbiosTableGuid\r
+  \r
+  ## SOMETIMES_CONSUMES     ## Variable:L"SecureBoot"\r
+  ## SOMETIMES_CONSUMES     ## Variable:L"PK"\r
+  ## SOMETIMES_CONSUMES     ## Variable:L"KEK"\r
+  ## SOMETIMES_CONSUMES     ## Variable:L"BootXXXX"\r
+  gEfiGlobalVariableGuid\r
+\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"db"\r
+  ## SOMETIMES_CONSUMES      ## Variable:L"dbx"\r
   gEfiImageSecurityDatabaseGuid\r
-  gEfiTpmDeviceInstanceNoneGuid\r
-  gEfiTpmDeviceInstanceTpm12Guid\r
+    \r
+  gTcgEventEntryHobGuid                              ## SOMETIMES_CONSUMES  ## HOB\r
+  gTpmErrorHobGuid                                   ## SOMETIMES_CONSUMES  ## HOB\r
+  gEfiEventExitBootServicesGuid                      ## CONSUMES            ## Event\r
+  gEventExitBootServicesFailedGuid                   ## SOMETIMES_CONSUMES  ## Event\r
+  gEfiTpmDeviceInstanceNoneGuid                      ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier\r
+  gEfiTpmDeviceInstanceTpm12Guid                     ## SOMETIMES_CONSUMES  ## GUID       # TPM device identifier\r
 \r
 [Protocols]\r
-  gEfiTrEEProtocolGuid                          ## PRODUCES\r
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiMpServiceProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiTrEEProtocolGuid                               ## PRODUCES\r
+  gEfiAcpiTableProtocolGuid                          ## NOTIFY\r
+  gEfiMpServiceProtocolGuid                          ## SOMETIMES_CONSUMES\r
+  gEfiVariableWriteArchProtocolGuid                  ## NOTIFY\r
 \r
 [Pcd]\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdFirmwareDebuggerInitialized\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass                         ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdFirmwareDebuggerInitialized              ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                          ## CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress                           ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId                        ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId                   ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision                  ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId                    ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision              ## SOMETIMES_CONSUMES\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice              ## SOMETIMES_CONSUMES\r
 \r
 [Depex]\r
   TRUE\r
 \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  TrEEDxeExtra.uni\r