From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: jian.j.wang@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Mon, 05 Aug 2019 02:02:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Aug 2019 02:02:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,349,1559545200"; d="scan'208";a="181623170" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2019 02:02:20 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 5 Aug 2019 02:02:20 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 5 Aug 2019 02:02:19 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 5 Aug 2019 02:02:19 -0700 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.65]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.250]) with mapi id 14.03.0439.000; Mon, 5 Aug 2019 17:01:28 +0800 From: "Wang, Jian J" To: "devel@edk2.groups.io" , "Zhang, Shenglei" CC: "Yao, Jiewen" , "Zhang, Chao B" Subject: Re: [edk2-devel] [PATCH 1/1] SecurityPkg/TpmCommLib: Remove TpmCommLib Thread-Topic: [edk2-devel] [PATCH 1/1] SecurityPkg/TpmCommLib: Remove TpmCommLib Thread-Index: AQHVS1JmSiVs1cP7VUuArWfXeS2ZzKbsQg3Q Date: Mon, 5 Aug 2019 09:01:29 +0000 Message-ID: References: <20190805055514.17656-1-shenglei.zhang@intel.com> In-Reply-To: <20190805055514.17656-1-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzM1MTQ1NWUtYWQwZS00MTdjLWFlMjItOWIxMzIzODdmY2MzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNCszbkNLVlVMOEhxcXcwVDBhSTltNEU3QnNhTmlqOVNwWFVTWkZRbU5GUVIwNlNCZENDdHJuY3VGcGF0RjVNdyJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jian.j.wang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jian J Wang > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Zhang, Shenglei > Sent: Monday, August 05, 2019 1:55 PM > To: devel@edk2.groups.io > Cc: Zhang, Shenglei ; Yao, Jiewen > ; Wang, Jian J ; Zhang, > Chao B > Subject: [edk2-devel] [PATCH 1/1] SecurityPkg/TpmCommLib: Remove > TpmCommLib >=20 > From: shenglei >=20 > TpmCommonLib is no longer used by TcgPei/TcgDxe/Tcg2ConfigPei > modules. So TpmCommLib can be removed. >=20 > Cc: Jiewen Yao > Cc: Jian Wang > Cc: Chao Zhang > Signed-off-by: Shenglei Zhang > --- > SecurityPkg/Library/TpmCommLib/TisPc.c | 177 ----------- > SecurityPkg/Library/TpmCommLib/TpmComm.c | 44 --- > SecurityPkg/Include/Library/TpmCommLib.h | 281 ------------------ > SecurityPkg/Library/TpmCommLib/CommonHeader.h | 23 -- > SecurityPkg/Library/TpmCommLib/TpmCommLib.inf | 45 --- > SecurityPkg/Library/TpmCommLib/TpmCommLib.uni | 17 -- > SecurityPkg/SecurityPkg.dec | 4 - > SecurityPkg/SecurityPkg.dsc | 2 - > 8 files changed, 593 deletions(-) > delete mode 100644 SecurityPkg/Library/TpmCommLib/TisPc.c > delete mode 100644 SecurityPkg/Library/TpmCommLib/TpmComm.c > delete mode 100644 SecurityPkg/Include/Library/TpmCommLib.h > delete mode 100644 SecurityPkg/Library/TpmCommLib/CommonHeader.h > delete mode 100644 SecurityPkg/Library/TpmCommLib/TpmCommLib.inf > delete mode 100644 SecurityPkg/Library/TpmCommLib/TpmCommLib.uni >=20 > diff --git a/SecurityPkg/Library/TpmCommLib/TisPc.c > b/SecurityPkg/Library/TpmCommLib/TisPc.c > deleted file mode 100644 > index 162e883d2170..000000000000 > --- a/SecurityPkg/Library/TpmCommLib/TisPc.c > +++ /dev/null > @@ -1,177 +0,0 @@ > -/** @file > - Basic TIS (TPM Interface Specification) functions. > - > -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#include "CommonHeader.h" > - > -/** > - Check whether TPM chip exist. > - > - @param[in] TisReg Pointer to TIS register. > - > - @retval TRUE TPM chip exists. > - @retval FALSE TPM chip is not found. > -**/ > -BOOLEAN > -TisPcPresenceCheck ( > - IN TIS_PC_REGISTERS_PTR TisReg > - ) > -{ > - UINT8 RegRead; > - > - RegRead =3D MmioRead8 ((UINTN)&TisReg->Access); > - return (BOOLEAN)(RegRead !=3D (UINT8)-1); > -} > - > -/** > - Check whether the value of a TPM chip register satisfies the input BI= T > setting. > - > - @param[in] Register Address port of register to be checked. > - @param[in] BitSet Check these data bits are set. > - @param[in] BitClear Check these data bits are clear. > - @param[in] TimeOut The max wait time (unit MicroSecond) when > checking register. > - > - @retval EFI_SUCCESS The register satisfies the check bit. > - @retval EFI_TIMEOUT The register can't run into the expected sta= tus in > time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcWaitRegisterBits ( > - IN UINT8 *Register, > - IN UINT8 BitSet, > - IN UINT8 BitClear, > - IN UINT32 TimeOut > - ) > -{ > - UINT8 RegRead; > - UINT32 WaitTime; > - > - for (WaitTime =3D 0; WaitTime < TimeOut; WaitTime +=3D 30){ > - RegRead =3D MmioRead8 ((UINTN)Register); > - if ((RegRead & BitSet) =3D=3D BitSet && (RegRead & BitClear) =3D=3D= 0) > - return EFI_SUCCESS; > - MicroSecondDelay (30); > - } > - return EFI_TIMEOUT; > -} > - > -/** > - Get BurstCount by reading the burstCount field of a TIS regiger > - in the time of default TIS_TIMEOUT_D. > - > - @param[in] TisReg Pointer to TIS register. > - @param[out] BurstCount Pointer to a buffer to store the go= t > BurstConut. > - > - @retval EFI_SUCCESS Get BurstCount. > - @retval EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NUL= L. > - @retval EFI_TIMEOUT BurstCount can't be got in time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcReadBurstCount ( > - IN TIS_PC_REGISTERS_PTR TisReg, > - OUT UINT16 *BurstCount > - ) > -{ > - UINT32 WaitTime; > - UINT8 DataByte0; > - UINT8 DataByte1; > - > - if (BurstCount =3D=3D NULL || TisReg =3D=3D NULL) { > - return EFI_INVALID_PARAMETER; > - } > - > - WaitTime =3D 0; > - do { > - // > - // TIS_PC_REGISTERS_PTR->burstCount is UINT16, but it is not 2bytes > aligned, > - // so it needs to use MmioRead8 to read two times > - // > - DataByte0 =3D MmioRead8 ((UINTN)&TisReg->BurstCount); > - DataByte1 =3D MmioRead8 ((UINTN)&TisReg->BurstCount + 1); > - *BurstCount =3D (UINT16)((DataByte1 << 8) + DataByte0); > - if (*BurstCount !=3D 0) { > - return EFI_SUCCESS; > - } > - MicroSecondDelay (30); > - WaitTime +=3D 30; > - } while (WaitTime < TIS_TIMEOUT_D); > - > - return EFI_TIMEOUT; > -} > - > -/** > - Set TPM chip to ready state by sending ready command > TIS_PC_STS_READY > - to Status Register in time. > - > - @param[in] TisReg Pointer to TIS register. > - > - @retval EFI_SUCCESS TPM chip enters into ready state. > - @retval EFI_INVALID_PARAMETER TisReg is NULL. > - @retval EFI_TIMEOUT TPM chip can't be set to ready state= in time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcPrepareCommand ( > - IN TIS_PC_REGISTERS_PTR TisReg > - ) > -{ > - EFI_STATUS Status; > - > - if (TisReg =3D=3D NULL) { > - return EFI_INVALID_PARAMETER; > - } > - > - MmioWrite8((UINTN)&TisReg->Status, TIS_PC_STS_READY); > - Status =3D TisPcWaitRegisterBits ( > - &TisReg->Status, > - TIS_PC_STS_READY, > - 0, > - TIS_TIMEOUT_B > - ); > - return Status; > -} > - > -/** > - Get the control of TPM chip by sending requestUse command > TIS_PC_ACC_RQUUSE > - to ACCESS Register in the time of default TIS_TIMEOUT_A. > - > - @param[in] TisReg Pointer to TIS register. > - > - @retval EFI_SUCCESS Get the control of TPM chip. > - @retval EFI_INVALID_PARAMETER TisReg is NULL. > - @retval EFI_NOT_FOUND TPM chip doesn't exit. > - @retval EFI_TIMEOUT Can't get the TPM control in time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcRequestUseTpm ( > - IN TIS_PC_REGISTERS_PTR TisReg > - ) > -{ > - EFI_STATUS Status; > - > - if (TisReg =3D=3D NULL) { > - return EFI_INVALID_PARAMETER; > - } > - > - if (!TisPcPresenceCheck (TisReg)) { > - return EFI_NOT_FOUND; > - } > - > - MmioWrite8((UINTN)&TisReg->Access, TIS_PC_ACC_RQUUSE); > - // > - // No locality set before, ACCESS_X.activeLocality MUST be valid with= in > TIMEOUT_A > - // > - Status =3D TisPcWaitRegisterBits ( > - &TisReg->Access, > - (UINT8)(TIS_PC_ACC_ACTIVE |TIS_PC_VALID), > - 0, > - TIS_TIMEOUT_A > - ); > - return Status; > -} > diff --git a/SecurityPkg/Library/TpmCommLib/TpmComm.c > b/SecurityPkg/Library/TpmCommLib/TpmComm.c > deleted file mode 100644 > index dee64b24ffef..000000000000 > --- a/SecurityPkg/Library/TpmCommLib/TpmComm.c > +++ /dev/null > @@ -1,44 +0,0 @@ > -/** @file > - Basic TPM command functions. > - > -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#include "CommonHeader.h" > - > -/** > - Single function calculates SHA1 digest value for all raw data. It > - combines Sha1Init(), Sha1Update() and Sha1Final(). > - > - @param[in] Data Raw data to be digested. > - @param[in] DataLen Size of the raw data. > - @param[out] Digest Pointer to a buffer that stores the final d= igest. > - > - @retval EFI_SUCCESS Always successfully calculate the final dig= est. > -**/ > -EFI_STATUS > -EFIAPI > -TpmCommHashAll ( > - IN CONST UINT8 *Data, > - IN UINTN DataLen, > - OUT TPM_DIGEST *Digest > - ) > -{ > - VOID *Sha1Ctx; > - UINTN CtxSize; > - > - CtxSize =3D Sha1GetContextSize (); > - Sha1Ctx =3D AllocatePool (CtxSize); > - ASSERT (Sha1Ctx !=3D NULL); > - > - Sha1Init (Sha1Ctx); > - Sha1Update (Sha1Ctx, Data, DataLen); > - Sha1Final (Sha1Ctx, (UINT8 *)Digest); > - > - FreePool (Sha1Ctx); > - > - return EFI_SUCCESS; > -} > - > diff --git a/SecurityPkg/Include/Library/TpmCommLib.h > b/SecurityPkg/Include/Library/TpmCommLib.h > deleted file mode 100644 > index b9aca60b82a0..000000000000 > --- a/SecurityPkg/Include/Library/TpmCommLib.h > +++ /dev/null > @@ -1,281 +0,0 @@ > -/** @file > - This library is only intended to be used by TPM modules. > - It provides basic TPM Interface Specification (TIS) and Command funct= ions. > - > -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#ifndef _TPM_COMM_LIB_H_ > -#define _TPM_COMM_LIB_H_ > - > -#include > - > -typedef EFI_HANDLE TIS_TPM_HANDLE; > - > -/// > -/// TPM register base address. > -/// > -#define TPM_BASE_ADDRESS 0xfed40000 > - > -// > -// Set structure alignment to 1-byte > -// > -#pragma pack (1) > - > -// > -// Register set map as specified in TIS specification Chapter 10 > -// > -typedef struct { > - /// > - /// Used to gain ownership for this particular port. > - /// > - UINT8 Access; // 0 > - UINT8 Reserved1[7]; // 1 > - /// > - /// Controls interrupts. > - /// > - UINT32 IntEnable; // 8 > - /// > - /// SIRQ vector to be used by the TPM. > - /// > - UINT8 IntVector; // 0ch > - UINT8 Reserved2[3]; // 0dh > - /// > - /// What caused interrupt. > - /// > - UINT32 IntSts; // 10h > - /// > - /// Shows which interrupts are supported by that particular TPM. > - /// > - UINT32 IntfCapability; // 14h > - /// > - /// Status Register. Provides status of the TPM. > - /// > - UINT8 Status; // 18h > - /// > - /// Number of consecutive writes that can be done to the TPM. > - /// > - UINT16 BurstCount; // 19h > - UINT8 Reserved3[9]; > - /// > - /// Read or write FIFO, depending on transaction. > - /// > - UINT32 DataFifo; // 24 > - UINT8 Reserved4[0xed8]; // 28h > - /// > - /// Vendor ID > - /// > - UINT16 Vid; // 0f00h > - /// > - /// Device ID > - /// > - UINT16 Did; // 0f02h > - /// > - /// Revision ID > - /// > - UINT8 Rid; // 0f04h > - /// > - /// TCG defined configuration registers. > - /// > - UINT8 TcgDefined[0x7b]; // 0f05h > - /// > - /// Alias to I/O legacy space. > - /// > - UINT32 LegacyAddress1; // 0f80h > - /// > - /// Additional 8 bits for I/O legacy space extension. > - /// > - UINT32 LegacyAddress1Ex; // 0f84h > - /// > - /// Alias to second I/O legacy space. > - /// > - UINT32 LegacyAddress2; // 0f88h > - /// > - /// Additional 8 bits for second I/O legacy space extension. > - /// > - UINT32 LegacyAddress2Ex; // 0f8ch > - /// > - /// Vendor-defined configuration registers. > - /// > - UINT8 VendorDefined[0x70];// 0f90h > -} TIS_PC_REGISTERS; > - > -// > -// Restore original structure alignment > -// > -#pragma pack () > - > -// > -// Define pointer types used to access TIS registers on PC > -// > -typedef TIS_PC_REGISTERS *TIS_PC_REGISTERS_PTR; > - > -// > -// TCG Platform Type based on TCG ACPI Specification Version 1.00 > -// > -#define TCG_PLATFORM_TYPE_CLIENT 0 > -#define TCG_PLATFORM_TYPE_SERVER 1 > - > -// > -// Define bits of ACCESS and STATUS registers > -// > - > -/// > -/// This bit is a 1 to indicate that the other bits in this register ar= e valid. > -/// > -#define TIS_PC_VALID BIT7 > -/// > -/// Indicate that this locality is active. > -/// > -#define TIS_PC_ACC_ACTIVE BIT5 > -/// > -/// Set to 1 to indicate that this locality had the TPM taken away whil= e > -/// this locality had the TIS_PC_ACC_ACTIVE bit set. > -/// > -#define TIS_PC_ACC_SEIZED BIT4 > -/// > -/// Set to 1 to indicate that TPM MUST reset the > -/// TIS_PC_ACC_ACTIVE bit and remove ownership for localities less than > the > -/// locality that is writing this bit. > -/// > -#define TIS_PC_ACC_SEIZE BIT3 > -/// > -/// When this bit is 1, another locality is requesting usage of the TPM= . > -/// > -#define TIS_PC_ACC_PENDIND BIT2 > -/// > -/// Set to 1 to indicate that this locality is requesting to use TPM. > -/// > -#define TIS_PC_ACC_RQUUSE BIT1 > -/// > -/// A value of 1 indicates that a T/OS has not been established on the > platform > -/// > -#define TIS_PC_ACC_ESTABLISH BIT0 > - > -/// > -/// When this bit is 1, TPM is in the Ready state, > -/// indicating it is ready to receive a new command. > -/// > -#define TIS_PC_STS_READY BIT6 > -/// > -/// Write a 1 to this bit to cause the TPM to execute that command. > -/// > -#define TIS_PC_STS_GO BIT5 > -/// > -/// This bit indicates that the TPM has data available as a response. > -/// > -#define TIS_PC_STS_DATA BIT4 > -/// > -/// The TPM sets this bit to a value of 1 when it expects another byte = of > data for a command. > -/// > -#define TIS_PC_STS_EXPECT BIT3 > -/// > -/// Writes a 1 to this bit to force the TPM to re-send the response. > -/// > -#define TIS_PC_STS_RETRY BIT1 > - > -// > -// Default TimeOut value > -// > -#define TIS_TIMEOUT_A 750 * 1000 // 750ms > -#define TIS_TIMEOUT_B 2000 * 1000 // 2s > -#define TIS_TIMEOUT_C 750 * 1000 // 750ms > -#define TIS_TIMEOUT_D 750 * 1000 // 750ms > - > -// > -// Max TPM command/reponse length > -// > -#define TPMCMDBUFLENGTH 1024 > - > -/** > - Check whether the value of a TPM chip register satisfies the input BI= T > setting. > - > - @param[in] Register Address port of register to be checked. > - @param[in] BitSet Check these data bits are set. > - @param[in] BitClear Check these data bits are clear. > - @param[in] TimeOut The max wait time (unit MicroSecond) when > checking register. > - > - @retval EFI_SUCCESS The register satisfies the check bit. > - @retval EFI_TIMEOUT The register can't run into the expected sta= tus in > time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcWaitRegisterBits ( > - IN UINT8 *Register, > - IN UINT8 BitSet, > - IN UINT8 BitClear, > - IN UINT32 TimeOut > - ); > - > -/** > - Get BurstCount by reading the burstCount field of a TIS regiger > - in the time of default TIS_TIMEOUT_D. > - > - @param[in] TisReg Pointer to TIS register. > - @param[out] BurstCount Pointer to a buffer to store the go= t > BurstConut. > - > - @retval EFI_SUCCESS Get BurstCount. > - @retval EFI_INVALID_PARAMETER TisReg is NULL or BurstCount is NUL= L. > - @retval EFI_TIMEOUT BurstCount can't be got in time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcReadBurstCount ( > - IN TIS_PC_REGISTERS_PTR TisReg, > - OUT UINT16 *BurstCount > - ); > - > -/** > - Set TPM chip to ready state by sending ready command > TIS_PC_STS_READY > - to Status Register in time. > - > - @param[in] TisReg Pointer to TIS register. > - > - @retval EFI_SUCCESS TPM chip enters into ready state. > - @retval EFI_INVALID_PARAMETER TisReg is NULL. > - @retval EFI_TIMEOUT TPM chip can't be set to ready state= in time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcPrepareCommand ( > - IN TIS_PC_REGISTERS_PTR TisReg > - ); > - > -/** > - Get the control of TPM chip by sending requestUse command > TIS_PC_ACC_RQUUSE > - to ACCESS Register in the time of default TIS_TIMEOUT_D. > - > - @param[in] TisReg Pointer to TIS register. > - > - @retval EFI_SUCCESS Get the control of TPM chip. > - @retval EFI_INVALID_PARAMETER TisReg is NULL. > - @retval EFI_NOT_FOUND TPM chip doesn't exit. > - @retval EFI_TIMEOUT Can't get the TPM control in time. > -**/ > -EFI_STATUS > -EFIAPI > -TisPcRequestUseTpm ( > - IN TIS_PC_REGISTERS_PTR TisReg > - ); > - > -/** > - Single function calculates SHA1 digest value for all raw data. It > - combines Sha1Init(), Sha1Update() and Sha1Final(). > - > - @param[in] Data Raw data to be digested. > - @param[in] DataLen Size of the raw data. > - @param[out] Digest Pointer to a buffer that stores the final d= igest. > - > - @retval EFI_SUCCESS Always successfully calculate the final dig= est. > -**/ > -EFI_STATUS > -EFIAPI > -TpmCommHashAll ( > - IN CONST UINT8 *Data, > - IN UINTN DataLen, > - OUT TPM_DIGEST *Digest > - ); > - > -#endif > diff --git a/SecurityPkg/Library/TpmCommLib/CommonHeader.h > b/SecurityPkg/Library/TpmCommLib/CommonHeader.h > deleted file mode 100644 > index 386c9fab44d9..000000000000 > --- a/SecurityPkg/Library/TpmCommLib/CommonHeader.h > +++ /dev/null > @@ -1,23 +0,0 @@ > -/** @file > - The intenal header file for TpmCommLib. > - > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#ifndef _TPMCOMMLIB_COMMON_HEADER_H_ > -#define _TPMCOMMLIB_COMMON_HEADER_H_ > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#endif > diff --git a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf > b/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf > deleted file mode 100644 > index 4caabd496f59..000000000000 > --- a/SecurityPkg/Library/TpmCommLib/TpmCommLib.inf > +++ /dev/null > @@ -1,45 +0,0 @@ > -## @file > -# Provides some common functions for the TCG feature > -# > -# This instance provides basic TPM Interface Specification (TIS) funct= ions > -# and TPM hashall function. > -# > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > -## > - > -[Defines] > - INF_VERSION =3D 0x00010005 > - BASE_NAME =3D TpmCommLib > - MODULE_UNI_FILE =3D TpmCommLib.uni > - FILE_GUID =3D 7d9fe32e-a6a9-4cdf-abff-10cc7f22e1= c9 > - MODULE_TYPE =3D PEIM > - VERSION_STRING =3D 1.0 > - LIBRARY_CLASS =3D TpmCommLib|DXE_DRIVER UEFI_DRIVER > PEIM DXE_SMM_DRIVER > - > -# > -# The following information is for reference only and not required by t= he > build tools. > -# > -# VALID_ARCHITECTURES =3D IA32 X64 > -# > - > -[Sources] > - TisPc.c > - TpmComm.c > - CommonHeader.h > - > -[Packages] > - MdePkg/MdePkg.dec > - SecurityPkg/SecurityPkg.dec > - CryptoPkg/CryptoPkg.dec > - > -[LibraryClasses] > - BaseLib > - BaseMemoryLib > - IoLib > - TimerLib > - BaseCryptLib > - MemoryAllocationLib > - DebugLib > - > diff --git a/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni > b/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni > deleted file mode 100644 > index 96194551be88..000000000000 > --- a/SecurityPkg/Library/TpmCommLib/TpmCommLib.uni > +++ /dev/null > @@ -1,17 +0,0 @@ > -// /** @file > -// Provides some common functions for the TCG feature > -// > -// This instance provides basic TPM Interface Specification (TIS) funct= ions > -// and TPM hashall function. > -// > -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. > -// > -// SPDX-License-Identifier: BSD-2-Clause-Patent > -// > -// **/ > - > - > -#string STR_MODULE_ABSTRACT #language en-US "Provides some > common functions for the TCG feature" > - > -#string STR_MODULE_DESCRIPTION #language en-US "This instance > provides basic TPM Interface Specification (TIS) functions and TPM hasha= ll > function." > - > diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec > index ce2a9d33a4f2..3511cfb2cb85 100644 > --- a/SecurityPkg/SecurityPkg.dec > +++ b/SecurityPkg/SecurityPkg.dec > @@ -55,10 +55,6 @@ [LibraryClasses] > # > Tpm12DeviceLib|Include/Library/Tpm12DeviceLib.h >=20 > - ## @libraryclass Provides TPM Interface Specification (TIS) interfa= ces for > TPM command. > - # > - TpmCommLib|Include/Library/TpmCommLib.h > - > ## @libraryclass Provides support for TCG Physical Presence Interfa= ce > (PPI) specification > # >=3D 128 Vendor Specific PPI Operation. > # > diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc > index aef2ac3a208d..e2ac1e4a9e1c 100644 > --- a/SecurityPkg/SecurityPkg.dsc > +++ b/SecurityPkg/SecurityPkg.dsc > @@ -47,7 +47,6 @@ [LibraryClasses] > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf > - TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf >=20 > PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSec > ureLibNull.inf >=20 > TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/Dx > eTcgPhysicalPresenceLib.inf >=20 > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTp > mMeasurementLib.inf > @@ -155,7 +154,6 @@ [Components] > # TPM > # > SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf > - SecurityPkg/Library/TpmCommLib/TpmCommLib.inf >=20 > SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib. > inf > SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf > SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf > -- > 2.18.0.windows.1 >=20 >=20 >=20