Adding interface changes to provide I2C information to HDAT

This is the first of two commits, this includes the I2C information
that hostboot is already aware of (EEProm and TPM).  There will be
a later commit that pulls in the new information from the MRW.

Change-Id: I33b0cd7784b242de3b68a3e7b07527604d819c23
RTC:161649
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32437
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: NAGENDRA K. GURRAM <nagendra.g@in.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 436 insertions, 4 deletions

diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index 55cb4b663..850e5c2fc 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -50,6 +50,10 @@
 #include <attributetraits.H>
 #include "i2c.H"
 #include "errlud_i2c.H"
+#include "tpmdd.H"
+#include <secureboot/trustedbootif.H>
+#include <i2c/eepromif.H>
+#include <i2c/tpmddif.H>
 
 // ----------------------------------------------
 // Globals
@@ -3795,7 +3799,196 @@ void getMasterInfo( const TARGETING::Target* i_chip,
 void getDeviceInfo( TARGETING::Target* i_i2cMaster,
                     std::vector<DeviceInfo_t>& o_deviceInfo )
 {
-    //@TODO-RTC:161649-Fill in information for HDAT
+    TRACFCOMP(g_trac_i2c,"getDeviceInfo>>");
+
+    //Get list of all I2C Masters
+    std::list<I2C::MasterInfo_t> l_i2cInfo;
+    I2C::getMasterInfo( i_i2cMaster, l_i2cInfo );
+
+    //Find all the EEPROMs connected via i2c
+    std::list<EEPROM::EepromInfo_t> l_eepromInfo;
+    EEPROM::getEEPROMs( l_eepromInfo );
+
+    //Find all TPMs
+#ifdef CONFIG_TPMDD
+    TPMDD::tpm_info_t tpmInfo;
+    errlHndl_t l_err = NULL;
+    std::list<TRUSTEDBOOT::TpmTarget> l_tpmTarget;
+    TRUSTEDBOOT::getTPMs(l_tpmTarget);
+#endif
+
+    for( std::list<I2C::MasterInfo_t>::iterator i2cm = l_i2cInfo.begin();
+         i2cm != l_i2cInfo.end();
+         ++i2cm )
+    {
+        /* I2C Busses */
+        std::list<EEPROM::EepromInfo_t>::iterator l_eep = l_eepromInfo.begin();
+        while( l_eep != l_eepromInfo.end() )
+        {
+            DeviceInfo_t l_currentDI;
+
+            //ignore the devices that aren't on the current target
+            if( l_eep->i2cMaster != i_i2cMaster )
+            {
+                l_eep = l_eepromInfo.erase(l_eep);
+                continue;
+            }
+
+            //skip the devices that are on a different engine
+            else if( l_eep->engine != i2cm->engine)
+            {
+                ++l_eep;
+                continue;
+            }
+
+            l_currentDI.masterChip = l_eep->i2cMaster;
+            l_currentDI.engine = l_eep->engine;
+            l_currentDI.masterPort = l_eep->port;
+            l_currentDI.addr = l_eep->devAddr;
+            l_currentDI.slavePort = 0xFF;
+            l_currentDI.busFreqKhz = (l_eep->busFreq) * 1000;
+            l_currentDI.deviceType = TARGETING::HDAT_I2C_DEVICE_TYPE_SEEPROM;
+            switch(l_eep->device)
+            {
+                case EEPROM::VPD_PRIMARY:
+                case EEPROM::VPD_BACKUP:
+                    l_currentDI.devicePurpose =
+                            TARGETING::HDAT_I2C_DEVICE_PURPOSE_MODULE_VPD;
+                    //TODO RTC:165485 this isn't currently right. we'll need
+                    //to add the changes in the enum and possibly the other
+                    //struct/attribute.
+                    break;
+                case EEPROM::SBE_PRIMARY:
+                case EEPROM::SBE_BACKUP:
+                    l_currentDI.devicePurpose =
+                            TARGETING::HDAT_I2C_DEVICE_PURPOSE_SBE_SEEPROM;
+                    break;
+                case EEPROM::LAST_CHIP_TYPE:
+                    break;
+            }
+
+            o_deviceInfo.push_back(l_currentDI);
+            l_eep = l_eepromInfo.erase(l_eep);
+        } //end of eeprom iter
+
+#ifdef CONFIG_TPMDD
+        std::list<TRUSTEDBOOT::TpmTarget>::iterator l_tpm = l_tpmTarget.begin();
+        while( l_tpm != l_tpmTarget.end() )
+        {
+            DeviceInfo_t l_currentDI;
+            TPMDD::tpm_locality_t locality = TPMDD::TPM_LOCALITY_0;
+
+            // Lookup i2c info for the TPM
+            l_err = TPMDD::tpmReadAttributes(l_tpm->tpmTarget,
+                                             tpmInfo, locality);
+            if( NULL != l_err )
+            {
+                // Unable to get info, so we skip
+                delete l_err;
+                l_tpm = l_tpmTarget.erase(l_tpm);
+                continue;
+            }
+            // ignore the devices that aren't on the current target
+            if( tpmInfo.i2cTarget != i_i2cMaster )
+            {
+                l_tpm = l_tpmTarget.erase(l_tpm);
+                continue;
+            }
+            // skip the devices that are on a different engine
+            else if( tpmInfo.engine != i2cm->engine )
+            {
+                ++l_tpm;
+                continue;
+            }
+
+            l_currentDI.masterChip = tpmInfo.i2cTarget;
+            l_currentDI.engine = tpmInfo.engine;
+            l_currentDI.masterPort = tpmInfo.port;
+            l_currentDI.addr = tpmInfo.devAddr;
+            l_currentDI.slavePort = 0xFF;
+            l_currentDI.busFreqKhz = (tpmInfo.busFreq) * 1000;
+            l_currentDI.deviceType =
+                    TARGETING::HDAT_I2C_DEVICE_TYPE_NUVOTON_TPM;
+            l_currentDI.devicePurpose = TARGETING::HDAT_I2C_DEVICE_PURPOSE_TPM;
+
+            o_deviceInfo.push_back(l_currentDI);
+
+            l_tpm = l_tpmTarget.erase(l_tpm);
+
+        } //end of tpm iter
+#endif
+
+    } //end of i2cm
+
+#if CONFIG_INCLUDE_XML_OPENPOWER
+    TARGETING::Target * sys = NULL;
+    TARGETING::targetService().getTopLevelTarget(sys);
+
+    //need to get all targets here, and pull it out.
+    TARGETING::TargetHandleList pChildList;
+
+    TARGETING::targetService().getAssociated(pChildList, sys,
+                    TARGETING::TargetService::CHILD,
+                    TARGETING::TargetService::ALL);
+    pChildList.push_back(sys);
+
+    for(TARGETING::TargetHandleList::const_iterator childItr =
+        pChildList.begin();
+        childItr != pChildList.end(); ++childItr)
+    {
+        TARGETING::ATTR_HDAT_I2C_ENGINE_type l_i2cEngine;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_ENGINE>(l_i2cEngine);
+
+        if(l_i2cEngine[0] == 0)
+        {
+            continue;
+        }
+
+        TARGETING::ATTR_HDAT_I2C_MASTER_PORT_type l_i2cMasterPort;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_MASTER_PORT>(
+                                                    l_i2cMasterPort);
+        TARGETING::ATTR_HDAT_I2C_DEVTYPE_type l_i2cDevType;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_DEVTYPE>(
+                                                    l_i2cDevType);
+        TARGETING::ATTR_HDAT_I2C_ADDR_type l_i2cAddr;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_ADDR>(l_i2cAddr);
+        TARGETING::ATTR_HDAT_I2C_SLAVE_PORT_type l_i2cSlavePort;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_SLAVE_PORT>(
+                                                    l_i2cSlavePort);
+        TARGETING::ATTR_HDAT_I2C_BUS_FREQ_type l_i2cBusFreq;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_BUS_FREQ>(
+                                                    l_i2cBusFreq);
+        TARGETING::ATTR_HDAT_I2C_DEV_PURPOSE_type l_i2cDevPurpose;
+        (*childItr)->tryGetAttr<TARGETING::ATTR_HDAT_I2C_DEV_PURPOSE>(
+                                                    l_i2cDevPurpose);
+
+        uint8_t l_arrayLength =
+                (*childItr)->getAttr<TARGETING::ATTR_HDAT_I2C_ELEMENTS>();
+
+        if(l_arrayLength == 0)
+        {
+            //The arrays are empty
+            continue;
+        }
+        for(uint8_t l_idx=0;
+                    l_idx < l_arrayLength;
+                    l_idx++)
+        {
+            DeviceInfo_t l_currentDevice;
+            l_currentDevice.engine = l_i2cEngine[l_idx];
+            l_currentDevice.masterPort = l_i2cMasterPort[l_idx];
+            l_currentDevice.addr = l_i2cAddr[l_idx];
+            l_currentDevice.slavePort = l_i2cSlavePort[l_idx];
+            l_currentDevice.busFreqKhz = l_i2cBusFreq[l_idx] * 1000;
+            l_currentDevice.deviceType = l_i2cDevType[l_idx];
+            l_currentDevice.devicePurpose = l_i2cDevPurpose[l_idx];
+
+            o_deviceInfo.push_back(l_currentDevice);
+        }
+    }
+#endif
+
+    TRACFCOMP(g_trac_i2c,"<<getDeviceInfo");
     return;
 };
 
diff --git a/src/usr/i2c/test/i2ctest.H b/src/usr/i2c/test/i2ctest.H
index cfef791a6..cad73ada1 100755
--- a/src/usr/i2c/test/i2ctest.H
+++ b/src/usr/i2c/test/i2ctest.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -1029,6 +1029,27 @@ class I2CTest: public CxxTest::TestSuite
             }
         }
 
