summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorAdam Muhle <armuhle@us.ibm.com>2013-06-11 13:34:21 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-06-13 11:25:15 -0500
commit01ca3702f9dff153fc23e78fac679c00acb88cb6 (patch)
tree8d7af2c9cc2284257820948435a52872f1c38bd1 /src/usr
parente878c2e2619fa6f0c7330ee9c8daa2c32464ee2b (diff)
downloadtalos-hostboot-01ca3702f9dff153fc23e78fac679c00acb88cb6.tar.gz
talos-hostboot-01ca3702f9dff153fc23e78fac679c00acb88cb6.zip
Add IBSCOM Enable override attribute
Adding an IBSCOM Enable override attribute so users can force IBSCOM enabled for lab testing on DD10 chips. RTC: 73334 Change-Id: Idf64497478981231e4f5b9e68e9bda8beb071a31 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4956 Tested-by: Jenkins Server Reviewed-by: Dean Sanner <dsanner@us.ibm.com> Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/hwpf/hwp/dmi_training/dmi_training.C20
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types_hb.xml13
-rw-r--r--src/usr/targeting/common/xmltohb/target_types_hb.xml1
3 files changed, 30 insertions, 4 deletions
diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.C b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
index 917f98b63..fa78b63d7 100644
--- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C
+++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C
@@ -1138,12 +1138,18 @@ void* call_cen_set_inband_addr( void *io_pArgs )
TARGETING::TargetHandleList membufChips;
getAllChips(membufChips, TYPE_MEMBUF, true);
+ TARGETING::Target * sys = NULL;
+ TARGETING::targetService().getTopLevelTarget(sys);
+
for(uint32_t i=0; i<membufChips.size(); i++)
{
- // If the membuf chip supports IBSCOM..
+ // If the membuf chip supports IBSCOM AND..
+ // (Chip is >=DD20 OR IBSCOM Override is set)
if ((membufChips[i]->getAttr<ATTR_PRIMARY_CAPABILITIES>()
.supportsInbandScom) &&
- (membufChips[i]->getAttr<TARGETING::ATTR_EC>() >= 0x20))
+ ((membufChips[i]->getAttr<TARGETING::ATTR_EC>() >= 0x20) ||
+ (sys->getAttr<TARGETING::ATTR_IBSCOM_ENABLE_OVERRIDE>() != 0))
+ )
{
ScomSwitches l_switches =
membufChips[i]->getAttr<ATTR_SCOM_SWITCHES>();
@@ -1158,12 +1164,18 @@ void* call_cen_set_inband_addr( void *io_pArgs )
// Turn off FSI scom and turn on Inband Scom.
membufChips[i]->setAttr<ATTR_SCOM_SWITCHES>(l_switches);
- TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+ TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"Enable IBSCOM on target HUID %.8X",
TARGETING::get_huid(membufChips[i]));
-
}
}
+ else
+ {
+ TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+ "IBSCOM NOT enabled on target HUID %.8X",
+ TARGETING::get_huid(membufChips[i]));
+
+ }
}
}while(0);
diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml
index febddc88d..7c482fe61 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml
@@ -216,4 +216,17 @@
<writeable/>
<hbOnly/>
</attribute>
+
+<attribute>
+ <id>IBSCOM_ENABLE_OVERRIDE</id>
+ <description>Used to force IBSCOM enabled for lab testing</description>
+ <simpleType>
+ <uint8_t>
+ <default>0</default>
+ </uint8_t>
+ </simpleType>
+ <persistency>volatile-zeroed</persistency>
+ <readable/>
+ <hbOnly/>
+</attribute>
</attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml
index 1b2495c9b..f5c83b76e 100644
--- a/src/usr/targeting/common/xmltohb/target_types_hb.xml
+++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml
@@ -32,6 +32,7 @@
<targetTypeExtension>
<id>sys-sys-power8</id>
<attribute><id>IS_MPIPL_HB</id></attribute>
+ <attribute><id>IBSCOM_ENABLE_OVERRIDE</id></attribute>
<attribute><id>HB_MUTEX_TEST_LOCK</id></attribute>
</targetTypeExtension>
OpenPOWER on IntegriCloud