summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Sanner <dsanner@us.ibm.com>2013-11-01 09:22:18 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-11-08 15:31:14 -0600
commitf60b3727eb2af1217b6dd32a5828db4819a94dc2 (patch)
treeb19ea06788bf428de04de54b4ee297ef084dcde8
parentce8a008a4023b30a82323065337b3f0bf5c430e6 (diff)
downloadtalos-hostboot-f60b3727eb2af1217b6dd32a5828db4819a94dc2.tar.gz
talos-hostboot-f60b3727eb2af1217b6dd32a5828db4819a94dc2.zip
Differentiate between MPIPL and Post dump IPLs
Change-Id: I51baeec83dd0a7dc070a101cd62a9e52b242aa91 CMVC-Coreq:899042 CQ:SW224634 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7000 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r--src/usr/hwpf/hwp/dram_initialization/dram_initialization.C19
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types.xml33
-rw-r--r--src/usr/targeting/common/xmltohb/target_types.xml1
3 files changed, 52 insertions, 1 deletions
diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
index c097fab30..824e63265 100644
--- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
+++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
@@ -758,8 +758,25 @@ void* call_host_mpipl_service( void *io_pArgs )
}
}
+ //Determine if we should perform dump ops
+ //Note that this is only called in MPIPL context, so don't
+ //have to check MPIPL
+ bool collect_dump = false;
+ TARGETING::Target * sys = NULL;
+ TARGETING::targetService().getTopLevelTarget( sys );
+ TARGETING::CecIplType type;
+ if(sys &&
+ sys->tryGetAttr<TARGETING::ATTR_CEC_IPL_TYPE>(type) &&
+ type.PostDump)
+ {
+ collect_dump = true;
+ }
+
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+ "Ready to collect dump -- yes/no [%d]", collect_dump);
+
// No error on the procedure.. proceed to collect the dump.
- if (!l_err)
+ if (!l_err && collect_dump)
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 42942dd1c..a42601258 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -1998,6 +1998,39 @@
<writeable/>
</attribute>
+<attribute>
+ <id>CEC_IPL_TYPE</id>
+ <description>
+ Attribute which describes optional IPL flavors
+ </description>
+ <complexType>
+ <description>Structure which defines a they IPL types
+ Applicable for System target only.
+ </description>
+ <field>
+ <name>PostDump</name>
+ <description>
+ Perform mainstore dump collection. Only valid for MPIPL
+ 0b0: Do not collect mainstore dump
+ 0b1: Perform mainstore dump collection
+ </description>
+ <type>uint8_t</type>
+ <bits>1</bits>
+ <default>0</default>
+ </field>
+ <field>
+ <name>reserved</name>
+ <description>Reserved for future use</description>
+ <type>uint8_t</type>
+ <bits>7</bits>
+ <default>0</default>
+ </field>
+ </complexType>
+ <persistency>volatile</persistency>
+ <readable/>
+ <writeable/>
+</attribute>
+
<!-- Begin attributes (4) to test string support -->
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 8b3d80da6..5c78cfc72 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -95,6 +95,7 @@
<attribute><id>FREQ_X</id></attribute>
<attribute><id>SP_FUNCTIONS</id></attribute>
<attribute><id>HB_SETTINGS</id></attribute>
+ <attribute><id>CEC_IPL_TYPE</id></attribute>
<attribute><id>PAYLOAD_KIND</id></attribute>
<attribute><id>PAYLOAD_BASE</id></attribute>
<attribute><id>PAYLOAD_ENTRY</id></attribute>
OpenPOWER on IntegriCloud