summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe McGill <jmcgill@us.ibm.com>2019-02-16 10:11:11 -0500
committerRAJA DAS <rajadas2@in.ibm.com>2019-03-22 21:17:22 -0500
commit40d3c1667e11183db9d90a34aabab39a823b1810 (patch)
tree957ffc918e116ace62e4d574a45c1dc7faf57bcc
parent448290d76b93b7881c61aca18846582dcfb0de37 (diff)
downloadtalos-sbe-40d3c1667e11183db9d90a34aabab39a823b1810.zip
talos-sbe-40d3c1667e11183db9d90a34aabab39a823b1810.tar.gz
cleanup references to chip-centric EC feature attributes
Change-Id: Ib777b27c6013a647ae86e6ff5973bab19faceb56 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71994 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com> Reviewed-by: LUKE MURRAY <murrayl@us.ibm.com> Reviewed-by: Christopher W. Steffen <cwsteffen@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71999 Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
-rw-r--r--src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C10
-rw-r--r--src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml131
-rw-r--r--src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml4
3 files changed, 138 insertions, 7 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
index c8b5ce8..bcd2269 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER sbe Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016,2018 */
+/* Contributors Listed Below - COPYRIGHT 2016,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -60,8 +60,8 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FABRIC_ADDR_EXTENSION_CHIP_ID, TGT1, l_TGT1_ATTR_FABRIC_ADDR_EXTENSION_CHIP_ID));
fapi2::ATTR_SMF_CONFIG_Type l_TGT1_ATTR_SMF_CONFIG;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_SMF_CONFIG, TGT1, l_TGT1_ATTR_SMF_CONFIG));
- fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY_Type l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY;
- FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY, TGT2, l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY));
+ fapi2::ATTR_CHIP_EC_FEATURE_HW440920_Type l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920;
+ FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW440920, TGT2, l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920));
fapi2::buffer<uint64_t> l_scom_buffer;
{
FAPI_TRY(fapi2::getScom( TGT0, 0x1001100aull, l_scom_buffer ));
@@ -166,7 +166,7 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
l_scom_buffer.insert<0, 1, 63, uint64_t>(l_EXP_NC_NCMISC_NCSCOMS_TLBIE_STALL_EN_ON );
l_scom_buffer.insert<1, 3, 61, uint64_t>(literal_6 );
- if ((l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY != literal_0))
+ if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920 != literal_0))
{
l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_15 );
}
@@ -175,7 +175,7 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0,
l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_4 );
}
- if ((l_TGT2_ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY != literal_0))
+ if ((l_TGT2_ATTR_CHIP_EC_FEATURE_HW440920 != literal_0))
{
l_scom_buffer.insert<8, 8, 56, uint64_t>(literal_0x01 );
}
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
index e6194c3..eb60a7f 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
@@ -848,8 +848,33 @@
</attribute>
<!-- ********************************************************************* -->
<attribute>
+ <id>ATTR_CHIP_EC_FEATURE_HW446279</id>
+ <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
+ <description>
+ HW446279 SMP Abus Cable Failure
+ Use PPE SW recovery
+ </description>
+ <chipEcFeature>
+ <chip>
+ <name>ENUM_ATTR_NAME_CUMULUS</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ <chip>
+ <name>ENUM_ATTR_NAME_AXONE</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ </chipEcFeature>
+ </attribute>
+ <!-- ********************************************************************* -->
+ <attribute>
<id>ATTR_CHIP_EC_FEATURE_HW446279_DISABLE_FIX</id>
- <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+ <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
<description>
HW446279 SMP Abus Cable Failure
Disable HW fixes to rely on PPE SW recovery
@@ -862,6 +887,13 @@
<test>GREATER_THAN_OR_EQUAL</test>
</ec>
</chip>
+ <chip>
+ <name>ENUM_ATTR_NAME_AXONE</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
</chipEcFeature>
</attribute>
<!-- ********************************************************************* -->
@@ -8094,7 +8126,7 @@
</attribute>
<!-- ******************************************************************** -->
<attribute>
- <id>ATTR_CHIP_EC_FEATURE_HW404391_SCAN</id>>
+ <id>ATTR_CHIP_EC_FEATURE_HW404391_SCAN</id>
<targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
<description>
Nimbus DD2.1+: Workaround glxmux xstate issue by adjusting scan flush
@@ -8126,6 +8158,31 @@
</attribute>
<!-- ******************************************************************** -->
<attribute>
+ <id>ATTR_CHIP_EC_FEATURE_HW404391_SCAN_OB12</id>
+ <targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
+ <description>
+ Nimbus DD2.1+: Workaround glxmux xstate issue by adjusting scan flush
+ state of selected latches in NVDL and PHY logic
+ </description>
+ <chipEcFeature>
+ <chip>
+ <name>ENUM_ATTR_NAME_CUMULUS</name>
+ <ec>
+ <value>0x11</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ <chip>
+ <name>ENUM_ATTR_NAME_AXONE</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ </chipEcFeature>
+ </attribute>
+ <!-- ******************************************************************** -->
+ <attribute>
<id>ATTR_CHIP_EC_FEATURE_HW404391_SCOM</id>>
<targetType>TARGET_TYPE_PROC_CHIP,TARGET_TYPE_PROC_CHIP</targetType>
<description>
@@ -8379,6 +8436,23 @@
</attribute>
<!-- ******************************************************************** -->
<attribute>
+ <id>ATTR_CHIP_EC_FEATURE_HW440920</id>
+ <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+ <description>
+ Revert to ordered ("p8") TLBIE mode, disable NMMU snoop of TLBIE.
+ </description>
+ <chipEcFeature>
+ <chip>
+ <name>ENUM_ATTR_NAME_CUMULUS</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ </chipEcFeature>
+ </attribute>
+ <!-- ******************************************************************** -->
+ <attribute>
<id>ATTR_CHIP_EC_FEATURE_HW440920_DISABLE_FIX</id>
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
<description>
@@ -8698,4 +8772,57 @@
</chipEcFeature>
</attribute>
<!-- ******************************************************************** -->
+ <attribute>
+ <id>ATTR_CHIP_EC_FEATURE_MEMORY_DIRECT_ATTACHED</id>
+ <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+ <description>
+ The processor supports direct attached memory via DDR interface
+ </description>
+ <chipEcFeature>
+ <chip>
+ <name>ENUM_ATTR_NAME_NIMBUS</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ </chipEcFeature>
+ </attribute>
+ <!-- ******************************************************************** -->
+ <attribute>
+ <id>ATTR_CHIP_EC_FEATURE_MEMORY_DMI_ATTACHED</id>
+ <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+ <description>
+ The processor supports memory attached via Centaur memory buffer chip.
+ DMI connection links processor and Centaur chips.
+ </description>
+ <chipEcFeature>
+ <chip>
+ <name>ENUM_ATTR_NAME_CUMULUS</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ </chipEcFeature>
+ </attribute>
+ <!-- ******************************************************************** -->
+ <attribute>
+ <id>ATTR_CHIP_EC_FEATURE_MEMORY_OMI_ATTACHED</id>
+ <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+ <description>
+ The processor supports memory attached via OCMB memory buffer chip.
+ OMI connection links processor and OCMB chips.
+ </description>
+ <chipEcFeature>
+ <chip>
+ <name>ENUM_ATTR_NAME_AXONE</name>
+ <ec>
+ <value>0x10</value>
+ <test>GREATER_THAN_OR_EQUAL</test>
+ </ec>
+ </chip>
+ </chipEcFeature>
+ </attribute>
+ <!-- ******************************************************************** -->
</attributes>
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
index 841b62b..9954493 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
@@ -570,6 +570,10 @@ attribute tank
<virtual/>
</entry>
<entry>
+ <name>ATTR_CHIP_EC_FEATURE_HW440920</name>
+ <virtual/>
+ </entry>
+ <entry>
<name>ATTR_SBE_ADDR_KEY_STASH_ADDR</name>
<value>0x0000000000000000</value>
</entry>
OpenPOWER on IntegriCloud