From 9439d0e1218e8a910608ac8b6813103699ec06d5 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 19 Apr 2018 20:04:02 -0700 Subject: cr50: use new function to verify index presence The new TPM API function works even before TPM Startup was executed, this would allow CCD to read FWMP even if the AP does not boot up. CQ-DEPEND=CL:1020725 BRANCH=cr50, cr50-mp BUG=b:67009375 TEST=verified that FWMP can be read both before and after AP is booted, and that missing FWMP is also processed properly in both cases. Change-Id: I4e57e6211fdb8fa3166f261aa861dba9bab433a1 Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/1020785 Reviewed-by: Andrey Pronin --- board/cr50/tpm_nvmem_read.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/cr50/tpm_nvmem_read.c b/board/cr50/tpm_nvmem_read.c index c71c7cce0c..c02ac2afb0 100644 --- a/board/cr50/tpm_nvmem_read.c +++ b/board/cr50/tpm_nvmem_read.c @@ -19,12 +19,12 @@ enum tpm_read_rv read_tpm_nvmem(uint16_t obj_index, uint16_t obj_size, void *obj_value) { - TPMI_RH_NV_INDEX object_handle; + TPM_HANDLE object_handle; NV_INDEX nvIndex; object_handle = HR_NV_INDEX + obj_index; - if (NvIndexIsAccessible(object_handle, - TPM_CC_NV_Read) != TPM_RC_SUCCESS) { + + if (!NvEarlyStageFindHandle(object_handle)) { CPRINTF("%s: object at 0x%x not found\n", __func__, obj_index); return tpm_read_not_found; } -- cgit v1.2.1