diff options
| -rw-r--r-- | src/usr/hwas/common/hwas.C | 5 | ||||
| -rw-r--r-- | src/usr/hwas/hwasPlat.C | 12 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C index 178874300..38cc9d4a5 100644 --- a/src/usr/hwas/common/hwas.C +++ b/src/usr/hwas/common/hwas.C @@ -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); diff --git a/src/usr/hwas/hwasPlat.C b/src/usr/hwas/hwasPlat.C index 57a2e9ef6..63068b630 100644 --- a/src/usr/hwas/hwasPlat.C +++ b/src/usr/hwas/hwasPlat.C @@ -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); diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index abcc7c251..8dbcc7aab 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -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> |
