diff options
Diffstat (limited to 'src/include/usr')
| -rw-r--r-- | src/include/usr/devicefw/userif.H | 9 | ||||
| -rw-r--r-- | src/include/usr/i2c/tpmddif.H | 16 | ||||
| -rw-r--r-- | src/include/usr/secureboot/trustedbootif.H | 8 |
3 files changed, 27 insertions, 6 deletions
diff --git a/src/include/usr/devicefw/userif.H b/src/include/usr/devicefw/userif.H index 50a6aa2e9..5f42ff8f4 100644 --- a/src/include/usr/devicefw/userif.H +++ b/src/include/usr/devicefw/userif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -326,11 +326,14 @@ namespace DeviceFW * tpm_op_types_t in tpmddif.H * @param[in] i_command_len Command length to write during transmit * operations + * @param[in] i_locality The TPM locality to use. See tpm_locality_t + * in tpmddif.H */ - #define DEVICE_TPM_ADDRESS( i_tpm_op, i_command_len )\ + #define DEVICE_TPM_ADDRESS( i_tpm_op, i_command_len, i_locality ) \ DeviceFW::TPM,\ static_cast<uint64_t>(( i_tpm_op )),\ - static_cast<uint64_t>(( i_command_len )) + static_cast<uint64_t>(( i_command_len )),\ + static_cast<uint64_t>(( i_locality )) /** * Construct the device addressing parameters for the GPIO port extender ops diff --git a/src/include/usr/i2c/tpmddif.H b/src/include/usr/i2c/tpmddif.H index 67602c2be..9691450d6 100644 --- a/src/include/usr/i2c/tpmddif.H +++ b/src/include/usr/i2c/tpmddif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -50,6 +50,15 @@ enum tpm_addr_size_t }; /** + * @brief TPM Locality to address for operation + */ +enum tpm_locality_t +{ + TPM_LOCALITY_0 = 0, + TPM_LOCALITY_4 = 4, +}; + +/** * @brief Structure of common parameters needed by different parts of * the code. */ @@ -92,11 +101,14 @@ bool tpmPresence ( TARGETING::Target * i_target); * @param[in/out] io_tpmInfo The structure that will contain the attribute data * read from the target device. Chip field must be set * + * @param[in] i_locality TPM locality to address + * * @return errlHndl_t NULL if successful, otherwise a pointer to the * error log. */ errlHndl_t tpmReadAttributes ( TARGETING::Target * i_target, - tpm_info_t & io_tpmInfo ); + tpm_info_t & io_tpmInfo, + tpm_locality_t i_locality); }; // end namespace TPMDD diff --git a/src/include/usr/secureboot/trustedbootif.H b/src/include/usr/secureboot/trustedbootif.H index eaef78a74..3a849aed2 100644 --- a/src/include/usr/secureboot/trustedbootif.H +++ b/src/include/usr/secureboot/trustedbootif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -80,6 +80,12 @@ namespace TRUSTEDBOOT PCR_6 = 6, PCR_7 = 7, PCR_DEBUG = 16, + PCR_DRTM_17 = 17, + PCR_DRTM_18 = 18, + PCR_DRTM_19 = 19, + PCR_DRTM_20 = 20, + PCR_DRTM_21 = 21, + PCR_DRTM_22 = 22, PLATFORM_PCR = 24, ///< The number of PCR required by the platform spec IMPLEMENTATION_PCR = 24, ///< The number of PCRs implemented by TPM } TPM_Pcr; |