+        void test_getDeviceInfo( void )
+        {
+            TRACFCOMP(g_trac_i2c, "test_getDeviceInfo - Start");
+
+            TARGETING::TargetService& tS = TARGETING::targetService();
+            TARGETING::Target * sys = NULL;
+            tS.getTopLevelTarget(sys);
+
+            std::vector<I2C::DeviceInfo_t> l_deviceInfo;
+
+            getDeviceInfo( sys, l_deviceInfo);
+
+            std::vector<I2C::DeviceInfo_t>::const_iterator devInfo_iter;
+            for(devInfo_iter = l_deviceInfo.begin();
+                devInfo_iter != l_deviceInfo.end();
+                devInfo_iter++)
+            {
+                TRACFCOMP(g_trac_i2c, "Found Device Info: Engine %d",devInfo_iter->engine);
+            }
+
+        }
 
         /**
          * @brief Verify the functions that create the userdata values
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 0284a8399..a708890d9 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -33042,4 +33042,86 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<enumerationType>
+    <id>HDAT_I2C_DEVICE_TYPE</id>
+    <description>Pulled from the MRW, this describes the device
+            type to the HDAT.  This is for I2C devices only.
+    </description>
+    <enumerator>
+        <name>955X</name>
+        <value>0</value>
+    </enumerator>
+    <enumerator>
+        <name>SEEPROM</name>
+        <value>1</value>
+    </enumerator>
+    <enumerator>
+        <name>NUVOTON_TPM</name>
+        <value>2</value>
+    </enumerator>
+    <enumerator>
+        <name>MEX_FPGA</name>
+        <value>3</value>
+    </enumerator>
+    <enumerator>
+        <name>UCX90XX</name>
+        <value>4</value>
+    </enumerator>
+    <enumerator>
+        <name>UNKNOWN</name>
+        <value>5</value>
+    </enumerator>
+</enumerationType>
+
+<enumerationType>
+    <id>HDAT_I2C_DEVICE_PURPOSE</id>
+    <description>Pulled from the MRW, this describes the device
+            purpose to the HDAT.  This is for I2C devices only.
+    </description>
+    <enumerator>
+        <name>CABLE_CARD_PRES</name>
+        <value>0</value>
+    </enumerator>
+    <enumerator>
+        <name>CABLE_CARD_POWER_SENSE</name>
+        <value>1</value>
+    </enumerator>
+    <enumerator>
+        <name>CABLE_CARD_POWER_CONTROL</name>
+        <value>2</value>
+    </enumerator>
+    <enumerator>
+        <name>TPM</name>
+        <value>3</value>
+    </enumerator>
+    <enumerator>
+        <name>MODULE_VPD</name>
+        <value>4</value>
+    </enumerator>
+    <enumerator>
+        <name>DIMM_SPD</name>
+        <value>5</value>
+    </enumerator>
+    <enumerator>
+        <name>PROC_MODULE_VPD</name>
+        <value>6</value>
+    </enumerator>
+    <enumerator>
+        <name>SBE_SEEPROM</name>
+        <value>7</value>
+    </enumerator>
+    <enumerator>
+        <name>PLANAR_VPD</name>
+        <value>8</value>
+    </enumerator>
+    <enumerator>
+        <name>PCI_HOTPLUG</name>
+        <value>9</value>
+    </enumerator>
+    <enumerator>
+        <name>UNKNOWN</name>
+        <value>10</value>
+    </enumerator>
+</enumerationType>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml
index e27aa1d61..c3ad96b54 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types_openpower.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -32,4 +32,129 @@
      =====================================================================
 -->
 
+<attribute>
+    <id>HDAT_I2C_ENGINE</id>
+    <description>
+        This attribute holds the values of the I2C Engine from the i2c device
+        connections as defined in the MRW.  It is parsed into a struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_MASTER_PORT</id>
+    <description>
+        This attribute holds the values of the I2C Master Port from the i2c
+        device connections as defined in the MRW.  It is parsed into a
+        struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_DEVTYPE</id>
+    <description>
+        This attribute holds the values of the I2C device type from the i2c
+        device connections as defined in the MRW.  It is parsed into a
+        struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_ADDR</id>
+    <description>
+        This attribute holds the values of the I2C address from the i2c
+        device connections as defined in the MRW.  It is parsed into a
+        struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_SLAVE_PORT</id>
+    <description>
+        This attribute holds the values of the I2C slave port from the i2c
+        device connections as defined in the MRW.  It is parsed into a
+        struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_BUS_FREQ</id>
+    <description>
+        This attribute holds the values of the I2C bus frequency in Hz from
+        the i2c device connections as defined in the MRW.  It is parsed
+        into a struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_DEV_PURPOSE</id>
+    <description>
+        This attribute holds the values of the I2C device purpose from the i2c
+        device connections as defined in the MRW.  It is parsed into a
+        struct in i2c.C
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+        <array>32</array>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>HDAT_I2C_ELEMENTS</id>
+    <description>
+        This attribute holds the number of elements that were found under this
+        particular target, and how many devices are stored in the arrays.
+    </description>
+    <simpleType>
+        <uint8_t><default>0</default></uint8_t>
+    </simpleType>
+    <persistency>non-volatile</persistency>
+    <readable/>
+    <writeable/>
+</attribute>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types_openpower.xml b/src/usr/targeting/common/xmltohb/target_types_openpower.xml
index 625be4dbb..4601d2dbd 100644
--- a/src/usr/targeting/common/xmltohb/target_types_openpower.xml
+++ b/src/usr/targeting/common/xmltohb/target_types_openpower.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -31,5 +31,16 @@
      FSP based systems.
      =====================================================================
  -->
+<targetTypeExtension>
+    <id>base</id>
+    <attribute><id>HDAT_I2C_ENGINE</id></attribute>
+    <attribute><id>HDAT_I2C_MASTER_PORT</id></attribute>
+    <attribute><id>HDAT_I2C_DEVTYPE</id></attribute>
+    <attribute><id>HDAT_I2C_ADDR</id></attribute>
+    <attribute><id>HDAT_I2C_SLAVE_PORT</id></attribute>
+    <attribute><id>HDAT_I2C_BUS_FREQ</id></attribute>
+    <attribute><id>HDAT_I2C_DEV_PURPOSE</id></attribute>
+    <attribute><id>HDAT_I2C_ELEMENTS</id></attribute>
+</targetTypeExtension>
 
 </attributes>