From 4efa1130539e7a40a06e417770abfadf06e19d57 Mon Sep 17 00:00:00 2001 From: Nick Bofferding Date: Wed, 21 Jun 2017 09:08:26 -0500 Subject: [PATCH] Enable TPM related HDAT sections for all service processors Change-Id: I302a3c6ce5a6abfefc7f91ae46453e99ab255105 CMVC-Prereq: 1018579 RTC: 171851 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42213 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Reviewed-by: Stephen M. Cprek Reviewed-by: Michael Baiocchi Reviewed-by: Daniel M. Crowell --- src/usr/runtime/populate_hbruntime.C | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C index e7c6d1c8b1b..d0a43ed1d2c 100644 --- a/src/usr/runtime/populate_hbruntime.C +++ b/src/usr/runtime/populate_hbruntime.C @@ -1621,6 +1621,13 @@ errlHndl_t populate_TpmInfoByNode() auto i2cAryOff = l_pcrd->hdatPcrdIntData[HDAT::HDAT_PCRD_DA_HOST_I2C].hdatOffset; + // If pointer pair's offset value is 0, advance to next PCRD instance + // as this one has no I2C links + if(!i2cAryOff) + { + continue; + } + // Convert i2c array header offset to a pointer to the i2c array header const auto l_hostI2cPcrdHdrPtr = reinterpret_cast(l_pcrdAddr + i2cAryOff); @@ -1941,14 +1948,6 @@ errlHndl_t populate_hbTpmInfo() errlHndl_t l_elog = nullptr; do { - // TODO RTC 171851 Remove FSP restriction when FSP code provides - // Node TPM Related Data - - // Skip populating HDAT TPM Node Related Data on FSP systems - if (INITSERVICE::spBaseServicesEnabled()) - { - break; - } TRACFCOMP(g_trac_runtime, "Running populate_hbTpmInfo");