From 079de8c7c0f7c104822ee34e67d426836834e623 Mon Sep 17 00:00:00 2001 From: Jaymes Wilks Date: Mon, 30 Apr 2018 10:31:36 -0500 Subject: 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 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Nicholas E. Bofferding Reviewed-by: Michael Baiocchi Reviewed-by: William G. Hoffa --- src/usr/hdat/hdattpmdata.C | 4 ++-- src/usr/runtime/populate_hbruntime.C | 7 ------- 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) { -- cgit v1.2.1