diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-01-29 20:51:50 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-03 09:37:40 -0500 |
| commit | 735a843bbf49a43b79059e562ccb79982474c93c (patch) | |
| tree | 5befe5e8091434733d508c7cc69755352d64f3e2 | |
| parent | b89ddf13d9276d28faffc063fd9988ddc89300de (diff) | |
| download | talos-hostboot-735a843bbf49a43b79059e562ccb79982474c93c.tar.gz talos-hostboot-735a843bbf49a43b79059e562ccb79982474c93c.zip | |
Fix discover_targets error from SP target
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>
| -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> |
