Skip to content

Commit

Permalink
Enum value fix for HDAT i2c data.
Browse files Browse the repository at this point in the history 
Change-Id: Ie38e800a8f77d59d84f0d99e129c27cad3b38a16
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38053
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: Jayashankar Padath <jayashankar.padath@in.ibm.com>
Reviewed-by: VENKATESH SAINATH <venkatesh.sainath@in.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
  • Loading branch information
@nagendraIBM @wghoffa
nagendraIBM authored and wghoffa committed Mar 27, 2017
1 parent aae922c commit e3f96fd
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/usr/i2c/i2c.C
View file
Expand Up @@ -3846,7 +3846,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
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.busFreqKhz = (l_eep->busFreq) / 1000;
l_currentDI.deviceType = TARGETING::HDAT_I2C_DEVICE_TYPE_SEEPROM;
switch(l_eep->device)
{
Expand Down Expand Up @@ -3906,7 +3906,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
l_currentDI.masterPort = tpmInfo.port;
l_currentDI.addr = tpmInfo.devAddr;
l_currentDI.slavePort = 0xFF;
l_currentDI.busFreqKhz = (tpmInfo.busFreq) * 1000;
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;
Expand Down Expand Up @@ -3979,7 +3979,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
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.busFreqKhz = l_i2cBusFreq[l_idx] / 1000;
l_currentDevice.deviceType = l_i2cDevType[l_idx];
l_currentDevice.devicePurpose = l_i2cDevPurpose[l_idx];

Expand Down
42 changes: 25 additions & 17 deletions src/usr/targeting/common/xmltohb/attribute_types.xml
View file
Expand Up @@ -33468,27 +33468,31 @@ Measured in GB</description>
</description>
<enumerator>
<name>955X</name>
<value>0</value>
<value>1</value>
</enumerator>
<enumerator>
<name>SEEPROM</name>
<value>1</value>
<value>2</value>
</enumerator>
<enumerator>
<name>NUVOTON_TPM</name>
<value>2</value>
<value>3</value>
</enumerator>
<enumerator>
<name>MEX_FPGA</name>
<value>3</value>
<value>4</value>
</enumerator>
<enumerator>
<name>UCX90XX</name>
<value>4</value>
<value>5</value>
</enumerator>
<enumerator>
<name>NVLINK</name>
<value>6</value>
</enumerator>
<enumerator>
<name>UNKNOWN</name>
<value>5</value>
<value>FF</value>
</enumerator>
</enumerationType>

Expand All @@ -33499,47 +33503,51 @@ Measured in GB</description>
</description>
<enumerator>
<name>CABLE_CARD_PRES</name>
<value>0</value>
<value>1</value>
</enumerator>
<enumerator>
<name>CABLE_CARD_POWER_SENSE</name>
<value>1</value>
<value>2</value>
</enumerator>
<enumerator>
<name>CABLE_CARD_POWER_CONTROL</name>
<value>2</value>
<value>3</value>
</enumerator>
<enumerator>
<name>TPM</name>
<value>3</value>
<value>4</value>
</enumerator>
<enumerator>
<name>MODULE_VPD</name>
<value>4</value>
<value>5</value>
</enumerator>
<enumerator>
<name>DIMM_SPD</name>
<value>5</value>
<value>6</value>
</enumerator>
<enumerator>
<name>PROC_MODULE_VPD</name>
<value>6</value>
<value>7</value>
</enumerator>
<enumerator>
<name>SBE_SEEPROM</name>
<value>7</value>
<value>8</value>
</enumerator>
<enumerator>
<name>PLANAR_VPD</name>
<value>8</value>
<value>9</value>
</enumerator>
<enumerator>
<name>PCI_HOTPLUG</name>
<value>9</value>
<value>A</value>
</enumerator>
<enumerator>
<name>NVLINK</name>
<value>B</value>
</enumerator>
<enumerator>
<name>UNKNOWN</name>
<value>10</value>
<value>FF</value>
</enumerator>
</enumerationType>

Expand Down

0 comments on commit e3f96fd

Please sign in to comment.