summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaymes Wilks <mjwilks@us.ibm.com>2018-04-30 10:31:36 -0500
committerWilliam G. Hoffa <wghoffa@us.ibm.com>2018-05-17 15:39:31 -0400
commit079de8c7c0f7c104822ee34e67d426836834e623 (patch)
tree8daa85d180bf6b2a473929ae235d2d4bd46dfec1
parent1fd1cc97eb824b7853e652379ba8698c519512e2 (diff)
downloadtalos-hostboot-079de8c7c0f7c104822ee34e67d426836834e623.tar.gz
talos-hostboot-079de8c7c0f7c104822ee34e67d426836834e623.zip
Remove workarounds for multinode HDAT support
This change does two things: -removes the eyecatch workaround for HDAT TPM data multinode support -fixes the loop that adds eye catches to HDAT TPM data for the openpower case Change-Id: I80a7f279783da63e6cde88447d75c0a79b428540 RTC:190522 CMVC-Prereq:1048762 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58031 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
-rw-r--r--src/usr/hdat/hdattpmdata.C4
-rw-r--r--src/usr/runtime/populate_hbruntime.C7
2 files changed, 2 insertions, 9 deletions
diff --git a/src/usr/hdat/hdattpmdata.C b/src/usr/hdat/hdattpmdata.C
index 9337c7b9e..34f50e35f 100644
--- a/src/usr/hdat/hdattpmdata.C
+++ b/src/usr/hdat/hdattpmdata.C
@@ -175,10 +175,10 @@ errlHndl_t HdatTpmData::hdatLoadTpmData(uint32_t &o_size, uint32_t &o_count)
// work here would just be duplicated later during the runtime istep.
// add the format magic number
- iv_hdatTpmData->hdatHdr.hdatStructId = HDAT::HDAT_HDIF_STRUCT_ID;
+ l_hdatTpmData->hdatHdr.hdatStructId = HDAT::HDAT_HDIF_STRUCT_ID;
// add the eyecatcher
- memcpy(iv_hdatTpmData->hdatHdr.hdatStructName,
+ memcpy(l_hdatTpmData->hdatHdr.hdatStructName,
g_hdatTpmDataEyeCatch,
strlen(g_hdatTpmDataEyeCatch));
diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C
index de2ddb439..40899ecf5 100644
--- a/src/usr/runtime/populate_hbruntime.C
+++ b/src/usr/runtime/populate_hbruntime.C
@@ -1569,13 +1569,6 @@ errlHndl_t populate_TpmInfoByNode(const uint64_t i_instance)
break;
}
- // TODO RTC 190522 - Remove the following two lines of code once FSP
- // adds missing eyecatch and magic number to non-master nodes
- l_hdatTpmData->hdatHdr.hdatStructId = HDAT::HDAT_HDIF_STRUCT_ID;
- memcpy(l_hdatTpmData->hdatHdr.hdatStructName,
- HDAT::g_hdatTpmDataEyeCatch,
- strlen(HDAT::g_hdatTpmDataEyeCatch));
-
// check that hdat structure format and eye catch were filled out
if(l_hdatTpmData->hdatHdr.hdatStructId != HDAT::HDAT_HDIF_STRUCT_ID)
{
OpenPOWER on IntegriCloud