diff options
| author | Mike Jones <mjjones@us.ibm.com> | 2013-10-02 16:55:32 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-10-03 12:08:19 -0500 |
| commit | 49b90d0e63e55cc0bed64a5c6962d82391a3c3c9 (patch) | |
| tree | c7b8117990b0720af450c13d4e0cfdf0b4ede5ba /src | |
| parent | 36cb8095e396b496929653de46557d8de60ca5c8 (diff) | |
| download | blackbird-hostboot-49b90d0e63e55cc0bed64a5c6962d82391a3c3c9.tar.gz blackbird-hostboot-49b90d0e63e55cc0bed64a5c6962d82391a3c3c9.zip | |
Fix some Targeting attributes to make them Hostboot only
FSP has an FSP-only FSP_PM_SPWUP_OHA_FLAG attribute. There is also a common
PM_SPWUP_OHA_FLAG attribute, this should actually be a HB-only
HB_PM_SPWUP_OHA_FLAG attribute. Also, IS_MPIPL_HB is correctly specified as
a HB-only attribute, but it was incorrectly listed in target_types.xml.
This is part of the fix for SW221921 where FSP was generating duplicate FAPI
attribute access macros for the same FAPI attribute. There is also an FSP
fix to a Targeting makefile for this defect that is done separately.
Change-Id: I0ef46c6bfb46005e0ccad00c9315c6bb46a38da6
CQ: SW221921
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6453
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
4 files changed, 22 insertions, 17 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 9c4bc429d..80885d816 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -11877,21 +11877,6 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript </attribute> <attribute> - <id>PM_SPWUP_OHA_FLAG</id> - <description>Flag storage to break the recursive calling loop for when accessing the OHA address space from the Special Wakeup procedure.</description> - <simpleType> - <uint8_t></uint8_t> - </simpleType> - <persistency>volatile-zeroed</persistency> - <readable/> - <writeable/> - <hwpfToHbAttrMap> - <id>ATTR_PM_SPWUP_OHA_FLAG</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - -<attribute> <id>PM_SPWUP_IGNORE_XSTOP_FLAG</id> <description>Flag storage to have the Special Wakeup procedure ignore a checkstop condition.</description> <simpleType> diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml index 847588260..0456c7f03 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml @@ -245,4 +245,19 @@ <writeable/> <hbOnly/> </attribute> +<attribute> + <id>HB_PM_SPWUP_OHA_FLAG</id> + <description>Flag storage to break the recursive calling loop for when accessing the OHA address space from the Special Wakeup procedure.</description> + <simpleType> + <uint8_t></uint8_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <writeable/> + <hwpfToHbAttrMap> + <id>ATTR_PM_SPWUP_OHA_FLAG</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> + <hbOnly/> +</attribute> </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 886af8837..bb7f42153 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -201,7 +201,6 @@ <attribute><id>RUN_MAX_MEM_PATTERNS</id></attribute> <attribute><id>LAB_USE_JTAG_MODE</id></attribute> <attribute><id>MSS_CONTROL_SWITCH</id></attribute> - <attribute><id>IS_MPIPL_HB</id></attribute> <attribute><id>DISABLE_I2C_ACCESS</id></attribute> <attribute><id>PROC_REFCLOCK_RCVR_TERM</id></attribute> <attribute><id>PCI_REFCLOCK_RCVR_TERM</id></attribute> @@ -562,7 +561,6 @@ <attribute><id>OVERRIDE_MVPD_I_NEST_LAB_CURRENT</id></attribute> <attribute><id>OVERRIDE_MVPD_V_CS_LAB_VOLTAGE</id></attribute> <attribute><id>OVERRIDE_MVPD_I_CS_LAB_CURRENT</id></attribute> - <attribute><id>PM_SPWUP_OHA_FLAG</id></attribute> <attribute><id>PM_SPWUP_IGNORE_XSTOP_FLAG</id></attribute> </targetType> diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml index e5dfd4498..bdef1b957 100644 --- a/src/usr/targeting/common/xmltohb/target_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml @@ -104,4 +104,11 @@ </attribute> </targetTypeExtension> +<targetTypeExtension> + <id>unit-ex-power8</id> + <attribute> + <id>HB_PM_SPWUP_OHA_FLAG</id> + </attribute> +</targetTypeExtension> + </attributes> |
