Skip to content

Commit e3f96fd

Browse files
nagendraIBMwghoffa
authored andcommitted
Enum value fix for HDAT i2c data.
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>
1 parent aae922c commit e3f96fd

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

src/usr/i2c/i2c.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3846,7 +3846,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
38463846
l_currentDI.masterPort = l_eep->port;
38473847
l_currentDI.addr = l_eep->devAddr;
38483848
l_currentDI.slavePort = 0xFF;
3849-
l_currentDI.busFreqKhz = (l_eep->busFreq) * 1000;
3849+
l_currentDI.busFreqKhz = (l_eep->busFreq) / 1000;
38503850
l_currentDI.deviceType = TARGETING::HDAT_I2C_DEVICE_TYPE_SEEPROM;
38513851
switch(l_eep->device)
38523852
{
@@ -3906,7 +3906,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
39063906
l_currentDI.masterPort = tpmInfo.port;
39073907
l_currentDI.addr = tpmInfo.devAddr;
39083908
l_currentDI.slavePort = 0xFF;
3909-
l_currentDI.busFreqKhz = (tpmInfo.busFreq) * 1000;
3909+
l_currentDI.busFreqKhz = (tpmInfo.busFreq) / 1000;
39103910
l_currentDI.deviceType =
39113911
TARGETING::HDAT_I2C_DEVICE_TYPE_NUVOTON_TPM;
39123912
l_currentDI.devicePurpose = TARGETING::HDAT_I2C_DEVICE_PURPOSE_TPM;
@@ -3979,7 +3979,7 @@ void getDeviceInfo( TARGETING::Target* i_i2cMaster,
39793979
l_currentDevice.masterPort = l_i2cMasterPort[l_idx];
39803980
l_currentDevice.addr = l_i2cAddr[l_idx];
39813981
l_currentDevice.slavePort = l_i2cSlavePort[l_idx];
3982-
l_currentDevice.busFreqKhz = l_i2cBusFreq[l_idx] * 1000;
3982+
l_currentDevice.busFreqKhz = l_i2cBusFreq[l_idx] / 1000;
39833983
l_currentDevice.deviceType = l_i2cDevType[l_idx];
39843984
l_currentDevice.devicePurpose = l_i2cDevPurpose[l_idx];
39853985

src/usr/targeting/common/xmltohb/attribute_types.xml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33468,27 +33468,31 @@ Measured in GB</description>
3346833468
</description>
3346933469
<enumerator>
3347033470
<name>955X</name>
33471-
<value>0</value>
33471+
<value>1</value>
3347233472
</enumerator>
3347333473
<enumerator>
3347433474
<name>SEEPROM</name>
33475-
<value>1</value>
33475+
<value>2</value>
3347633476
</enumerator>
3347733477
<enumerator>
3347833478
<name>NUVOTON_TPM</name>
33479-
<value>2</value>
33479+
<value>3</value>
3348033480
</enumerator>
3348133481
<enumerator>
3348233482
<name>MEX_FPGA</name>
33483-
<value>3</value>
33483+
<value>4</value>
3348433484
</enumerator>
3348533485
<enumerator>
3348633486
<name>UCX90XX</name>
33487-
<value>4</value>
33487+
<value>5</value>
33488+
</enumerator>
33489+
<enumerator>
33490+
<name>NVLINK</name>
33491+
<value>6</value>
3348833492
</enumerator>
3348933493
<enumerator>
3349033494
<name>UNKNOWN</name>
33491-
<value>5</value>
33495+
<value>FF</value>
3349233496
</enumerator>
3349333497
</enumerationType>
3349433498

@@ -33499,47 +33503,51 @@ Measured in GB</description>
3349933503
</description>
3350033504
<enumerator>
3350133505
<name>CABLE_CARD_PRES</name>
33502-
<value>0</value>
33506+
<value>1</value>
3350333507
</enumerator>
3350433508
<enumerator>
3350533509
<name>CABLE_CARD_POWER_SENSE</name>
33506-
<value>1</value>
33510+
<value>2</value>
3350733511
</enumerator>
3350833512
<enumerator>
3350933513
<name>CABLE_CARD_POWER_CONTROL</name>
33510-
<value>2</value>
33514+
<value>3</value>
3351133515
</enumerator>
3351233516
<enumerator>
3351333517
<name>TPM</name>
33514-
<value>3</value>
33518+
<value>4</value>
3351533519
</enumerator>
3351633520
<enumerator>
3351733521
<name>MODULE_VPD</name>
33518-
<value>4</value>
33522+
<value>5</value>
3351933523
</enumerator>
3352033524
<enumerator>
3352133525
<name>DIMM_SPD</name>
33522-
<value>5</value>
33526+
<value>6</value>
3352333527
</enumerator>
3352433528
<enumerator>
3352533529
<name>PROC_MODULE_VPD</name>
33526-
<value>6</value>
33530+
<value>7</value>
3352733531
</enumerator>
3352833532
<enumerator>
3352933533
<name>SBE_SEEPROM</name>
33530-
<value>7</value>
33534+
<value>8</value>
3353133535
</enumerator>
3353233536
<enumerator>
3353333537
<name>PLANAR_VPD</name>
33534-
<value>8</value>
33538+
<value>9</value>
3353533539
</enumerator>
3353633540
<enumerator>
3353733541
<name>PCI_HOTPLUG</name>
33538-
<value>9</value>
33542+
<value>A</value>
33543+
</enumerator>
33544+
<enumerator>
33545+
<name>NVLINK</name>
33546+
<value>B</value>
3353933547
</enumerator>
3354033548
<enumerator>
3354133549
<name>UNKNOWN</name>
33542-
<value>10</value>
33550+
<value>FF</value>
3354333551
</enumerator>
3354433552
</enumerationType>
3354533553

0 commit comments

Comments
 (0)