Trustedboot support for using TPM target

Change-Id: I362085fd81663b9b8ec56ed9e0670cf71fc851e4
RTC: 153386
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28482
Reviewed-by: Christopher J. Engel <cjengel@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 35 insertions, 29 deletions

diff --git a/src/usr/secureboot/trusted/test/trustedbootTest.H b/src/usr/secureboot/trusted/test/trustedbootTest.H
index e8b062ad7..e46a8ff4f 100755
--- a/src/usr/secureboot/trusted/test/trustedbootTest.H
+++ b/src/usr/secureboot/trusted/test/trustedbootTest.H
@@ -38,6 +38,9 @@
 #include <errl/errlentry.H>
 #include <i2c/tpmddif.H>
 #include <secureboot/trustedbootif.H>
+#include <targeting/common/predicates/predicates.H>
+#include <targeting/common/attributes.H>
+#include <targeting/common/utilFilter.H>
 #include "../trustedTypes.H"
 #include "../trustedboot.H"
 #include "../trustedbootCmds.H"
@@ -691,7 +694,6 @@ class TrustedBootTest: public CxxTest::TestSuite
      */
     TRUSTEDBOOT::TpmTarget getTestTarget()
     {
-        TARGETING::TargetService& tS = TARGETING::targetService();
         TRUSTEDBOOT::TpmTarget target;
         TPMDD::tpm_info_t tpmInfo;
 
@@ -699,37 +701,41 @@ class TrustedBootTest: public CxxTest::TestSuite
         target.initAttempted = true;
         target.failed = false;
 
-        tS.getMasterNodeTarget( target.nodeTarget );
-
-        assert(target.nodeTarget != NULL);
+        TARGETING::TargetHandleList tpmList;
+        TARGETING::getAllChips(tpmList,
+                               TARGETING::TYPE_TPM,
+                               false);
+        if (tpmList.size() > 0)
+        {
+            target.tpmTarget = tpmList[0];
 
-        TRACFCOMP( g_trac_trustedboot,
-                   "getTestTarget node tgt=0x%X chip=%d",
-                   TARGETING::get_huid(target.nodeTarget));
+            TRACFCOMP( g_trac_trustedboot,
+                       "getTestTarget tpm tgt=0x%X",
+                       TARGETING::get_huid(target.tpmTarget));
 
-        // Let's see if the requested chip is functional
-        target.chip = TPMDD::TPM_PRIMARY;
-        tpmInfo.chip = TPMDD::TPM_PRIMARY;
-        errlHndl_t err = tpmReadAttributes (target.nodeTarget,
-                                            tpmInfo);
+            // Let's see if the requested chip is functional
+            target.role = TPM_PRIMARY;
+            errlHndl_t err = tpmReadAttributes (target.tpmTarget,
+                                                tpmInfo);
 
-        if (NULL != err)
-        {
-            target.failed = true;
-            delete err;
-        }
-        else if (!tpmInfo.tpmEnabled)
-        {
-            TRACFCOMP(g_trac_trustedboot, "getTestTarget - "
-                      "Chip %d not enabled",
-                      tpmInfo.chip);
-            target.failed = true;
-        }
-        else
-        {
-            TRACFCOMP(g_trac_trustedboot, "getTestTarget - "
-                      "Chip %d enabled",
-                      target.chip);
+            if (NULL != err)
+            {
+                target.failed = true;
+                delete err;
+            }
+            else if (!tpmInfo.tpmEnabled)
+            {
+                TRACFCOMP(g_trac_trustedboot, "getTestTarget - "
+                          "Chip %d not enabled",
+                          target.role);
+                target.failed = true;
+            }
+            else
+            {
+                TRACFCOMP(g_trac_trustedboot, "getTestTarget - "
+                          "Chip %d enabled",
+                          target.role);
+            }
         }
 
         return target;