tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change TPM ACCESS_X.activeLocality test timeout to TIMEOUT_A

Browse Source 
Signed-off-by : chao zhang<chao.b.zhang@intel.com>
Reviewed-by   : dong guo  <guo.dong@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13849 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
czhang46 2012-10-16 02:58:08 +00:00
parent 89be2b037f
commit f941becdd8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SecurityPkg/Include/Library/TpmCommLib.h
View File

@ -2,7 +2,7 @@
Ihis library is only intended to be used by TPM modules. Ihis library is only intended to be used by TPM modules.
It provides basic TPM Interface Specification (TIS) and Command functions. It provides basic TPM Interface Specification (TIS) and Command functions.
Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -185,6 +185,7 @@ typedef TIS_PC_REGISTERS *TIS_PC_REGISTERS_PTR;
// //
// Default TimeOut value // Default TimeOut value
// //
#define TIS_TIMEOUT_A 750 * 1000 // 750ms
#define TIS_TIMEOUT_B 2000 * 1000 // 2s #define TIS_TIMEOUT_B 2000 * 1000 // 2s
#define TIS_TIMEOUT_C 750 * 1000 // 750ms #define TIS_TIMEOUT_C 750 * 1000 // 750ms
#define TIS_TIMEOUT_D 750 * 1000 // 750ms #define TIS_TIMEOUT_D 750 * 1000 // 750ms

9
SecurityPkg/Library/TpmCommLib/TisPc.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Basic TIS (TPM Interface Specification) functions. Basic TIS (TPM Interface Specification) functions.
Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -144,7 +144,7 @@ TisPcPrepareCommand (
/** /**
Get the control of TPM chip by sending requestUse command TIS_PC_ACC_RQUUSE 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. to ACCESS Register in the time of default TIS_TIMEOUT_A.
@param[in] TisReg Pointer to TIS register. @param[in] TisReg Pointer to TIS register.
@ -170,11 +170,14 @@ TisPcRequestUseTpm (
} }
MmioWrite8((UINTN)&TisReg->Access, TIS_PC_ACC_RQUUSE); MmioWrite8((UINTN)&TisReg->Access, TIS_PC_ACC_RQUUSE);
//
// No locality set before, ACCESS_X.activeLocality MUST be valid within TIMEOUT_A
//
Status = TisPcWaitRegisterBits ( Status = TisPcWaitRegisterBits (
&TisReg->Access, &TisReg->Access,
(UINT8)(TIS_PC_ACC_ACTIVE |TIS_PC_VALID), (UINT8)(TIS_PC_ACC_ACTIVE |TIS_PC_VALID),
0, 0,
TIS_TIMEOUT_D TIS_TIMEOUT_A
); );
return Status; return Status;
} }