diff options
author | Jaymes Wilks <mjwilks@us.ibm.com> | 2017-01-20 10:31:30 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-07 16:24:36 -0500 |
commit | 21bcf18c2d4da4d3c6cb2d306c17422cdfc80ec6 (patch) | |
tree | 9cdb828c004a01b18085d98786213dc7f0b92b2e /src/usr/hdat | |
parent | 0c00bada7f1efe48f82005421e77994a19960b9f (diff) | |
download | talos-hostboot-21bcf18c2d4da4d3c6cb2d306c17422cdfc80ec6.tar.gz talos-hostboot-21bcf18c2d4da4d3c6cb2d306c17422cdfc80ec6.zip |
TPM Log Pass up to FSP Host
Adds hostboot functionality to populate the HDAT area with System
Security Settings, TPM Configuration bits, TPMs/Drawer and Hardware
Key Hash Values in the HDAT area for passing up to FSP hosts.
Change-Id: I34a9ec51d0311a0a7bc5468a8261a1276b0e5f7a
RTC:125306
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35163
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/hdat')
-rwxr-xr-x | src/usr/hdat/hdatiplparms.C | 31 | ||||
-rwxr-xr-x | src/usr/hdat/hdatiplparms.H | 3 |
2 files changed, 8 insertions, 26 deletions
diff --git a/src/usr/hdat/hdatiplparms.C b/src/usr/hdat/hdatiplparms.C index 33f2c4b3f..900dbf07c 100755 --- a/src/usr/hdat/hdatiplparms.C +++ b/src/usr/hdat/hdatiplparms.C @@ -773,32 +773,15 @@ void HdatIplParms::hdatGetSystemParamters() HDAT_ERR("Error in getting SYSTEM_BRAND_NAME"); } - //TODO RTC Story 161867 - //Need to remove the hard coding data - this->iv_hdatIPLParams->iv_sysParms.hdatTpmDrawer = 1; + // The next 4 fields are set to their final values in a common handler + // in istep 21.1, to avoid trust issues when HDAT is initially populated + // by a service processor + this->iv_hdatIPLParams->iv_sysParms.hdatSysSecuritySetting = 0; - TARGETING::ATTR_SECURITY_ENABLE_type l_sysSecuritySetting; - if(l_pSysTarget->tryGetAttr<TARGETING::ATTR_SECURITY_ENABLE> - (l_sysSecuritySetting)) - { - this->iv_hdatIPLParams->iv_sysParms.hdatSysSecuritySetting = - l_sysSecuritySetting; - } - else - { - HDAT_ERR("Error in getting SECURITY_ENABLE attribute"); - } + this->iv_hdatIPLParams->iv_sysParms.hdatTpmConfBits = 0; + + this->iv_hdatIPLParams->iv_sysParms.hdatTpmDrawer = 0; - TARGETING::ATTR_TPM_REQUIRED_type l_tpmConfBits; - if(l_pSysTarget->tryGetAttr<TARGETING::ATTR_TPM_REQUIRED> - (l_tpmConfBits)) - { - this->iv_hdatIPLParams->iv_sysParms.hdatTpmConfBits = l_tpmConfBits; - } - else - { - HDAT_ERR("Error in getting TPM_REQUIRED attribute"); - } memset(this->iv_hdatIPLParams->iv_sysParms.hdatHwKeyHashValue, 0x00, 64); memset(this->iv_hdatIPLParams->iv_sysParms.hdatSystemFamily, 0x00, 64); diff --git a/src/usr/hdat/hdatiplparms.H b/src/usr/hdat/hdatiplparms.H index c8117aeb1..bdbfeb5db 100755 --- a/src/usr/hdat/hdatiplparms.H +++ b/src/usr/hdat/hdatiplparms.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -58,7 +58,6 @@ const uint16_t HDAT_IPL_PARAMS_VERSION = 0x5F; const char HDAT_IPLP_STRUCT_NAME[7] = "IPLPMS"; - /** @enum hdatDataPtrs * Constants for the internal data pointers that are added to the base * class |