Remove hide TPM support.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dong Guo <guo.dong@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
Reviewed-by: Ni, Ruiyu <ruiyu.ni@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15405 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 794287d137d57faff3d868f4980a28523713d53d..c195ccaad312dfa593487b4ef8f27c27b09d796f 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -229,15 +229,7 @@
   #  If 1, TCG platform type is server.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass|0|UINT8|0x00000006\r
 \r
   #  If 1, TCG platform type is server.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass|0|UINT8|0x00000006\r
 \r

-  ## The PCD is used to control whether to support hiding the TPM.\r
-  #  If TRUE, PcdHideTpm controls whether to hide the TPM.\r
-  #  This pcd is only for validation purpose. It should be set to false in production.\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport|FALSE|BOOLEAN|0x00000007\r
-  \r

 [PcdsDynamic, PcdsDynamicEx]\r
 [PcdsDynamic, PcdsDynamicEx]\r

-  ## The PCD is used to control whether to hide the TPM.\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm|FALSE|BOOLEAN|0x00010002\r
-\r

 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]\r
   ## This PCD indicates the presence or absence of the platform operator.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence|TRUE|BOOLEAN|0x00010001\r
 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]\r
   ## This PCD indicates the presence or absence of the platform operator.\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence|TRUE|BOOLEAN|0x00010001\r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
