Add TPM Presence Info to HDAT

Populate HDAT TPM Section with TPM Presence Info by refering to
link IDs in HDAT PCRD section and verify that the PRCD section's
list of link IDs are unique and valid.

Change-Id: I49956aae129b325f55a6358caa0af4da1951b58c
RTC:170638
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39658
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 5 insertions, 16 deletions

diff --git a/src/usr/hdat/hdatcommonutil.C b/src/usr/hdat/hdatcommonutil.C
index 09d377d96..4e40119dd 100644
--- a/src/usr/hdat/hdatcommonutil.C
+++ b/src/usr/hdat/hdatcommonutil.C
@@ -86,7 +86,7 @@ uint32_t hdatTpmDataCalcMaxSize()
     l_size += sizeof(hdatTpmData_t);
 
     // account for the size of the TPM Info array header
-    l_size += sizeof(hdatSbTpmInfo_t);
+    l_size += sizeof(hdatHDIFDataArray_t);
 
     // account for each element of the TPM Info array
     l_size += ((sizeof(hdatSbTpmInstInfo_t) +
diff --git a/src/usr/hdat/hdatpcrd.C b/src/usr/hdat/hdatpcrd.C
index 8b46f156c..cd5b75ac1 100644
--- a/src/usr/hdat/hdatpcrd.C
+++ b/src/usr/hdat/hdatpcrd.C
@@ -76,9 +76,6 @@ const HdatKeywordInfo l_mvpdKeywords[] =
 
 };
 
-//Max number of I2c devices for any given proc
-#define HDAT_PCRD_MAX_I2C_DEV  64
-
 /*******************************************************************************
  * hdatSetPcrdHdrs
  *
diff --git a/src/usr/hdat/hdatpcrd.H b/src/usr/hdat/hdatpcrd.H
index 647c8779a..421c7c587 100644
--- a/src/usr/hdat/hdatpcrd.H
+++ b/src/usr/hdat/hdatpcrd.H
@@ -56,6 +56,9 @@ namespace HDAT
 const uint16_t HDAT_PCRD_VERSION    = 0x20;
 const char HDAT_PCRD_STRUCT_NAME[7] = "SPPCRD";
 
+//Max number of I2c devices for any given proc
+#define HDAT_PCRD_MAX_I2C_DEV  64
+
 /** @enum hdatDataPtrs
  * Enumeration which defines the data sections of the PCRD
  */
diff --git a/src/usr/hdat/hdattpmdata.H b/src/usr/hdat/hdattpmdata.H
index 369e30f28..b9ee44552 100644
--- a/src/usr/hdat/hdattpmdata.H
+++ b/src/usr/hdat/hdattpmdata.H
@@ -60,6 +60,7 @@ enum {
     TpmDataPtrCnt = 1,
     TpmDataChildStrCnt = 0,
     TpmDataChildStrOffset = 0,
+    TpmDataMinRqrdPcrdVersion = 0x1
 };
 
 /**
@@ -82,18 +83,6 @@ struct hdatTpmData_t
     uint8_t hdatReserved1[16]; // Padding for alignment and growth/compatibility
 } __attribute__ ((packed));
 
-
-/**
- * @brief  Structure definition for Secureboot TPM Info Array
- */
-struct hdatSbTpmInfo_t
-{
-    uint32_t hdatSbTpmArrayOffset;
-    uint32_t hdatSbTpmArrayNumEntries;
-    uint32_t hdatSbTpmArrayEntrySize;
-} __attribute__ ((packed));
-
-
 /**
  *  @brief Structure definition for Secureboot TPM Instance Info
  */