Sync the branch changes to trunk.

Support fTPM feature, and update the BiosID to 0.80.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <tim.he@intel.com>


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

4 files changed, 232 insertions, 3 deletions

diff --git a/Vlv2DeviceRefCodePkg/Include/Ppi/PttPassThruPpi.h b/Vlv2DeviceRefCodePkg/Include/Ppi/PttPassThruPpi.h
new file mode 100644
index 0000000000..1b1b1a76b4
--- /dev/null
+++ b/Vlv2DeviceRefCodePkg/Include/Ppi/PttPassThruPpi.h
@@ -0,0 +1,98 @@
+/*++

+

+  Copyright (c) 2004  - 2015, 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 that 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.    

+                                                                                   

+--*/

+

+#ifndef _EFI_PTT_PASS_THRU_PPI_H

+#define _EFI_PTT_PASS_THRU_PPI_H

+

+#define PTT_PASS_THRU_PPI_GUID \

+  { \

+    0xc5068bac, 0xa7dc, 0x42f1, 0xae, 0x80, 0xca, 0xa2, 0x4b, 0xb4, 0x90, 0x4b   \

+  }

+// {C5068BAC-A7DC-42f1-AE80-CAA24BB4904B}

+//static const GUID <<name>> = 

+//{ 0xc5068bac, 0xa7dc, 0x42f1, { 0xae, 0x80, 0xca, 0xa2, 0x4b, 0xb4, 0x90, 0x4b } };

+

+

+

+//#define EFI_PTT_PROTOCOL_GUID  HECI_PROTOCOL_GUID

+

+typedef struct _PTT_PASS_THRU_PPI PTT_PASS_THRU_PPI;

+

+/**

+  This service enables the sending of commands to the TPM2.

+

+  @param[in]      InputParameterBlockSize  Size of the TPM2 input parameter block.

+  @param[in]      InputParameterBlock      Pointer to the TPM2 input parameter block.

+  @param[in,out]  OutputParameterBlockSize Size of the TPM2 output parameter block.

+  @param[in]      OutputParameterBlock     Pointer to the TPM2 output parameter block.

+

+  @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.

+  @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.

+  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small. 

+**/

+typedef

+EFI_STATUS

+(EFIAPI *TPM2_SUBMIT_COMMAND) (

+  IN PTT_PASS_THRU_PPI *This,

+  IN UINT32                  InputParameterBlockSize,

+  IN UINT8                   *InputParameterBlock,

+  IN OUT UINT32              *OutputParameterBlockSize,

+  IN UINT8                   *OutputParameterBlock

+  );

+

+/**

+  This service requests use TPM2.

+

+  @retval EFI_SUCCESS      Get the control of TPM2 chip.

+  @retval EFI_NOT_FOUND    TPM2 not found.

+  @retval EFI_DEVICE_ERROR Unexpected device behavior.

+**/

+typedef

+EFI_STATUS

+(EFIAPI *TPM2_REQUEST_USE_TPM) (

+  IN PTT_PASS_THRU_PPI *This

+  );

+

+typedef struct {

+  EFI_GUID                           ProviderGuid;

+  TPM2_SUBMIT_COMMAND                Tpm2SubmitCommand;

+  TPM2_REQUEST_USE_TPM               Tpm2RequestUseTpm;

+} PTT_TPM2_DEVICE_INTERFACE;

+

+

+/**

+  This service register TPM2 device.

+

+  @param Tpm2Device  TPM2 device

+

+  @retval EFI_SUCCESS          This TPM2 device is registered successfully.

+  @retval EFI_UNSUPPORTED      System does not support register this TPM2 device.

+  @retval EFI_ALREADY_STARTED  System already register this TPM2 device.

+**/

+typedef

+EFI_STATUS

+(EFIAPI *TPM2_REGISTER_TPM2_DEVICE_LIB) (

+  IN PTT_PASS_THRU_PPI  *This,

+  IN PTT_TPM2_DEVICE_INTERFACE   *Tpm2Device

+  );

+  

+typedef struct _PTT_PASS_THRU_PPI {

+  TPM2_SUBMIT_COMMAND             Tpm2SubmitCommand;

+  TPM2_REQUEST_USE_TPM            Tpm2RequestUseTpm;

+  TPM2_REGISTER_TPM2_DEVICE_LIB   Tpm2RegisterTpm2DeviceLib;

+} PTT_PASS_THRU_PPI;

+

+extern EFI_GUID gPttPassThruPpiGuid;

+

+#endif // _EFI_HECI_H