index fc601471d041e09fa64c9bfdbf5f77da2b743959..9e4e63d761aaf5606727589d11c7a141a57360f8 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
@@ -1,7 +1,7 @@
 /** @file\r
   VFR file used by the TCG configuration component.\r
 \r
 /** @file\r
   VFR file used by the TCG configuration component.\r
 \r

-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2014, 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
 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


@@ -44,13 +44,6 @@ formset
       endcheckbox;\r
     endif;\r
 \r
       endcheckbox;\r
     endif;\r
 \r

-    suppressif TRUE;\r
-      checkbox varid   = TCG_CONFIGURATION.OriginalHideTpm,\r
-              prompt   = STRING_TOKEN(STR_NULL),\r
-              help     = STRING_TOKEN(STR_NULL),\r
-      endcheckbox;\r
-    endif;\r
-\r

     text\r
       help   = STRING_TOKEN(STR_TPM_STATE_HELP),\r
       text   = STRING_TOKEN(STR_TPM_STATE_PROMPT),\r
     text\r
       help   = STRING_TOKEN(STR_TPM_STATE_HELP),\r
       text   = STRING_TOKEN(STR_TPM_STATE_PROMPT),\r


@@ -58,18 +51,6 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r

-    label LABEL_TCG_CONFIGURATION_HIDETPM;\r
-\r
-    checkbox varid = TCG_CONFIGURATION.HideTpm,\r
-          questionid  = KEY_HIDE_TPM,\r
-          prompt      = STRING_TOKEN(STR_HIDE_TPM_PROMPT),\r
-          help        = STRING_TOKEN(STR_HIDE_TPM_HELP),\r
-          flags       = RESET_REQUIRED,\r
-    endcheckbox;\r
-\r
-    label LABEL_END;\r
-\r
-    grayoutif ideqval TCG_CONFIGURATION.OriginalHideTpm == 1;\r

     oneof varid  = TCG_CONFIGURATION.TpmOperation,\r
           questionid = KEY_TPM_ACTION,\r
           prompt = STRING_TOKEN(STR_TPM_OPERATION),\r
     oneof varid  = TCG_CONFIGURATION.TpmOperation,\r
           questionid = KEY_TPM_ACTION,\r
           prompt = STRING_TOKEN(STR_TPM_OPERATION),\r


@@ -102,8 +83,6 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r

-    endif;\r
-\r

   endform;\r
 \r
 endformset;\r
   endform;\r
 \r
 endformset;\r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
index a9a10c9e107f527d7a45f5c2436d1847e749bd44..787251828f0459cba3f3cf94dcccb4c99d536a45 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The module entry point for Tcg configuration module.\r
 \r
 /** @file\r
   The module entry point for Tcg configuration module.\r
 \r

-Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2014, 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
 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


@@ -75,7 +75,6 @@ TcgConfigDriverEntryPoint (
   }\r
   \r
   PrivateData->TcgProtocol = TcgProtocol;\r
   }\r
   \r
   PrivateData->TcgProtocol = TcgProtocol;\r

-  PrivateData->HideTpm     = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));\r

   \r
   //\r
   // Install TCG configuration form\r
   \r
   //\r
   // Install TCG configuration form\r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
index cdfc89c2ece4564e301f01acec4b339cab75cf77..ba62017413d42b7bad71c7454e911eac6959c269 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Component name for Tcg configuration module.\r
 #\r
 ## @file\r
 #  Component name for Tcg configuration module.\r
 #\r

-# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, 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
 # 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


@@ -63,11 +63,7 @@
   gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
   gEfiTcgProtocolGuid                           ## CONSUMES\r
 \r
   gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES\r
   gEfiTcgProtocolGuid                           ## CONSUMES\r
 \r

-[FixedPcd]\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport\r
-\r

 [Pcd]\r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm\r

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
 \r
 [Depex]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
 \r
 [Depex]\r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 5a52a6b87c32cc02ea1cce6c0910d85ff1de31be..c2e3b34a25e3cad2a65c3060cb8b8b984cfc2cd2 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Config Access protocol implementation of TCG configuration module.\r
 \r
 /** @file\r
   HII Config Access protocol implementation of TCG configuration module.\r
 \r

-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2014, 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
 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


@@ -182,11 +182,6 @@ TcgExtractConfig (
   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));\r
 \r
   Configuration.TpmOperation    = PHYSICAL_PRESENCE_ENABLE;\r
   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));\r
 \r
   Configuration.TpmOperation    = PHYSICAL_PRESENCE_ENABLE;\r

-  Configuration.HideTpm         = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));\r
-  //\r
-  // Read the original value of HideTpm from PrivateData which won't be changed by Setup in this boot.\r
-  //\r
-  Configuration.OriginalHideTpm = PrivateData->HideTpm;\r

 \r
   //\r
   // Display current TPM state.\r
 \r
   //\r
   // Display current TPM state.\r


@@ -307,8 +302,6 @@ TcgRouteConfig (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  PcdSetBool (PcdHideTpm,    TcgConfiguration.HideTpm);\r
-\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -425,11 +418,6 @@ InstallTcgConfigForm (
   EFI_STATUS                      Status;\r
   EFI_HII_HANDLE                  HiiHandle;\r
   EFI_HANDLE                      DriverHandle;\r
   EFI_STATUS                      Status;\r
   EFI_HII_HANDLE                  HiiHandle;\r
   EFI_HANDLE                      DriverHandle;\r

-  VOID                            *StartOpCodeHandle;\r
-  VOID                            *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL              *StartLabel;\r
-  EFI_IFR_GUID_LABEL              *EndLabel;\r
-\r

   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
 \r
   DriverHandle = NULL;\r
   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
 \r
   DriverHandle = NULL;\r


@@ -473,39 +461,6 @@ InstallTcgConfigForm (
   \r
   PrivateData->HiiHandle = HiiHandle;\r
 \r
   \r
   PrivateData->HiiHandle = HiiHandle;\r
 \r

-  //\r
-  // Remove the Hide TPM question from the IFR\r
-  //\r
-  if (!PcdGetBool (PcdHideTpmSupport)) {\r
-    //\r
-    // Allocate space for creation of UpdateData Buffer\r
-    //\r
-    StartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-    ASSERT (StartOpCodeHandle != NULL);\r
-\r
-    EndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-    ASSERT (EndOpCodeHandle != NULL);\r
-\r
-    //\r
-    // Create Hii Extend Label OpCode as the start opcode\r
-    //\r
-    StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
-    StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
-    StartLabel->Number       = LABEL_TCG_CONFIGURATION_HIDETPM;\r
-\r
-    //\r
-    // Create Hii Extend Label OpCode as the end opcode\r
-    //\r
-    EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
-    EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
-    EndLabel->Number       = LABEL_END;\r
-    \r
-    HiiUpdateForm (HiiHandle, NULL, TCG_CONFIGURATION_FORM_ID, StartOpCodeHandle, EndOpCodeHandle);\r
-\r
-    HiiFreeOpCodeHandle (StartOpCodeHandle);\r
-    HiiFreeOpCodeHandle (EndOpCodeHandle);\r
-  }\r
-\r

   return EFI_SUCCESS;  \r
 }\r
 \r
   return EFI_SUCCESS;  \r
 }\r
 \r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
index cbfca7439237a716fcb65491771d4abcbb7a1b22..ecc6a6d85534d17a762cd4826e007c821844df10 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
@@ -2,7 +2,7 @@
   The header file of HII Config Access protocol implementation of TCG\r
   configuration module.\r
 \r
   The header file of HII Config Access protocol implementation of TCG\r
   configuration module.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2014, 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
 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


@@ -62,8 +62,6 @@ typedef struct {
   EFI_HANDLE                        DriverHandle;  \r
 \r
   EFI_TCG_PROTOCOL                  *TcgProtocol;\r
   EFI_HANDLE                        DriverHandle;  \r
 \r
   EFI_TCG_PROTOCOL                  *TcgProtocol;\r

-\r
-  BOOLEAN                           HideTpm;\r

 } TCG_CONFIG_PRIVATE_DATA;\r
 \r
 extern TCG_CONFIG_PRIVATE_DATA      mTcgConfigPrivateDateTemplate;\r
 } TCG_CONFIG_PRIVATE_DATA;\r
 \r
 extern TCG_CONFIG_PRIVATE_DATA      mTcgConfigPrivateDateTemplate;\r

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
index 359f4a2bf66aac9dce7be81cff4286d24712a976..eaa6fe801862dd945c84513f7e29c6eee0f2f24e 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for NV data structure definition.\r
 \r
 /** @file\r
   Header file for NV data structure definition.\r
 \r

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2014, 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
 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


@@ -22,19 +22,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TCG_CONFIGURATION_VARSTORE_ID  0x0001\r
 #define TCG_CONFIGURATION_FORM_ID      0x0001\r
 \r
 #define TCG_CONFIGURATION_VARSTORE_ID  0x0001\r
 #define TCG_CONFIGURATION_FORM_ID      0x0001\r
 \r

-#define KEY_HIDE_TPM                   0x2000\r
-#define KEY_TPM_ACTION                 0x3000\r
-#define KEY_TPM_MOR_ENABLE             0x4000\r
+#define KEY_TPM_ACTION                         0x3000\r

 \r
 \r

-#define LABEL_TCG_CONFIGURATION_HIDETPM  0x0001\r
-#define LABEL_END                        0xffff\r
+#define LABEL_TCG_CONFIGURATION_TPM_OPERATION  0x0001\r
+#define LABEL_END                              0xffff\r

 \r
 //\r
 // Nv Data structure referenced by IFR\r
 //\r
 typedef struct {\r
 \r
 //\r
 // Nv Data structure referenced by IFR\r
 //\r
 typedef struct {\r

-  BOOLEAN HideTpm;\r
-  BOOLEAN OriginalHideTpm;\r

   UINT8   TpmOperation;\r
   BOOLEAN TpmEnable;\r
   BOOLEAN TpmActivate;\r
   UINT8   TpmOperation;\r
   BOOLEAN TpmEnable;\r
   BOOLEAN TpmActivate;\r

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index ae905f7653b6d5c28281482be78d61993f7c47e7..f3f4b3f4c0eeb89d793020e830c78ea1412d188e 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -1,7 +1,7 @@
 /** @file\r
   Initialize TPM device and measure FVs before handing off control to DXE.\r
 \r
 /** @file\r
   Initialize TPM device and measure FVs before handing off control to DXE.\r
 \r

-Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2014, 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
 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


@@ -711,10 +711,6 @@ PeimEntryMA (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

-  if (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm)) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r

   //\r
   // Initialize TPM device\r
   //\r
   //\r
   // Initialize TPM device\r
   //\r

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 48a3e64362b73d8687c0fe6890fa76759e4dc78b..cf90eaec81d37654194e4facb0111aa8ac69f35a 100644 (file)
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module will initialize TPM device and measure FVs in PEI phase.\r
 #\r
 ## @file\r
 #  This module will initialize TPM device and measure FVs in PEI phase.\r
 #\r

-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2014, 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
 # 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


@@ -63,7 +63,6 @@
   gEfiEndOfPeiSignalPpiGuid\r
 \r
 [Pcd]\r
   gEfiEndOfPeiSignalPpiGuid\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm\r

   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock\r
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable\r
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable\r
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock\r
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable\r
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable\r


@@ -73,7 +72,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy\r
 \r
 [FixedPcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy\r
 \r
 [FixedPcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
 \r
 [Depex]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
 \r
 [Depex]\r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c b/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
index ce7a9a1974c77f098502e5b47e2aca264a300691..516f7c92a3097787ec3a9c4665db92cf555e3ba9 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
+++ b/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
@@ -1,7 +1,7 @@
 /** @file\r
   TPM1.2/dTPM2.0 auto detection.\r
 \r
 /** @file\r
   TPM1.2/dTPM2.0 auto detection.\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2014, 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
 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


@@ -69,11 +69,6 @@ DetectTpmDevice (
   EFI_PEI_READ_ONLY_VARIABLE2_PPI   *VariablePpi;\r
   UINTN                             Size;\r
 \r
   EFI_PEI_READ_ONLY_VARIABLE2_PPI   *VariablePpi;\r
   UINTN                             Size;\r
 \r

-  if (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm)) {\r
-    DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Tpm is hide\n"));\r
-    return TPM_DEVICE_NULL;\r
-  }\r
-\r

   Status = PeiServicesGetBootMode (&BootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = PeiServicesGetBootMode (&BootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
index c6a489aee800666c8adfd5a92a8fed112133f8db..c3a8435391d1cff72b57dba0cada7b3ec26c35e8 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
@@ -2,7 +2,7 @@
 #  Component name for TrEE configuration module.\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r
 #  Component name for TrEE configuration module.\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -55,12 +55,8 @@
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid\r
 \r
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid\r
 \r

-[FixedPcd]\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport\r
-\r

 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
 [Pcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm\r

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmAutoDetection\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress\r

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
index 5b5ff6c3aa0e8e8105c7ece1153c4dccce075a63..5dfbd8d89338b577d7c50c749fa6a87b65af2547 100644 (file)
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
@@ -1,7 +1,7 @@
 /** @file\r
   Initialize TPM2 device and measure FVs before handing off control to DXE.\r
 \r
 /** @file\r
   Initialize TPM2 device and measure FVs before handing off control to DXE.\r
 \r

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2014, 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
 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


@@ -620,10 +620,6 @@ PeimEntryMA (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

-  if (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm)) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r

   //\r
   // Update for Performance optimization\r
   //\r
   //\r
   // Update for Performance optimization\r
   //\r

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index 3de112c5cf15158021d3e3ece69150e0cd6ac6d1..719f2b4a64c4857a07191b91a56a565b592f4528 100644 (file)
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  This module will initialize TPM2 device and measure FVs in PEI phase.\r
 #\r
 ## @file\r
 #  This module will initialize TPM2 device and measure FVs in PEI phase.\r
 #\r

-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2013 - 2014, 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
 # 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


@@ -58,7 +58,6 @@
   gEfiEndOfPeiSignalPpiGuid\r
 \r
 [Pcd]\r
   gEfiEndOfPeiSignalPpiGuid\r
 \r
 [Pcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString             ## CONSUMES\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy\r


@@ -66,7 +65,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy\r
 \r
 [FixedPcd]\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy\r
 \r
 [FixedPcd]\r

-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
 \r
 [Depex]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
 \r
 [Depex]\r