From 37ad6f7b1a53aaaf063c0cca2baf42da92571139 Mon Sep 17 00:00:00 2001 From: Chris Engel Date: Fri, 16 Oct 2015 13:21:21 -0500 Subject: Trustedboot: Move data to Hostboot base and add pcrExtend stub function Change-Id: Id488af88c7f1796606434a062a9001f31f413ac0 RTC: 125288 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21475 Tested-by: Jenkins Server Reviewed-by: Timothy R. Block Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: A. Patrick Williams III --- src/usr/secureboot/trusted/trustedboot.H | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/usr/secureboot/trusted/trustedboot.H') diff --git a/src/usr/secureboot/trusted/trustedboot.H b/src/usr/secureboot/trusted/trustedboot.H index 5c1c87e15..fa5e085fe 100644 --- a/src/usr/secureboot/trusted/trustedboot.H +++ b/src/usr/secureboot/trusted/trustedboot.H @@ -33,6 +33,7 @@ // ----------------------------------------------- // Includes // ----------------------------------------------- +#include namespace TRUSTEDBOOT { @@ -42,23 +43,28 @@ enum MAX_SYSTEM_TPMS = 2, BUFSIZE = 256, TPM_MASTER_INDEX = 0, ///< Index into tpmTargets array for master chip - TPM_REDUNDANT_INDEX = 1, ///< Index for redundant chip TPM + TPM_BACKUP_INDEX = 1, ///< Index for backup chip TPM }; -/// Track system TPM status -struct TpmTarget -{ - TARGETING::Target* nodeTarget; - TPMDD::tpm_chip_types_t chip; ///< Chip Pri vs Backup - uint8_t functional:1; ///< Is TPM currently functional -} tpmTargets[MAX_SYSTEM_TPMS]; /** * @brief Initialize the targetted TPM - * @param[in/out] target Current TPM target structure + * @param[in/out] io_target Current TPM target structure + * @param[in] i_nodeTarget Node Target + * @param[in] i_chip Chip to initialize */ -void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target); + void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target, + TARGETING::Target* i_nodeTarget, + TPMDD::tpm_chip_types_t i_chip); + +/// Class object to store system TPM information +class SystemTpms +{ +public: + SystemTpms(); + TpmTarget tpm[MAX_SYSTEM_TPMS]; +}; // Command structures taken from TPM Main - Part3 commands v 1.2 rev116 -- cgit v1.2.1