diff --git a/Vlv2DeviceRefCodePkg/Include/Ppi/fTPMPolicy.h b/Vlv2DeviceRefCodePkg/Include/Ppi/fTPMPolicy.h
new file mode 100644
index 0000000000..83ee8bb1ce
--- /dev/null
+++ b/Vlv2DeviceRefCodePkg/Include/Ppi/fTPMPolicy.h
@@ -0,0 +1,32 @@
+/*++

+

+  Copyright (c) 2004  - 2015, 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 that 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.    

+                                                                                   

+--*/

+

+#ifndef _SEC_FTPM_POLICY_PPI_H_

+#define _SEC_FTPM_POLICY_PPI_H_

+

+#define SEC_FTPM_POLICY_PPI_GUID \

+  { \

+    0x4fd1ba49, 0x8f90, 0x471a, 0xa2, 0xc9, 0x17, 0x3c, 0x7a, 0x73, 0x2f, 0xd0 \

+  }

+

+extern EFI_GUID  gSeCfTPMPolicyPpiGuid;

+

+//

+// PPI definition

+//

+typedef struct SEC_FTPM_POLICY_PPI {

+  BOOLEAN                 fTPMEnable;

+} SEC_FTPM_POLICY_PPI;

+

+#endif

diff --git a/Vlv2DeviceRefCodePkg/Include/Protocol/PttPassThru.h b/Vlv2DeviceRefCodePkg/Include/Protocol/PttPassThru.h
new file mode 100644
index 0000000000..10248cf4d4
--- /dev/null
+++ b/Vlv2DeviceRefCodePkg/Include/Protocol/PttPassThru.h
@@ -0,0 +1,97 @@
+/*++

+

+  Copyright (c) 2004  - 2015, 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 that 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.    

+                                                                                   

+--*/

+

+#ifndef _EFI_PTT_PASS_THRU_H

+#define _EFI_PTT_PASS_THRU_H

+

+#define PTT_PASS_THRU_PROTOCOL_GUID \

+  { \

+    0x73e2576, 0xf6c1, 0x4b91, 0x92, 0xa9, 0xd4, 0x67, 0x5d, 0xda, 0x34, 0xb1  \

+  }

+// {073E2576-F6C1-4b91-92A9-D4675DDA34B1}

+//static const GUID <<name>> = 

+//{ 0x73e2576, 0xf6c1, 0x4b91, { 0x92, 0xa9, 0xd4, 0x67, 0x5d, 0xda, 0x34, 0xb1 } };

+

+

+//#define EFI_PTT_PROTOCOL_GUID  HECI_PROTOCOL_GUID

+

+typedef struct _PTT_PASS_THRU_PROTOCOL PTT_PASS_THRU_PROTOCOL;

+

+/**

+  This service enables the sending of commands to the TPM2.

+

+  @param[in]      InputParameterBlockSize  Size of the TPM2 input parameter block.

+  @param[in]      InputParameterBlock      Pointer to the TPM2 input parameter block.

+  @param[in,out]  OutputParameterBlockSize Size of the TPM2 output parameter block.

+  @param[in]      OutputParameterBlock     Pointer to the TPM2 output parameter block.

+

+  @retval EFI_SUCCESS            The command byte stream was successfully sent to the device and a response was successfully received.

+  @retval EFI_DEVICE_ERROR       The command was not successfully sent to the device or a response was not successfully received from the device.

+  @retval EFI_BUFFER_TOO_SMALL   The output parameter block is too small. 

+**/

+typedef

+EFI_STATUS

+(EFIAPI *TPM2_SUBMIT_COMMAND) (

+  IN PTT_PASS_THRU_PROTOCOL *This,

+  IN UINT32                  InputParameterBlockSize,

+  IN UINT8                   *InputParameterBlock,

+  IN OUT UINT32              *OutputParameterBlockSize,

+  IN UINT8                   *OutputParameterBlock

+  );

+

+/**

+  This service requests use TPM2.

+

+  @retval EFI_SUCCESS      Get the control of TPM2 chip.

+  @retval EFI_NOT_FOUND    TPM2 not found.

+  @retval EFI_DEVICE_ERROR Unexpected device behavior.

+**/

+typedef

+EFI_STATUS

+(EFIAPI *TPM2_REQUEST_USE_TPM) (

+  IN PTT_PASS_THRU_PROTOCOL *This

+  );

+

+typedef struct {

+  EFI_GUID                           ProviderGuid;

+  TPM2_SUBMIT_COMMAND                Tpm2SubmitCommand;

+  TPM2_REQUEST_USE_TPM               Tpm2RequestUseTpm;

+} PTT_TPM2_DEVICE_INTERFACE;

