summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Jones <mjjones@us.ibm.com>2012-04-10 15:09:53 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2012-04-16 12:16:38 -0500
commitc93a932108c24f97395633cf3467895e30b8d042 (patch)
treedc2f600a5f2830d3bf611592e972dd247f8a0fa1
parent0bae1b9d0f250bea887d930ecc8da99986fab463 (diff)
downloadtalos-hostboot-c93a932108c24f97395633cf3467895e30b8d042.tar.gz
talos-hostboot-c93a932108c24f97395633cf3467895e30b8d042.zip
HWPF Attributes: Support ATTR_EXECUTION_PLATFORM
Some HWPs (e.g. special wakeup) use different registers depending on which platform the HWP is executing on (FSP/Hostboot) to avoid arbitration problems when multiple platforms do the same thing concurrently. This attribute allows those HWPs to query the platform. Dean/John agree with this attribute. See RTC task 40409 for details. Change-Id: I761ba03b43905c7bdc268fae8ffb4c5796ece21b RTC: 40409 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/878 Tested-by: Jenkins Server Reviewed-by: Van H. Lee <vanlee@us.ibm.com> Reviewed-by: Brian H. Horton <brianh@linux.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r--src/usr/hwpf/hwp/system_attributes.xml14
-rw-r--r--src/usr/targeting/xmltohb/attribute_types.xml18
-rw-r--r--src/usr/targeting/xmltohb/simics_MURANO.system.xml4
-rw-r--r--src/usr/targeting/xmltohb/simics_VENICE.system.xml4
-rw-r--r--src/usr/targeting/xmltohb/target_types.xml1
-rw-r--r--src/usr/targeting/xmltohb/vbu.system.xml4
6 files changed, 45 insertions, 0 deletions
diff --git a/src/usr/hwpf/hwp/system_attributes.xml b/src/usr/hwpf/hwp/system_attributes.xml
index 416c1c478..42cc0f2b5 100644
--- a/src/usr/hwpf/hwp/system_attributes.xml
+++ b/src/usr/hwpf/hwp/system_attributes.xml
@@ -30,6 +30,20 @@
<attributes>
<!-- ********************************************************************* -->
<attribute>
+ <id>ATTR_EXECUTION_PLATFORM</id>
+ <targetType>TARGET_TYPE_SYSTEM</targetType>
+ <description>
+ Which execution platform the HW Procedure is running on
+ Some HWPs (e.g. special wakeup) use different registers for different
+ platforms to avoid arbitration problems when multiple platforms do
+ the same thing concurrently
+ </description>
+ <valueType>uint8</valueType>
+ <enum>HOST = 0x01, FSP = 0x02, OCC = 0x03</enum>
+ <platInit/>
+ </attribute>
+ <!-- ********************************************************************* -->
+ <attribute>
<id>ATTR_IS_SIMULATION</id>
<targetType>TARGET_TYPE_SYSTEM</targetType>
<description>env: 1 = Awan/HWSimulator. 0 = Simics/RealHW.</description>
diff --git a/src/usr/targeting/xmltohb/attribute_types.xml b/src/usr/targeting/xmltohb/attribute_types.xml
index f903b1819..bf4d73418 100644
--- a/src/usr/targeting/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/xmltohb/attribute_types.xml
@@ -769,6 +769,24 @@
</attribute>
<attribute>
+ <id>EXECUTION_PLATFORM</id>
+ <description>
+ Which execution platform the HW Procedure is running on
+ Some HWPs (e.g. special wakeup) use different registers for different
+ platforms to avoid arbitration problems when multiple platforms do
+ the same thing concurrently
+ HOST = 0x01, FSP = 0x02, OCC = 0x03
+ </description>
+ <simpleType><uint8_t></uint8_t></simpleType>
+ <persistency>non-volatile</persistency>
+ <readable/>
+ <hwpfToHbAttrMap>
+ <id>ATTR_EXECUTION_PLATFORM</id>
+ <macro>DIRECT</macro>
+ </hwpfToHbAttrMap>
+</attribute>
+
+<attribute>
<id>IS_SIMULATION</id>
<description>env: 1 = Awan/HWSimulator. 0 = Simics/RealHW.</description>
<simpleType>
diff --git a/src/usr/targeting/xmltohb/simics_MURANO.system.xml b/src/usr/targeting/xmltohb/simics_MURANO.system.xml
index 55a691c55..8daa36ddf 100644
--- a/src/usr/targeting/xmltohb/simics_MURANO.system.xml
+++ b/src/usr/targeting/xmltohb/simics_MURANO.system.xml
@@ -44,6 +44,10 @@
<id>sys0</id>
<type>sys-sys-power8</type>
<attribute>
+ <id>EXECUTION_PLATFORM</id>
+ <default>1</default>
+ </attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0</default>
</attribute>
diff --git a/src/usr/targeting/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/xmltohb/simics_VENICE.system.xml
index 2049ec91f..78a24462e 100644
--- a/src/usr/targeting/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/xmltohb/simics_VENICE.system.xml
@@ -44,6 +44,10 @@
<id>sys0</id>
<type>sys-sys-power8</type>
<attribute>
+ <id>EXECUTION_PLATFORM</id>
+ <default>1</default>
+ </attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0</default>
</attribute>
diff --git a/src/usr/targeting/xmltohb/target_types.xml b/src/usr/targeting/xmltohb/target_types.xml
index 1f37ee0b5..6c82124f1 100644
--- a/src/usr/targeting/xmltohb/target_types.xml
+++ b/src/usr/targeting/xmltohb/target_types.xml
@@ -53,6 +53,7 @@
<attribute><id>TYPE</id><default>SYS</default></attribute>
<attribute><id>MODEL</id><default>POWER8</default></attribute>
<attribute><id>HUID</id><default>0x00010000</default></attribute>
+ <attribute><id>EXECUTION_PLATFORM</id></attribute>
<attribute><id>SCRATCH_UINT8_1</id></attribute>
<attribute><id>SCRATCH_UINT8_2</id></attribute>
<attribute><id>SCRATCH_UINT32_1</id></attribute>
diff --git a/src/usr/targeting/xmltohb/vbu.system.xml b/src/usr/targeting/xmltohb/vbu.system.xml
index 051a539fd..3d4f672fd 100644
--- a/src/usr/targeting/xmltohb/vbu.system.xml
+++ b/src/usr/targeting/xmltohb/vbu.system.xml
@@ -32,6 +32,10 @@
<id>sys0</id>
<type>sys-sys-power8</type>
<attribute>
+ <id>EXECUTION_PLATFORM</id>
+ <default>1</default>
+ </attribute>
+ <attribute>
<id>PHYS_PATH</id>
<default>physical:sys-0</default>
</attribute>
OpenPOWER on IntegriCloud