From c93a932108c24f97395633cf3467895e30b8d042 Mon Sep 17 00:00:00 2001
From: Mike Jones <mjjones@us.ibm.com>
Date: Tue, 10 Apr 2012 15:09:53 -0500
Subject: 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>
---
 src/usr/hwpf/hwp/system_attributes.xml             | 14 ++++++++++++++
 src/usr/targeting/xmltohb/attribute_types.xml      | 18 ++++++++++++++++++
 src/usr/targeting/xmltohb/simics_MURANO.system.xml |  4 ++++
 src/usr/targeting/xmltohb/simics_VENICE.system.xml |  4 ++++
 src/usr/targeting/xmltohb/target_types.xml         |  1 +
 src/usr/targeting/xmltohb/vbu.system.xml           |  4 ++++
 6 files changed, 45 insertions(+)

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
@@ -28,6 +28,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>
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
@@ -768,6 +768,24 @@
     <writeable/>
 </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>
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
@@ -43,6 +43,10 @@
 <targetInstance>
     <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>
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
@@ -43,6 +43,10 @@
 <targetInstance>
     <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>
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
@@ -31,6 +31,10 @@
 <targetInstance>
     <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>
-- 
cgit v1.2.1