+

+

+/**

+  This service register TPM2 device.

+

+  @param Tpm2Device  TPM2 device

+

+  @retval EFI_SUCCESS          This TPM2 device is registered successfully.

+  @retval EFI_UNSUPPORTED      System does not support register this TPM2 device.

+  @retval EFI_ALREADY_STARTED  System already register this TPM2 device.

+**/

+typedef

+EFI_STATUS

+(EFIAPI *TPM2_REGISTER_TPM2_DEVICE_LIB) (

+  IN PTT_PASS_THRU_PROTOCOL  *This,

+  IN PTT_TPM2_DEVICE_INTERFACE   *Tpm2Device

+  );

+  

+typedef struct _PTT_PASS_THRU_PROTOCOL {

+  TPM2_SUBMIT_COMMAND             Tpm2SubmitCommand;

+  TPM2_REQUEST_USE_TPM            Tpm2RequestUseTpm;

+  TPM2_REGISTER_TPM2_DEVICE_LIB   Tpm2RegisterTpm2DeviceLib;

+} PTT_PASS_THRU_PROTOCOL;

+

+extern EFI_GUID gPttPassThruProtocolGuid;

+

+#endif // _EFI_HECI_H

diff --git a/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec b/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
index b003354892..5d3f46c231 100644
--- a/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+++ b/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
@@ -1,6 +1,6 @@
 ##  @file  Vlv2DeviceRefCodePkg.dec

 #

-# Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved

+# Copyright (c) 2012  - 2015, Intel Corporation. All rights reserved

 #

 # This program and the accompanying materials are licensed and made available under

 # the terms and conditions of the BSD License that accompanies this distribution.

@@ -37,7 +37,8 @@
   gSeCfTPMPolicyPpiGuid                 = { 0x4fd1ba49, 0x8f90, 0x471a, {0xa2, 0xc9, 0x17, 0x3c, 0x7a, 0x73, 0x2f, 0xd0}}

   gEfiPeiReadOnlyVariable2PpiGuid       = { 0x2ab86ef5, 0xecb5, 0x4134, {0xb5, 0x56, 0x38, 0x54, 0xca, 0x1f, 0xe1, 0xb4}}

   gPchPeiInitPpiGuid                    = { 0xACB93B08, 0x5CDC, 0x4A8F, {0x93, 0xD4, 0x6, 0xE3, 0x42, 0xDF, 0x18, 0x2E}}

-

+  gPttPassThruPpiGuid                   = { 0xc5068bac, 0xa7dc, 0x42f1, {0xae, 0x80, 0xca, 0xa2, 0x4b, 0xb4, 0x90, 0x4b}}

+  

 [Protocols]

   gEfiGlobalNvsAreaProtocolGuid         = { 0x074e1e48, 0x8132, 0x47a1, {0x8c, 0x2c, 0x3f, 0x14, 0xad, 0x9a, 0x66, 0xdc}}

   gPpmPlatformPolicyProtocolGuid        = { 0xddabfeac, 0xef63, 0x452c, {0x8f, 0x39, 0xed, 0x7f, 0xae, 0xd8, 0x26, 0x5e}}

@@ -70,7 +71,8 @@
   gEfiTdtOperationProtocolGuid          = {0xfd301ba4, 0x5e62, 0x4679,{ 0xa0, 0x6f, 0xe0, 0x9a, 0xab, 0xdd, 0x2a, 0x91}}

   gEfiConfigFileNameGuid            = { 0x98B8D59B, 0xE8BA, 0x48EE, { 0x98, 0xDD, 0xC2, 0x95, 0x39, 0x2F, 0x1E, 0xDB }}

   gEfiDFUResultGuid                 = { 0x14a7c46f, 0xbc02, 0x4047, { 0x9f, 0x18, 0xa5, 0xd7, 0x25, 0xd8, 0xbd, 0x19 }}

-

+  gPttPassThruProtocolGuid          = { 0x73e2576, 0xf6c1, 0x4b91, { 0x92, 0xa9, 0xd4, 0x67, 0x5d, 0xda, 0x34, 0xb1 } }

+  

 [Guids]

   gEfiCPTokenSpaceGuid                  = { 0x918211ce, 0xa1d2, 0x43a0, {0xa0, 0x4e, 0x75, 0xb5, 0xbf, 0x44, 0x50, 0x0E}}

   gEfiSmbusArpMapGuid                   = { 0x707BE83E, 0x0BF6, 0x40A5, {0xBE, 0x64, 0x34, 0xC0, 0x3A, 0xA0, 0xB8, 0xE2}}