HWPF Attribute Support: ATTR_FSI_GP_SCOM_ACCESS.

Change-Id: I6307ae3a6a3c151bb85fd86081a5bac4d16076f4
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/666
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 105 insertions, 19 deletions

diff --git a/src/usr/hwpf/hwp/L2_L3_attributes.xml b/src/usr/hwpf/hwp/L2_L3_attributes.xml
index 513d1052a..750081ad4 100644
--- a/src/usr/hwpf/hwp/L2_L3_attributes.xml
+++ b/src/usr/hwpf/hwp/L2_L3_attributes.xml
@@ -20,6 +20,12 @@
      Origin: 30
    
      IBM_PROLOG_END -->
+<!--
+    XML file specifying HWPF attributes.
+    These are L2/L3 non-platInit attributes associated with proc EX chiplets
+-->
+
+
 <attributes>
   <!-- ********************************************************************* -->
   <attribute>
diff --git a/src/usr/hwpf/hwp/chip_attributes.xml b/src/usr/hwpf/hwp/chip_attributes.xml
new file mode 100644
index 000000000..28d13ad83
--- /dev/null
+++ b/src/usr/hwpf/hwp/chip_attributes.xml
@@ -0,0 +1,48 @@
+<!--  IBM_PROLOG_BEGIN_TAG
+     This is an automatically generated prolog.
+   
+     $Source: src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml $
+   
+     IBM CONFIDENTIAL
+   
+     COPYRIGHT International Business Machines Corp. 2011
+   
+     p1
+   
+     Object Code Only (OCO) source materials
+     Licensed Internal Code Source Materials
+     IBM HostBoot Licensed Internal Code
+   
+     The source code for this program is not published or other-
+     wise divested of its trade secrets, irrespective of what has
+     been deposited with the U.S. Copyright Office.
+   
+     Origin: 30
+   
+     IBM_PROLOG_END -->
+<!--
+    XML file specifying HWPF attributes.
+    These are platInit attributes associated with chips.
+-->
+
+<attributes>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_EC</id>
+    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_MEMBUF_CHIP</targetType>
+    <description>EC level of a chip target</description>
+    <valueType>uint8</valueType>
+    <platInit/>
+    <persistRuntime/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_FSI_GP_REG_SCOM_ACCESS</id>
+    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_MEMBUF_CHIP</targetType>
+    <description>Indicates if the target's FSI GP regs have scom access</description>
+    <valueType>uint8</valueType>
+    <enum>false = 0, true = 1</enum>
+    <platInit/>
+    <persistRuntime/>
+  </attribute>
+</attributes>
diff --git a/src/usr/hwpf/hwp/memory_attributes.xml b/src/usr/hwpf/hwp/memory_attributes.xml
index 28f10755b..a1295932b 100644
--- a/src/usr/hwpf/hwp/memory_attributes.xml
+++ b/src/usr/hwpf/hwp/memory_attributes.xml
@@ -20,6 +20,12 @@
      Origin: 30
    
      IBM_PROLOG_END -->
+
+<!--
+    XML file specifying HWPF attributes.
+    These are non-platInit attributes used by memory HWPs.
+-->
+
 <attributes>
 
 <attribute>
diff --git a/src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml b/src/usr/hwpf/hwp/scratch_attributes.xml
index 6cff3f8f7..b6905911d 100644
--- a/src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml
+++ b/src/usr/hwpf/hwp/scratch_attributes.xml
@@ -20,8 +20,12 @@
      Origin: 30
    
      IBM_PROLOG_END -->
-<!-- XML file specifying HW Procedure requested attributes. -->
-<!-- Attributes that every platform must support for HWP development -->
+<!--
+    XML file specifying HWPF attributes.
+    These are scratch attributes that can be used by PLAT FW for  unit test.
+    They can also be used temporarily by a HWP while waiting for an official
+    attribute to be supported.
+-->
 
 <attributes>
   <!-- ********************************************************************* -->
@@ -176,21 +180,4 @@
     <writeable/>
     <array>1, 3, 5</array>
   </attribute>
-  <!-- ********************************************************************* -->
-  <attribute>
-    <id>ATTR_IS_SIMULATION</id>
-    <targetType>TARGET_TYPE_SYSTEM</targetType>
-    <description>env: 1 = Awan/HWSimulator. 0 = Simics/RealHW.</description>
-    <valueType>uint8</valueType>
-    <platInit/>
-  </attribute>
-  <!-- ********************************************************************* -->
-  <attribute>
-    <id>ATTR_EC</id>
-    <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_MEMBUF_CHIP</targetType>
-    <description>EC level of a chip target</description>
-    <valueType>uint8</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
 </attributes>
diff --git a/src/usr/hwpf/hwp/system_attributes.xml b/src/usr/hwpf/hwp/system_attributes.xml
new file mode 100644
index 000000000..52556b4bb
--- /dev/null
+++ b/src/usr/hwpf/hwp/system_attributes.xml
@@ -0,0 +1,39 @@
+<!--  IBM_PROLOG_BEGIN_TAG
+     This is an automatically generated prolog.
+   
+     $Source: src/usr/hwpf/hwp/fapiHwpAttributeInfo.xml $
+   
+     IBM CONFIDENTIAL
+   
+     COPYRIGHT International Business Machines Corp. 2011
+   
+     p1
+   
+     Object Code Only (OCO) source materials
+     Licensed Internal Code Source Materials
+     IBM HostBoot Licensed Internal Code
+   
+     The source code for this program is not published or other-
+     wise divested of its trade secrets, irrespective of what has
+     been deposited with the U.S. Copyright Office.
+   
+     Origin: 30
+   
+     IBM_PROLOG_END -->
+<!--
+    XML file specifying HWPF attributes.
+    These are platInit attributes associated with the system.
+    These attributes are not associated with particular targets.
+    Each execution platform must initialize.
+-->
+
+<attributes>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_IS_SIMULATION</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>env: 1 = Awan/HWSimulator. 0 = Simics/RealHW.</description>
+    <valueType>uint8</valueType>
+    <platInit/>
+  </attribute>
+</attributes>