Enable tpmddtest.H for Axone

Simics now supports VENDORID_75x.

Change-Id: Ic74f6d26ef791b0807c9c6441536348dac062294
RTC:201738
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79060
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 24 insertions, 12 deletions

diff --git a/src/usr/i2c/test/tpmddtest.H b/src/usr/i2c/test/tpmddtest.H
index 8cd1fbc2c..0ea987949 100755
--- a/src/usr/i2c/test/tpmddtest.H
+++ b/src/usr/i2c/test/tpmddtest.H
@@ -111,21 +111,33 @@ class TPMDDTest: public CxxTest::TestSuite
             uint32_t data = 0x0;
             size_t dataSize = sizeof(data);
 
+            // default to most common ID
+            uint32_t expected_vendorID = TPMDD::TPM_VENDORID_65x;
+            uint8_t tpmModel = TPM_MODEL_UNDETERMINED;
+
             TRACFCOMP( g_trac_tpmdd,
                        "testTPMReadVendorID - Start" );
 
             do
             {
-#ifdef CONFIG_AXONE_BRING_UP
-                TRACFCOMP( g_trac_tpmdd,"Skipping test on Axone" );
-                break;
-#endif
-
                 // Get a TPM Target
                 TARGETING::Target* testTarget = getTestTarget();
                 if (NULL == testTarget)
                 {
-                    continue;
+                    break;
+                }
+
+                if ( !(testTarget->tryGetAttr<ATTR_TPM_MODEL>(tpmModel)) )
+                {
+                    TS_FAIL("Unable to read ATTR_TPM_MODEL for %.8X target",
+                      get_huid(testTarget));
+                    break;
+                }
+
+                // This should match Axone and later systems
+                if (TPM_MODEL_75x == tpmModel)
+                {
+                    expected_vendorID = TPMDD::TPM_VENDORID_75x;
                 }
 
                 num_ops++;
@@ -144,16 +156,16 @@ class TPMDDTest: public CxxTest::TestSuite
                                 TPMDD_COMP_ID );
                     delete err;
                     err = NULL;
-                    continue;
+                    break;
                 }
                 else if ((data & TPMDD::TPM_VENDORID_MASK)
-                         // Only 65x supported in simics for now:
-                           != TPMDD::TPM_VENDORID_65x)
+                           != expected_vendorID)
                 {
                     fails++;
                     TS_FAIL( "testTPMReadVendorID - Failed to read "
-                             "correct vendor id ID=0x%X", data);
-                    continue;
+                             "correct vendor id ID=0x%X, expected 0x%X", data,
+                             expected_vendorID);
+                    break;
 
                 }
                 else
@@ -161,7 +173,7 @@ class TPMDDTest: public CxxTest::TestSuite
                     TRACUCOMP(g_trac_tpmdd, "testTPMReadVendorID - "
                               "VendorID returned as expected. ID=0x%X",
                               data);
-                    continue;
+                    break;
                 }
             } while( 0 );
             TRACFCOMP( g_trac_tpmdd,