Skip to content

Commit

Permalink
Fix discover_targets error from SP target
Browse files Browse the repository at this point in the history
Added check to skip IDEC check on SP target
Force presence detection on SP target

Change-Id: I47115aa1cd15a71a263944244d17c72539c72e56
RTC: 161726
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35542
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: DHRUVARAJ SUBHASH CHANDRAN <dhruvaraj@in.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
dcrowell77 committed Feb 3, 2017
1 parent b89ddf1 commit 735a843
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/usr/hwas/common/hwas.C
Expand Up @@ -308,8 +308,9 @@ errlHndl_t discoverTargets()
uint16_t pgData[VPD_CP00_PG_DATA_LENGTH / sizeof(uint16_t)];
bzero(pgData, sizeof(pgData));

if (pTarget->getAttr<ATTR_CLASS>() == CLASS_CHIP &&
pTarget->getAttr<ATTR_TYPE>() != TYPE_TPM)
if( (pTarget->getAttr<ATTR_CLASS>() == CLASS_CHIP) &&
(pTarget->getAttr<ATTR_TYPE>() != TYPE_TPM) &&
(pTarget->getAttr<ATTR_TYPE>() != TYPE_SP) )
{
// read Chip ID/EC data from these physical chips
errl = platReadIDEC(pTarget);
Expand Down
12 changes: 12 additions & 0 deletions src/usr/hwas/hwasPlat.C
Expand Up @@ -468,6 +468,18 @@ errlHndl_t platPresenceDetect(TargetHandleList &io_targets)
#endif
}

// if CLASS_SP
// Hostboot is told everything it needs to know about the
// SP at compile time so just mark the target as present
// by default
if (pTarget->getAttr<ATTR_TYPE>() == TYPE_SP)
{
HWAS_DBG("pTarget %.8X - detected present",
pTarget->getAttr<ATTR_HUID>());
pTarget_it++;
continue;
}

// call deviceRead() to see if they are present
bool present = false;
size_t presentSize = sizeof(present);
Expand Down
1 change: 1 addition & 0 deletions src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
Expand Up @@ -11908,6 +11908,7 @@
<id>AFFINITY_PATH</id>
<default>affinity:sys-0/sp-0</default>
</attribute>
<attribute><id>HUID</id><default>0x00320000</default></attribute>
</targetInstance>

<targetInstance>
Expand Down

0 comments on commit 735a843

Please sign in to comment.