SecurityPkg/include: remove TrEE.

TrEE is deprecated. We need use Tcg2.

Cc: Chao B Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Chao B Zhang <chao.b.zhang@intel.com>

diff --git a/SecurityPkg/Include/Guid/TrEEConfigHii.h b/SecurityPkg/Include/Guid/TrEEConfigHii.h
deleted file mode 100644 (file)
index b5d1de7..0000000
--- a/SecurityPkg/Include/Guid/TrEEConfigHii.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file\r
-  GUIDs used as HII FormSet and HII Package list GUID in TrEEConfig driver. \r
-  \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
-The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php.                                            \r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef __TREE_CONFIG_HII_GUID_H__\r
-#define __TREE_CONFIG_HII_GUID_H__\r
-\r
-#define TREE_CONFIG_FORM_SET_GUID \\r
-  { \\r
-    0xc54b425f, 0xaa79, 0x48b4, { 0x98, 0x1f, 0x99, 0x8b, 0x3c, 0x4b, 0x64, 0x1c } \\r
-  }\r
-\r
-extern EFI_GUID gTrEEConfigFormSetGuid;\r
-\r
-#endif\r

diff --git a/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h b/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h
deleted file mode 100644 (file)
index 0e2f8d1..0000000
--- a/SecurityPkg/Include/Guid/TrEEPhysicalPresenceData.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/** @file\r
-  Define the variable data structures used for TrEE physical presence.\r
-  The TPM2 request from firmware or OS is saved to variable. And it is\r
-  cleared after it is processed in the next boot cycle. The TPM2 response \r
-  is saved to variable.\r
-\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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef __TREE_PHYSICAL_PRESENCE_DATA_GUID_H__\r
-#define __TREE_PHYSICAL_PRESENCE_DATA_GUID_H__\r
-\r
-#define EFI_TREE_PHYSICAL_PRESENCE_DATA_GUID \\r
-  { \\r
-    0xf24643c2, 0xc622, 0x494e, { 0x8a, 0xd, 0x46, 0x32, 0x57, 0x9c, 0x2d, 0x5b }\\r
-  }\r
-\r
-#define TREE_PHYSICAL_PRESENCE_VARIABLE  L"TrEEPhysicalPresence"\r
-\r
-typedef struct {\r
-  UINT8   PPRequest;      ///< Physical Presence request command.\r
-  UINT8   LastPPRequest;\r
-  UINT32  PPResponse;\r
-} EFI_TREE_PHYSICAL_PRESENCE;\r
-\r
-//\r
-// The definition bit of the flags\r
-//\r
-// BIT0 is reserved\r
-#define TREE_FLAG_NO_PPI_CLEAR                        BIT1\r
-// BIT2 is reserved\r
-#define TREE_FLAG_RESET_TRACK                         BIT3\r
-\r
-//\r
-// This variable is used to save TPM Management Flags and corresponding operations.\r
-// It should be protected from malicious software (e.g. Set it as read-only variable). \r
-//\r
-#define TREE_PHYSICAL_PRESENCE_FLAGS_VARIABLE  L"TrEEPhysicalPresenceFlags"\r
-typedef struct {\r
-  UINT8   PPFlags;\r
-} EFI_TREE_PHYSICAL_PRESENCE_FLAGS;\r
-\r
-//\r
-// The definition of physical presence operation actions\r
-//\r
-#define TREE_PHYSICAL_PRESENCE_NO_ACTION                               0\r
-#define TREE_PHYSICAL_PRESENCE_CLEAR_CONTROL_CLEAR                     5\r
-#define TREE_PHYSICAL_PRESENCE_CLEAR_CONTROL_CLEAR_2                   14\r
-#define TREE_PHYSICAL_PRESENCE_SET_NO_PPI_CLEAR_FALSE                  17\r
-#define TREE_PHYSICAL_PRESENCE_SET_NO_PPI_CLEAR_TRUE                   18\r
-#define TREE_PHYSICAL_PRESENCE_CLEAR_CONTROL_CLEAR_3                   21\r
-#define TREE_PHYSICAL_PRESENCE_CLEAR_CONTROL_CLEAR_4                   22\r
-\r
-#define TREE_PHYSICAL_PRESENCE_NO_ACTION_MAX                           22\r
-\r
-extern EFI_GUID  gEfiTrEEPhysicalPresenceGuid;\r
-\r
-#endif\r
-\r

diff --git a/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h b/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h
deleted file mode 100644 (file)
index ba809b9..0000000
--- a/SecurityPkg/Include/Library/TrEEPhysicalPresenceLib.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/** @file\r
-  This library is intended to be used by BDS modules.\r
-  This library will execute TPM2 request.\r
-\r
-Copyright (c) 2013 - 2016, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _TREE_PHYSICAL_PRESENCE_LIB_H_\r
-#define _TREE_PHYSICAL_PRESENCE_LIB_H_\r
-\r
-#include <IndustryStandard/Tpm20.h>\r
-#include <Protocol/TrEEProtocol.h>\r
-\r
-/**\r
-  Check and execute the pending TPM request.\r
-\r
-  The TPM request may come from OS or BIOS. This API will display request information and wait \r
-  for user confirmation if TPM request exists. The TPM request will be sent to TPM device after\r
-  the TPM request is confirmed, and one or more reset may be required to make TPM request to \r
-  take effect.\r
-  \r
-  This API should be invoked after console in and console out are all ready as they are required\r
-  to display request information and get user input to confirm the request.  \r
-\r
-  @param  PlatformAuth                   platform auth value. NULL means no platform auth change.\r
-**/\r
-VOID\r
-EFIAPI\r
-TrEEPhysicalPresenceLibProcessRequest (\r
-  IN      TPM2B_AUTH                     *PlatformAuth  OPTIONAL\r
-  );\r
-\r
-/**\r
-  Check if the pending TPM request needs user input to confirm.\r
-\r
-  The TPM request may come from OS. This API will check if TPM request exists and need user\r
-  input to confirmation.\r
-  \r
-  @retval    TRUE        TPM needs input to confirm user physical presence.\r
-  @retval    FALSE       TPM doesn't need input to confirm user physical presence.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-TrEEPhysicalPresenceLibNeedUserConfirm(\r
-  VOID\r
-  );\r
-\r
-#endif\r

diff --git a/SecurityPkg/Include/Library/TrEEPpVendorLib.h b/SecurityPkg/Include/Library/TrEEPpVendorLib.h
deleted file mode 100644 (file)
index f0dcfd9..0000000
--- a/SecurityPkg/Include/Library/TrEEPpVendorLib.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/** @file\r
-  This library is to support Trusted Execution Environment (TrEE) ACPI Profile\r
-  >= 128 Vendor Specific PPI Operation.\r
-\r
-  The Vendor Specific PPI operation may change TPM state, BIOS TPM management\r
-  flags, and may need additional boot cycle.\r
-  \r
-  Caution: This function may receive untrusted input.\r
-\r
-Copyright (c) 2015 - 2016, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _TREE_PP_VENDOR_LIB_H_\r
-#define _TREE_PP_VENDOR_LIB_H_\r
-\r
-#include <IndustryStandard/Tpm20.h>\r
-#include <Protocol/TrEEProtocol.h>\r
-\r
-//\r
-// The definition of physical presence operation actions\r
-//\r
-#define TREE_PHYSICAL_PRESENCE_VENDOR_SPECIFIC_OPERATION                         128\r
-\r
-//\r
-// The definition bit of the BIOS TPM Management Flags\r
-//\r
-// BIT0 is reserved\r
-#define TREE_BIOS_TPM_MANAGEMENT_FLAG_NO_PPI_CLEAR                        BIT1\r
-// BIT2 is reserved\r
-#define TREE_VENDOR_LIB_FLAG_RESET_TRACK                                  BIT3\r
-\r
-//\r
-// The definition for TPM Operation Response to OS Environment\r
-//\r
-#define TREE_PP_OPERATION_RESPONSE_SUCCESS              0x0\r
-#define TREE_PP_OPERATION_RESPONSE_USER_ABORT           0xFFFFFFF0\r
-#define TREE_PP_OPERATION_RESPONSE_BIOS_FAILURE         0xFFFFFFF1\r
-\r
-//\r
-// The return code for Submit TPM Request to Pre-OS Environment\r
-// and Submit TPM Request to Pre-OS Environment 2\r
-//\r
-#define TREE_PP_SUBMIT_REQUEST_TO_PREOS_SUCCESS                                  0\r
-#define TREE_PP_SUBMIT_REQUEST_TO_PREOS_NOT_IMPLEMENTED                          1\r
-#define TREE_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE                          2\r
-#define TREE_PP_SUBMIT_REQUEST_TO_PREOS_BLOCKED_BY_BIOS_SETTINGS                 3\r
-\r
-//\r
-// The return code for Get User Confirmation Status for Operation\r
-//\r
-#define TREE_PP_GET_USER_CONFIRMATION_NOT_IMPLEMENTED                                 0\r
-#define TREE_PP_GET_USER_CONFIRMATION_BIOS_ONLY                                       1\r
-#define TREE_PP_GET_USER_CONFIRMATION_BLOCKED_BY_BIOS_CONFIGURATION                   2\r
-#define TREE_PP_GET_USER_CONFIRMATION_ALLOWED_AND_PPUSER_REQUIRED                     3\r
-#define TREE_PP_GET_USER_CONFIRMATION_ALLOWED_AND_PPUSER_NOT_REQUIRED                 4\r
-\r
-/**\r
-  Check and execute the requested physical presence command.\r
-\r
-  This API should be invoked in BIOS boot phase to process pending request.\r
-  \r
-  Caution: This function may receive untrusted input.\r
-  \r
-  If OperationRequest < 128, then ASSERT().\r
-\r
-  @param[in]      PlatformAuth     platform auth value. NULL means no platform auth change.\r
-  @param[in]      OperationRequest TPM physical presence operation request.\r
-  @param[in, out] ManagementFlags  BIOS TPM Management Flags.\r
-  @param[out]     ResetRequired    If reset is required to vendor settings in effect.\r
-                                   True, it indicates the reset is required.\r
-                                   False, it indicates the reset is not required.\r
-\r
-  @return TPM Operation Response to OS Environment.\r
-**/\r
-UINT32\r
-EFIAPI\r
-TrEEPpVendorLibExecutePendingRequest (\r
-  IN TPM2B_AUTH             *PlatformAuth,  OPTIONAL\r
-  IN UINT32                 OperationRequest,\r
-  IN OUT UINT32             *ManagementFlags,\r
-  OUT BOOLEAN               *ResetRequired\r
-  );\r
-\r
-/**\r
-  Check if there is a valid physical presence command request.\r
-\r
-  This API should be invoked in BIOS boot phase to process pending request.\r
-  \r
-  Caution: This function may receive untrusted input.\r
-\r
-  If OperationRequest < 128, then ASSERT().\r
-\r
-  @param[in]      OperationRequest TPM physical presence operation request.\r
-  @param[in]      ManagementFlags  BIOS TPM Management Flags.\r
-  @param[out]     RequestConfirmed If the physical presence operation command required user confirm from UI.\r
-                                   True, it indicates the command doesn't require user confirm.\r
-                                   False, it indicates the command need user confirm from UI.\r
-\r
-  @retval  TRUE        Physical Presence operation command is valid.\r
-  @retval  FALSE       Physical Presence operation command is invalid.\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-TrEEPpVendorLibHasValidRequest (\r
-  IN UINT32                 OperationRequest,\r
-  IN UINT32                 ManagementFlags,\r
-  OUT BOOLEAN               *RequestConfirmed\r
-  );\r
-\r
-/**\r
-  The callback for TPM vendor specific physical presence which is called for\r
-  Submit TPM Operation Request to Pre-OS Environment and\r
-  Submit TPM Operation Request to Pre-OS Environment 2.\r
-\r
-  This API should be invoked in OS runtime phase to interface with ACPI method.\r
-\r
-  Caution: This function may receive untrusted input.\r
-  \r
-  If OperationRequest < 128, then ASSERT().\r
-\r
-  @param[in]      OperationRequest TPM physical presence operation request.\r
-  @param[in]      ManagementFlags  BIOS TPM Management Flags.\r
-\r
-  @return Return Code for Submit TPM Operation Request to Pre-OS Environment and\r
-          Submit TPM Operation Request to Pre-OS Environment 2.\r
-**/\r
-UINT32\r
-EFIAPI\r
-TrEEPpVendorLibSubmitRequestToPreOSFunction (\r
-  IN UINT32                 OperationRequest,\r
-  IN UINT32                 ManagementFlags\r
-  );\r
-\r
-/**\r
-  The callback for TPM vendor specific physical presence which is called for\r
-  Get User Confirmation Status for Operation.\r
-\r
-  This API should be invoked in OS runtime phase to interface with ACPI method.\r
-\r
-  Caution: This function may receive untrusted input.\r
-  \r
-  If OperationRequest < 128, then ASSERT().\r
-\r
-  @param[in]      OperationRequest TPM physical presence operation request.\r
-  @param[in]      ManagementFlags  BIOS TPM Management Flags.\r
-\r
-  @return Return Code for Get User Confirmation Status for Operation.\r
-**/\r
-UINT32\r
-EFIAPI\r
-TrEEPpVendorLibGetUserConfirmationStatusFunction (\r
-  IN UINT32                 OperationRequest,\r
-  IN UINT32                 ManagementFlags\r
-  );\r
-\r
-#endif\r