summaryrefslogtreecommitdiffstats
path: root/src/usr/targeting
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2014-04-09 09:26:01 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-05-29 11:13:59 -0500
commit6750245027d53c6ba0b671f522e26971dc142653 (patch)
tree884153c378b78f6f0619855123ac652873b2fa9d /src/usr/targeting
parentc417ae8cd562fb538cc3011a38ff1d9f2268748c (diff)
downloadtalos-hostboot-6750245027d53c6ba0b671f522e26971dc142653.tar.gz
talos-hostboot-6750245027d53c6ba0b671f522e26971dc142653.zip
Add multi-node support to _deconfigureAssocProc
Change-Id: I6344e2737ed20af55516c159a459e2e91929fb8b RTC:86185 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11130 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
-rwxr-xr-xsrc/usr/targeting/common/genHwsvMrwXml.pl5
-rw-r--r--src/usr/targeting/common/utilFilter.C38
-rw-r--r--src/usr/targeting/common/xmltohb/attribute_types.xml23
-rw-r--r--src/usr/targeting/common/xmltohb/target_types.xml1
4 files changed, 48 insertions, 19 deletions
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 62b679e07..de5e02964 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -213,6 +213,11 @@ else
push @systemAttr, ["MRW_MBA_CACHELINE_INTERLEAVE_MODE_CONTROL", 0];
}
+if ($MAXNODE > 1 && $sysname !~ m/mfg/)
+{
+ push @systemAttr, ["DO_ABUS_DECONFIG", 0];
+}
+
#------------------------------------------------------------------------------
# Process the pm-settings MRW file
#------------------------------------------------------------------------------
diff --git a/src/usr/targeting/common/utilFilter.C b/src/usr/targeting/common/utilFilter.C
index b6ab6ff3f..e926e2033 100644
--- a/src/usr/targeting/common/utilFilter.C
+++ b/src/usr/targeting/common/utilFilter.C
@@ -58,10 +58,10 @@ namespace TARGETING
*
* @return N/A
*/
-void _getChipOrChipletResources( TARGETING::TargetHandleList & o_vector,
+void _getClassResources( TARGETING::TargetHandleList & o_vector,
CLASS i_class, TYPE i_type, ResourceState i_state )
{
- #define TARG_FN "_getChipOrChipletResources(...)"
+ #define TARG_FN "_getClassResources(...)"
TARG_ENTER();
switch(i_state)
{
@@ -186,17 +186,22 @@ void _getChipOrChipletResources( TARGETING::TargetHandleList & o_vector,
#undef TARG_FN
}
-
void getChipResources( TARGETING::TargetHandleList & o_vector,
- TYPE i_chipType, ResourceState i_state )
+ TYPE i_chipType, ResourceState i_state )
+{
+ _getClassResources(o_vector, CLASS_CHIP, i_chipType, i_state);
+}
+
+void getEncResources( TARGETING::TargetHandleList & o_vector,
+ TYPE i_type, ResourceState i_state )
{
- _getChipOrChipletResources(o_vector, CLASS_CHIP, i_chipType, i_state);
+ _getClassResources(o_vector, CLASS_ENC, i_type, i_state);
}
void getChipletResources( TARGETING::TargetHandleList & o_vector,
- TYPE i_chipletType, ResourceState i_state )
+ TYPE i_chipletType, ResourceState i_state )
{
- _getChipOrChipletResources(o_vector, CLASS_UNIT, i_chipletType, i_state);
+ _getClassResources(o_vector, CLASS_UNIT, i_chipletType, i_state);
}
// Retrofit functions to getChipOrChipletResources
@@ -205,11 +210,12 @@ void getAllChips( TARGETING::TargetHandleList & o_vector,
{
if (i_functional)
{
- _getChipOrChipletResources(o_vector, CLASS_CHIP, i_chipType, UTIL_FILTER_FUNCTIONAL);
+ _getClassResources(o_vector, CLASS_CHIP, i_chipType,
+ UTIL_FILTER_FUNCTIONAL);
}
else
{
- _getChipOrChipletResources(o_vector, CLASS_CHIP, i_chipType, UTIL_FILTER_ALL);
+ _getClassResources(o_vector, CLASS_CHIP, i_chipType, UTIL_FILTER_ALL);
}
}
@@ -220,14 +226,14 @@ void getAllLogicalCards( TARGETING::TargetHandleList & o_vector,
{
if (i_functional)
{
- _getChipOrChipletResources( o_vector,
+ _getClassResources( o_vector,
CLASS_LOGICAL_CARD,
i_cardType,
UTIL_FILTER_FUNCTIONAL );
}
else
{
- _getChipOrChipletResources( o_vector,
+ _getClassResources( o_vector,
CLASS_LOGICAL_CARD,
i_cardType,
UTIL_FILTER_ALL );
@@ -241,14 +247,14 @@ void getAllCards( TARGETING::TargetHandleList & o_vector,
{
if (i_functional)
{
- _getChipOrChipletResources( o_vector,
+ _getClassResources( o_vector,
CLASS_CARD,
i_cardType,
UTIL_FILTER_FUNCTIONAL );
}
else
{
- _getChipOrChipletResources( o_vector,
+ _getClassResources( o_vector,
CLASS_CARD,
i_cardType,
UTIL_FILTER_ALL );
@@ -261,11 +267,13 @@ void getAllChiplets( TARGETING::TargetHandleList & o_vector,
{
if (i_functional)
{
- _getChipOrChipletResources(o_vector, CLASS_UNIT, i_chipletType, UTIL_FILTER_FUNCTIONAL);
+ _getClassResources(o_vector, CLASS_UNIT, i_chipletType,
+ UTIL_FILTER_FUNCTIONAL);
}
else
{
- _getChipOrChipletResources(o_vector, CLASS_UNIT, i_chipletType, UTIL_FILTER_ALL);
+ _getClassResources(o_vector, CLASS_UNIT, i_chipletType,
+ UTIL_FILTER_ALL);
}
}
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 731b0ee19..a1dc450a7 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -978,9 +978,9 @@
<value>0x00000006</value>
</enumerator>
<enumerator>
- <name>HOSTSVC_HBEL</name>
- <value>0x00000008</value>
- </enumerator>
+ <name>HOSTSVC_HBEL</name>
+ <value>0x00000008</value>
+ </enumerator>
</enumerationType>
<!-- For POD Testing -->
@@ -13355,7 +13355,7 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
<macro>DIRECT</macro>
</hwpfToHbAttrMap>
</attribute>
-
+
<attribute>
<id>HB_RSV_MEM_SIZE_MB</id>
<description>
@@ -13399,4 +13399,19 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript
</hwpfToHbAttrMap>
</attribute>
+<attribute>
+ <id>DO_ABUS_DECONFIG</id>
+ <description>
+ Indicates if system should consider abus logic when deconfiguring in
+ _deconfigureAssocProc(), will be overwritten on multi-node system
+ </description>
+ <simpleType>
+ <uint8_t>
+ <default>1</default>
+ </uint8_t>
+ </simpleType>
+ <persistency>non-volatile</persistency>
+ <readable/>
+</attribute>
+
</attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 37327b6ac..6b987a462 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -243,6 +243,7 @@
<attribute><id>MRW_CDIMM_SPARE_I2C_TEMP_SENSOR_ENABLE</id></attribute>
<attribute><id>HB_RSV_MEM_SIZE_MB</id></attribute>
<attribute><id>PM_HWP_ATTR_VERSION</id></attribute>
+ <attribute><id>DO_ABUS_DECONFIG</id></attribute>
</targetType>
<targetType>
OpenPOWER on IntegriCloud