X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=SecurityPkg%2FTcg%2FTcgSmm%2FTcgSmm.h;h=e348ad105499447588ba87e6540af9f01b03ce68;hb=c411b485b63a671a1e276700cff025c73997233c;hp=eee8bc3d718bffc9e22d51b2f8f55b664e250fa9;hpb=c1d932429ef9700a2da64452546be14e92468b07;p=mirror_edk2.git

diff --git a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h b/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
index eee8bc3d71..e348ad1054 100644
--- a/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
+++ b/SecurityPkg/Tcg/TcgSmm/TcgSmm.h
@@ -1,14 +1,8 @@
 /** @file
   The header file for TCG SMM driver.
-  
-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 
-http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, 
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -36,81 +30,70 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DxeServicesLib.h>
 #include <Library/TpmMeasurementLib.h>
 #include <Library/PcdLib.h>
+#include <Library/TcgPpVendorLib.h>
 
 #pragma pack(1)
 typedef struct {
-  UINT8                  SoftwareSmi;
-  UINT32                 Parameter;
-  UINT32                 Response;
-  UINT32                 Request;
-  UINT32                 LastRequest;
-  UINT32                 ReturnCode;
+  UINT8     SoftwareSmi;
+  UINT32    Parameter;
+  UINT32    Response;
+  UINT32    Request;
+  UINT32    LastRequest;
+  UINT32    ReturnCode;
 } PHYSICAL_PRESENCE_NVS;
 
 typedef struct {
-  UINT8                  SoftwareSmi;
-  UINT32                 Parameter;
-  UINT32                 Request;
-  UINT32                 ReturnCode;
+  UINT8     SoftwareSmi;
+  UINT32    Parameter;
+  UINT32    Request;
+  UINT32    ReturnCode;
 } MEMORY_CLEAR_NVS;
 
 typedef struct {
-  PHYSICAL_PRESENCE_NVS  PhysicalPresence;
-  MEMORY_CLEAR_NVS       MemoryClear;
+  PHYSICAL_PRESENCE_NVS    PhysicalPresence;
+  MEMORY_CLEAR_NVS         MemoryClear;
+  UINT32                   PPRequestUserConfirm;
 } TCG_NVS;
 
 typedef struct {
-  UINT8                  OpRegionOp;
-  UINT32                 NameString;
-  UINT8                  RegionSpace;
-  UINT8                  DWordPrefix;
-  UINT32                 RegionOffset;
-  UINT8                  BytePrefix;
-  UINT8                  RegionLen;
+  UINT8     OpRegionOp;
+  UINT32    NameString;
+  UINT8     RegionSpace;
+  UINT8     DWordPrefix;
+  UINT32    RegionOffset;
+  UINT8     BytePrefix;
+  UINT8     RegionLen;
 } AML_OP_REGION_32_8;
 #pragma pack()
 
 //
 // The definition for TCG physical presence ACPI function
 //
-#define ACPI_FUNCTION_GET_PHYSICAL_PRESENCE_INTERFACE_VERSION      1
-#define ACPI_FUNCTION_SUBMIT_REQUEST_TO_BIOS                       2
-#define ACPI_FUNCTION_GET_PENDING_REQUEST_BY_OS                    3
-#define ACPI_FUNCTION_GET_PLATFORM_ACTION_TO_TRANSITION_TO_BIOS    4
-#define ACPI_FUNCTION_RETURN_REQUEST_RESPONSE_TO_OS                5
-#define ACPI_FUNCTION_SUBMIT_PREFERRED_USER_LANGUAGE               6
-#define ACPI_FUNCTION_SUBMIT_REQUEST_TO_BIOS_2                     7
-#define ACPI_FUNCTION_GET_USER_CONFIRMATION_STATUS_FOR_REQUEST     8
+#define ACPI_FUNCTION_GET_PHYSICAL_PRESENCE_INTERFACE_VERSION    1
+#define ACPI_FUNCTION_SUBMIT_REQUEST_TO_BIOS                     2
+#define ACPI_FUNCTION_GET_PENDING_REQUEST_BY_OS                  3
+#define ACPI_FUNCTION_GET_PLATFORM_ACTION_TO_TRANSITION_TO_BIOS  4
+#define ACPI_FUNCTION_RETURN_REQUEST_RESPONSE_TO_OS              5
+#define ACPI_FUNCTION_SUBMIT_PREFERRED_USER_LANGUAGE             6
+#define ACPI_FUNCTION_SUBMIT_REQUEST_TO_BIOS_2                   7
+#define ACPI_FUNCTION_GET_USER_CONFIRMATION_STATUS_FOR_REQUEST   8
 
 //
-// The return code for Get User Confirmation Status for Operation
+// The return code for Return TPM Operation Response to OS Environment
 //
-#define PP_REQUEST_NOT_IMPLEMENTED                                 0
-#define PP_REQUEST_BIOS_ONLY                                       1
-#define PP_REQUEST_BLOCKED                                         2
-#define PP_REQUEST_ALLOWED_AND_PPUSER_REQUIRED                     3
-#define PP_REQUEST_ALLOWED_AND_PPUSER_NOT_REQUIRED                 4
-
-//
-// The return code for Sumbit TPM Request to Pre-OS Environment
-// and Sumbit TPM Request to Pre-OS Environment 2
-//
-#define PP_SUBMIT_REQUEST_SUCCESS                                  0
-#define PP_SUBMIT_REQUEST_NOT_IMPLEMENTED                          1
-#define PP_SUBMIT_REQUEST_GENERAL_FAILURE                          2
-#define PP_SUBMIT_REQUEST_BLOCKED_BY_BIOS_SETTINGS                 3
-
+#define PP_RETURN_TPM_OPERATION_RESPONSE_SUCCESS  0
+#define PP_RETURN_TPM_OPERATION_RESPONSE_FAILURE  1
 
 //
 // The definition for TCG MOR
 //
-#define ACPI_FUNCTION_DSM_MEMORY_CLEAR_INTERFACE                   1
-#define ACPI_FUNCTION_PTS_CLEAR_MOR_BIT                            2
+#define ACPI_FUNCTION_DSM_MEMORY_CLEAR_INTERFACE  1
+#define ACPI_FUNCTION_PTS_CLEAR_MOR_BIT           2
 
 //
 // The return code for Memory Clear Interface Functions
 //
-#define MOR_REQUEST_SUCCESS                                        0
-#define MOR_REQUEST_GENERAL_FAILURE                                1
+#define MOR_REQUEST_SUCCESS          0
+#define MOR_REQUEST_GENERAL_FAILURE  1
 
-#endif  // __TCG_SMM_H__
+#endif // __TCG_SMM_H__