diff options
author | Joe McGill <jmcgill@us.ibm.com> | 2019-02-16 10:11:11 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-03-14 11:36:28 -0500 |
commit | 87cc9b25b008bbd84bb56208f07cfb36bd42db24 (patch) | |
tree | 7e5bf6323f44afb627306dc45c9eb315f7337113 /src/import | |
parent | ee476c6abdade79afa5e3c989b58f4e1c21a42f9 (diff) | |
download | talos-hostboot-87cc9b25b008bbd84bb56208f07cfb36bd42db24.tar.gz talos-hostboot-87cc9b25b008bbd84bb56208f07cfb36bd42db24.zip |
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/72001
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import')
3 files changed, 139 insertions, 12 deletions
diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C index f7b24c3e5..359ba33ac 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -702,14 +702,14 @@ fapi2::ReturnCode p9_obus_halt_ppe(const OBUS_TGT i_tgt) const uint64_t HALT = 0x1000000000000000ull; // xcr cmd=001 fapi2::buffer<uint64_t> l_xcr_data(HALT); - fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY_Type l_p9c; + fapi2::ATTR_CHIP_EC_FEATURE_HW446279_Type l_hw446279; auto l_chip = i_tgt.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); - FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY, + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW446279, l_chip, - l_p9c)); + l_hw446279)); - if(l_p9c) + if(l_hw446279) { FAPI_TRY(fapi2::putScom(i_tgt, OBUS_PPE_XCR_ADDR, diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C index 2d4277ac7..ae108339c 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_image_build.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -108,7 +108,7 @@ fapi2::ReturnCode p9_io_obus_image_build(CONST_OBUS& iTgt, void* const iHwImageP uint8_t configMode = 0; int xipSectionId = 0; bool loadImage = false; - fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY_Type l_p9c; + fapi2::ATTR_CHIP_EC_FEATURE_HW446279_Type l_hw446279; FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OPTICS_CONFIG_MODE, iTgt, configMode), "Error from FAPI_ATTR_GET(ATTR_OPTICS_CONFIG_MODE)"); @@ -128,11 +128,11 @@ fapi2::ReturnCode p9_io_obus_image_build(CONST_OBUS& iTgt, void* const iHwImageP FAPI_IMP("ABUS IMAGE."); xipSectionId = P9_XIP_SECTION_IOPPE_IOO_ABUS; auto l_chip = iTgt.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); - FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY, + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW446279, l_chip, - l_p9c)); + l_hw446279)); - if(l_p9c) + if(l_hw446279) { FAPI_IMP("ABUS IMAGE LOAD."); loadImage = true; 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 ac2049b67..1e2d0ba75 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> |