scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix one-time init

Browse Source 
Change-Id: Ie8b4f5b1b7493b16b69eb41531ec3362d4b3679f

BUG=chrome-os-partner:1101
TEST=manual testing of affected TPM on CRB

Review URL: http://codereview.chromium.org/3388008
This commit is contained in:
Randall Spangler
2010-09-15 15:57:58 -07:00
parent 89feaed8dc
commit 6eee220fcd
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/lib/rollback_index.c
View File

@@ -107,22 +107,37 @@ static uint32_t OneTimeInitializeTPM(RollbackSpaceFirmware* rsf,
ROLLBACK_SPACE_FIRMWARE_VERSION, 0, 0, 0}; ROLLBACK_SPACE_FIRMWARE_VERSION, 0, 0, 0};
static const RollbackSpaceKernel rsk_init = { static const RollbackSpaceKernel rsk_init = {
ROLLBACK_SPACE_KERNEL_VERSION, ROLLBACK_SPACE_KERNEL_UID, 0, 0}; ROLLBACK_SPACE_KERNEL_VERSION, ROLLBACK_SPACE_KERNEL_UID, 0, 0};
uint8_t nvlocked = 0; TPM_PERMANENT_FLAGS pflags;
uint32_t result;
VBDEBUG(("TPM: One-time initialization\n")); VBDEBUG(("TPM: One-time initialization\n"));
result = TlclGetPermanentFlags(&pflags);
if (result != TPM_SUCCESS)
return result;
/* TPM may come from the factory without physical presence finalized. Fix
* if necessary. */
VBDEBUG(("TPM: physicalPresenceLifetimeLock=%d\n",
pflags.physicalPresenceLifetimeLock));
if (!pflags.physicalPresenceLifetimeLock) {
VBDEBUG(("TPM: Finalizing physical presence\n"));
RETURN_ON_FAILURE(TlclFinalizePhysicalPresence()); RETURN_ON_FAILURE(TlclFinalizePhysicalPresence());
}
/* The TPM will not enforce the NV authorization restrictions until the /* The TPM will not enforce the NV authorization restrictions until the
* execution of a TPM_NV_DefineSpace with the handle of TPM_NV_INDEX_LOCK. * execution of a TPM_NV_DefineSpace with the handle of TPM_NV_INDEX_LOCK.
* Here we create that space if it doesn't already exist. */ * Here we create that space if it doesn't already exist. */
RETURN_ON_FAILURE(TlclGetFlags(NULL, NULL, &nvlocked)); VBDEBUG(("TPM: nvLocked=%d\n", pflags.nvLocked));
VBDEBUG(("TPM: nvlocked=%d\n", nvlocked)); if (!pflags.nvLocked) {
if (!nvlocked) {
VBDEBUG(("TPM: Enabling NV locking\n")); VBDEBUG(("TPM: Enabling NV locking\n"));
RETURN_ON_FAILURE(TlclSetNvLocked()); RETURN_ON_FAILURE(TlclSetNvLocked());
} }
/* Clear TPM owner, in case the TPM is already owned for some reason. */
VBDEBUG(("TPM: Clearing owner\n"));
RETURN_ON_FAILURE(TlclForceClear());
/* Initializes the firmware and kernel spaces */ /* Initializes the firmware and kernel spaces */
Memcpy(rsf, &rsf_init, sizeof(RollbackSpaceFirmware)); Memcpy(rsf, &rsf_init, sizeof(RollbackSpaceFirmware));
Memcpy(rsk, &rsk_init, sizeof(RollbackSpaceKernel)); Memcpy(rsk, &rsk_init, sizeof(RollbackSpaceKernel));

2
firmware/version.c
View File

@@ -1 +1 @@
char* VbootVersion = "VBOOv=9da5c30b"; char* VbootVersion = "VBOOv=dcd11496";