diff options
author | Lateef Quraishi <lateef@us.ibm.com> | 2016-07-21 13:27:17 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-07-30 19:11:45 -0400 |
commit | 5df2675372b378275cfe7e3b83d3663fed2fd21a (patch) | |
tree | 9a8f33625b8e00542158f825969664f1c63bb458 | |
parent | dec28fb2f89a231ae8a7e954e3d387fb878a8b27 (diff) | |
download | talos-hostboot-5df2675372b378275cfe7e3b83d3663fed2fd21a.tar.gz talos-hostboot-5df2675372b378275cfe7e3b83d3663fed2fd21a.zip |
Add getChipletNumber to Target Class
Chiplet Ids are as follows:
- EQ 0-5 Ids: 0x10 - 0x15
- EX 0-11 Ids: 0x10, 0x10, 0x11, 0x11, --- (parent's id)
- Cores 0-23 Ids: 0x20 - 0x37
- Pervasive Id: 0x01
- Xbus Id: 0x06
- Mcbist 0-1 Ids: 0x07 - 0x08
- Mcs 0-3 Ids: 0x07, 0x07, 0x08, 0x08 (parent's id)
- Mca 0-3 Ids: 0x07, 0x07, 0x07, 0x07 (parent's id)
- Mca 4-7 Ids: 0x08, 0x08, 0x08, 0x08 (parent's id)
- Obus0 Id: 0x09
- Obus3 Id: 0x0C
Change-Id: I89be032654c191b8930fac07a1b64061e381fe14
RTC: 156120
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27339
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/include/usr/fapi2/target.H | 20 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2GetChipletNumTest.H | 606 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.H | 28 | ||||
-rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 57 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 3 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml | 730 | ||||
-rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types.xml | 5 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml | 412 |
8 files changed, 1853 insertions, 8 deletions
diff --git a/src/include/usr/fapi2/target.H b/src/include/usr/fapi2/target.H index 3aa7e9342..623783acc 100644 --- a/src/include/usr/fapi2/target.H +++ b/src/include/usr/fapi2/target.H @@ -1022,6 +1022,26 @@ inline Target<T> getTarget(uint64_t Ordinal) return Target<T>(Ordinal); } +/// +/// @brief Returns the chiplet number associated with the Target +/// @return The chiplet number for the Target. 0 is returned if the +/// Target does not have a chiplet number (for ex, the PROC_CHIP Target) +/// @note For logical targets such as the EX, the chiplet number of +/// their immediate parent chiplet is returned +/// +template< TargetType K, typename V > +inline uint8_t Target< K, V >::getChipletNumber(void) const +{ + const TARGETING::Target * l_pTarget = + static_cast<TARGETING::Target*>(this->get()); + uint8_t l_chiplet_id = 0; + if(!l_pTarget->tryGetAttr<TARGETING::ATTR_CHIPLET_ID>(l_chiplet_id)) + { + FAPI_ERR("ERROR: getChipletNumber: Can not read CHIPLET_ID attribute"); + } + return l_chiplet_id; +} + } // End namespace fapi2 #endif // End __FAPI2_TARGET__ diff --git a/src/usr/fapi2/test/fapi2GetChipletNumTest.H b/src/usr/fapi2/test/fapi2GetChipletNumTest.H new file mode 100644 index 000000000..970b5bcf0 --- /dev/null +++ b/src/usr/fapi2/test/fapi2GetChipletNumTest.H @@ -0,0 +1,606 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/fapi2/test/fapi2GetChipletNumTest.H $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2016 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* Licensed under the Apache License, Version 2.0 (the "License"); */ +/* you may not use this file except in compliance with the License. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +#include <fapi2.H> +#include <commontargeting.H> +#include <cxxtest/TestSuite.H> +#include "fapi2TestUtils.H" + + +namespace fapi2 +{ + +class Fapi2GetChipletNum : public CxxTest::TestSuite +{ + public: + + void testVerifyMcbistChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + uint8_t chipUnit = 0; + + FAPI_INF ("Start testVerifyMcbistChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predMcbist(TARGETING::CLASS_UNIT, + TARGETING::TYPE_MCBIST); + + TARGETING::TargetHandleList pMcbistList; + TARGETING::targetService().getAssociated( pMcbistList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predMcbist); + + if (pMcbistList.empty()) + { + TS_FAIL("testVerifyMcbistChipletNum: empty pMcbistList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_mcbistIter = pMcbistList.begin(); + l_mcbistIter != pMcbistList.end(); + ++l_mcbistIter) + { + + TARGETING::Target * pTarTarget = *l_mcbistIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_MCBIST> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyMcbistChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), l_chiplet_id); + + chipUnit = pTarTarget->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + l_exp_chiplet_id = chipUnit + START_MCBIST_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyMcbistChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyMcbistChipletNum"); + } + + void testVerifyMcsChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + + FAPI_INF("Start testVerifyMcsChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predMcs(TARGETING::CLASS_UNIT, + TARGETING::TYPE_MCS); + + TARGETING::TargetHandleList pMcsList; + TARGETING::targetService().getAssociated( pMcsList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predMcs); + + if (pMcsList.empty()) + { + TS_FAIL("testVerifyMcsChipletNum: empty pMcsList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_mcsIter = pMcsList.begin(); + l_mcsIter != pMcsList.end(); + ++l_mcsIter) + { + TARGETING::Target * pTarTarget = *l_mcsIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_MCS> fapi2_Target(pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyMcsChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + ReturnCode l_rc; + fapi2::ATTR_CHIP_UNIT_POS_Type chipPos = 0; + l_rc = FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, + pTarTarget,chipPos); + if( l_rc ) + { + TS_FAIL("testVerifyMcsChipletNum: Error getting fapi::ATTR_CHIP_UNIT_POS"); + break; + } + + l_exp_chiplet_id = (chipPos/2) + START_MCBIST_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyMcsChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyMcsChipletNum"); + } + + void testVerifyMcaChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + uint8_t chipUnit = 0; + + FAPI_INF("Start testVerifyMcaChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predMca(TARGETING::CLASS_UNIT, + TARGETING::TYPE_MCA); + + TARGETING::TargetHandleList pMcaistList; + TARGETING::targetService().getAssociated( pMcaistList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predMca); + + if (pMcaistList.empty()) + { + TS_FAIL("testVerifyMcaChipletNum: empty pMcbistList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_mcaistIter = pMcaistList.begin(); + l_mcaistIter != pMcaistList.end(); + ++l_mcaistIter) + { + + TARGETING::Target * pTarTarget = *l_mcaistIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_MCBIST> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyMcaChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), l_chiplet_id); + + chipUnit = pTarTarget->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + l_exp_chiplet_id = chipUnit / 4 + START_MCBIST_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyMcaChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyMcaChipletNum"); + } + + void testVerifyObusChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + uint8_t chipUnit = 0; + + FAPI_INF("Start testVerifyObusChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predObus(TARGETING::CLASS_UNIT, + TARGETING::TYPE_OBUS); + + TARGETING::TargetHandleList pObusList; + TARGETING::targetService().getAssociated( pObusList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predObus); + + if (pObusList.empty()) + { + TS_FAIL("testVerifyObusChipletNum: empty pObusList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_obusIter = pObusList.begin(); + l_obusIter != pObusList.end(); + ++l_obusIter) + { + TARGETING::Target * pTarTarget = *l_obusIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_OBUS> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyObusChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + ReturnCode l_rc; + fapi2::ATTR_CHIP_UNIT_POS_Type chipPos = 0; + l_rc = FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, + pTarTarget,chipPos); + if( l_rc ) + { + TS_FAIL("testVerifyObusChipletNum: Error getting fapi::ATTR_CHIP_UNIT_POS"); + break; + } + + // Nimbus has two obuses 0 & 3 + chipUnit = pTarTarget->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + l_exp_chiplet_id = chipUnit + START_OBUS_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyObusChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyObusChipletNum"); + } + + void testVerifyXbusChipletNum() + { + uint8_t l_chiplet_id = 0; + + FAPI_INF("Start testVerifyXbusChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predXbus(TARGETING::CLASS_UNIT, + TARGETING::TYPE_XBUS); + + TARGETING::TargetHandleList pXbusList; + TARGETING::targetService().getAssociated( pXbusList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predXbus); + + if (pXbusList.empty()) + { + TS_FAIL("testVerifyXbusChipletNum: empty pXbusList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_xbusIter = pXbusList.begin(); + l_xbusIter != pXbusList.end(); + ++l_xbusIter) + { + TARGETING::Target * pTarTarget = *l_xbusIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_XBUS> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyXbusChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + if (l_chiplet_id != START_XBUS_CHIPLET_NUM) + { + TS_FAIL("testVerifyXbusChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + START_XBUS_CHIPLET_NUM, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyXbusChipletNum"); + } + void testVerifyPervChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t chipUnit = 0; + + FAPI_INF("Start testVerifyPervChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predPerv(TARGETING::CLASS_UNIT, + TARGETING::TYPE_PERV); + + TARGETING::TargetHandleList pPervList; + TARGETING::targetService().getAssociated( pPervList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predPerv ); + + if (pPervList.empty()) + { + TS_FAIL("testVerifyPervChipletNum: empty pPervList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_pervIter = pPervList.begin(); + l_pervIter != pPervList.end(); + ++l_pervIter) + { + TARGETING::Target * pTarTarget = *l_pervIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_PERV> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyPervChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + chipUnit = pTarTarget->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + + if (l_chiplet_id != chipUnit) + { + TS_FAIL("testVerifyPervChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + chipUnit, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyPervChipletNum"); + } + + void testVerifyEQChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + uint8_t chipUnit = 0; + + FAPI_INF("Start testVerifyEQChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predEq(TARGETING::CLASS_UNIT, + TARGETING::TYPE_EQ); + + TARGETING::TargetHandleList pEqList; + TARGETING::targetService().getAssociated( pEqList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predEq ); + + if (pEqList.empty()) + { + TS_FAIL("testVerifyEQChipletNum: empty pEqList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_eqIter = pEqList.begin(); + l_eqIter != pEqList.end(); + ++l_eqIter) + { + TARGETING::Target * pTarTarget = *l_eqIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_EQ> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyEQChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + chipUnit = pTarTarget->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + l_exp_chiplet_id = chipUnit + START_EQ_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyEQChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyEQChipletNum"); + } + + void testVerifyEXChipletNum() + { + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + + FAPI_INF("Start testVerifyEXChipletNum"); + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predEx(TARGETING::CLASS_UNIT, + TARGETING::TYPE_EX); + + TARGETING::TargetHandleList pExList; + TARGETING::targetService().getAssociated( pExList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predEx ); + + if (pExList.empty()) + { + TS_FAIL("testVerifyEXChipletNum: empty pExList"); + break; + } + + // Iterate through present procs + for (TARGETING::TargetHandleList::const_iterator + l_exIter = pExList.begin(); + l_exIter != pExList.end(); + ++l_exIter) + { + TARGETING::Target * pTarTarget = *l_exIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_EX> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyEXChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + ReturnCode l_rc; + fapi2::ATTR_CHIP_UNIT_POS_Type chipPos = 0; + l_rc = FAPI_ATTR_GET(fapi2::ATTR_CHIP_UNIT_POS, + pTarTarget,chipPos); + if( l_rc ) + { + TS_FAIL("testVerifyEXChipletNum: Error getting fapi::ATTR_CHIP_UNIT_POS"); + break; + } + + l_exp_chiplet_id = (chipPos/2) + START_EQ_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyEXChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyEXChipletNum"); + } + + void testVerifyCoreChipletNum() + { + FAPI_INF("Start testVerifyCoreChipletNum"); + + uint8_t l_chiplet_id = 0; + uint8_t l_exp_chiplet_id = 0; + uint8_t chipUnit = 0; + + do + { + // find the unit + TARGETING::Target * pSys; + TARGETING::targetService().getTopLevelTarget(pSys); + TARGETING::PredicateCTM predCore(TARGETING::CLASS_UNIT, + TARGETING::TYPE_CORE); + + TARGETING::TargetHandleList pCoreList; + TARGETING::targetService().getAssociated( pCoreList, pSys, + TARGETING::TargetService::CHILD, + TARGETING::TargetService::ALL, + &predCore ); + + if (pCoreList.empty()) + { + TS_FAIL("testVerifyCoreChipletNum: empty pCoreList"); + break; + } + + // Iterate through present cores + for (TARGETING::TargetHandleList::const_iterator + l_coreIter = pCoreList.begin(); + l_coreIter != pCoreList.end(); + ++l_coreIter) + { + TARGETING::Target * pTarTarget = *l_coreIter; + + // map Targeting Type to fapi2 Type + Target<fapi2::TARGET_TYPE_CORE> fapi2_Target( pTarTarget); + l_chiplet_id = fapi2_Target.getChipletNumber(); + + FAPI_DBG("testVerifyCoreChipletNum HUID: %.8X, ChipletId: %.8X", + TARGETING::get_huid(pTarTarget), + l_chiplet_id); + + chipUnit = pTarTarget->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + l_exp_chiplet_id = chipUnit + START_CORE_CHIPLET_NUM; + + if (l_chiplet_id != l_exp_chiplet_id) + { + TS_FAIL("testVerifyCoreChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + l_exp_chiplet_id, l_chiplet_id); + break; + } + } + } while(0); + FAPI_INF("Complete testVerifyCoreChipletNum"); + } + + //************************************************************************** + // test_fapi2GetChipletNum + //************************************************************************** + void test_fapi2ChipletNum() + { + + FAPI_DBG("Enter test_fapi2GetChipletNum"); + do + { + + testVerifyEQChipletNum(); + + testVerifyEXChipletNum(); + + testVerifyCoreChipletNum(); + + testVerifyPervChipletNum(); + + testVerifyXbusChipletNum(); + + testVerifyObusChipletNum(); + + testVerifyMcbistChipletNum(); + + testVerifyMcsChipletNum(); + + testVerifyMcaChipletNum(); + + } while(0); + FAPI_DBG("test_fapi2ChipletNum Test Complete."); + } // end test_fapi2ChipletNum() + +}; // end class + +}// end namespace fapi2 + diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H index 21ba562d7..ccc90146d 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.H +++ b/src/usr/fapi2/test/fapi2TestUtils.H @@ -33,15 +33,31 @@ #ifndef FAPI2TESTUTILS_H_ #define FAPI2TESTUTILS_H_ -#define EQ_PER_PROC 6 -#define EX_PER_EQ 2 -#define CORE_PER_EX 2 -#define MCS_PER_PROC 4 -#define MCA_PER_MCS 2 -#define MCBIST_PER_PROC 2 +#define EQ_PER_PROC 6 +#define EX_PER_EQ 2 +#define CORE_PER_EX 2 +#define MCS_PER_PROC 4 +#define MCA_PER_MCS 2 +#define MCBIST_PER_PROC 2 +#define MCS_PER_MCBIST 2 +#define PERV_PER_PROC 43 +#define XBUS_PER_PROC 1 +#define OBUS_PER_PROC 2 #define SIMULATED_GOOD_CORES 4 +// non-core and non-cache chiplet ids +#define START_PERV_CHIPLET_NUM 0x01 +#define START_XBUS_CHIPLET_NUM 0x06 +#define START_MCBIST_CHIPLET_NUM 0x07 +#define START_OBUS_CHIPLET_NUM 0x09 + +// All Cache Chiplets +#define START_EQ_CHIPLET_NUM 0x10 + +// All Core Chiplets +#define START_CORE_CHIPLET_NUM 0x20 + #include <fapi2.H> namespace fapi2 diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 5b486b7dc..0732f5969 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -3677,6 +3677,9 @@ sub generate_ex my $mruData = get_mruid($ipath); my $fapi_name = sprintf("pu.ex:k0:n%d:s0:p%02d:c%d", $node, $proc,$ex_orig); my $affinityPath = "affinity:sys-$sys/node-$node/proc-$proc/eq-$eq/ex-$ex"; + #EX is a logical target, Chiplet ID is the chiplet id of their immediate + #parent which is EQ. The range of EQ is 0x10 - 0x15 + my $chipletId = sprintf("0x%X",(($ex_orig/2) + 0x10)); print " <targetInstance> <id>sys${sys}node${node}proc${proc}eq${eq}ex$ex</id> @@ -3706,6 +3709,10 @@ sub generate_ex <attribute> <id>CHIP_UNIT</id> <default>$ex_orig</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; calcAndAddFapiPos("ex",$affinityPath,$ex_orig,$fapiPosHr); @@ -3909,6 +3916,8 @@ sub generate_eq my $mruData = get_mruid($ipath); my $fapi_name = sprintf("pu.eq:k0:n%d:s0:p%02d:c%d", $node, $proc, $eq); my $affinityPath = "affinity:sys-$sys/node-$node/proc-$proc/eq-$eq"; + #Chiplet ID range for EQ start with 0x10 + my $chipletId = sprintf("0x%X",($eq + 0x10)); print " <targetInstance> @@ -3939,6 +3948,10 @@ sub generate_eq <attribute> <id>CHIP_UNIT</id> <default>$eq</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; addPervasiveParentLink($sys,$node,$proc,$eq,"eq"); @@ -3963,6 +3976,10 @@ sub generate_mcs $mcs = $mcs%2; my $mcbist = ($mcs_orig - ($mcs_orig%2))/2; + #MCS is a logical target, Chiplet ID is the chiplet id of their immediate + #parent which is MCBIST. The range of MCBIST is 0x07 - 0x08 + my $chipletId = sprintf("0x%X",($mcbist + 0x07)); + my $lognode; my $logid; for (my $j = 0; $j <= $#chipIDs; $j++) @@ -4035,6 +4052,10 @@ sub generate_mcs <id>CHIP_UNIT</id> <default>$mcs_orig</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> <default>$mscStr</default> @@ -4066,6 +4087,10 @@ sub generate_mca my $mcbist = ($mca - ($mca%4))/4; my $mca_orig = $mca; $mca = $mca % 2; + #MCA is a logical target, Chiplet ID is the chiplet id of their immediate + #parent which is MCS. since MCS is the also logical, therefore the + # chiplet id of MCSIST will be returned. The range of MCBIST is 0x07 - 0x08 + my $chipletId = sprintf("0x%X",($mcbist + 0x07)); my $lognode; my $logid; @@ -4116,6 +4141,10 @@ sub generate_mca <attribute> <id>CHIP_UNIT</id> <default>$mca_orig</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; addPervasiveParentLink($sys,$node,$proc,$mca_orig,"mca"); @@ -4152,6 +4181,9 @@ sub generate_mcbist my $physicalPath="physical:sys-$sys/node-$node/proc-$proc/mcbist-$mcbist"; my $affinityPath="affinity:sys-$sys/node-$node/proc-$proc/mcbist-$mcbist"; + #Chiplet ID range for 2 MCBIST start with 0x07 + my $chipletId = sprintf("0x%X",($mcbist + 0x07)); + print " <targetInstance> <id>sys${sys}node${node}proc${proc}mcbist$mcbist</id> @@ -4181,6 +4213,10 @@ sub generate_mcbist <attribute> <id>CHIP_UNIT</id> <default>$mcbist</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; addPervasiveParentLink($sys,$node,$proc,$mcbist,"mcbist"); @@ -4419,6 +4455,9 @@ sub generate_obus } } + #Chiplet ID range for OBUS start with 0x09 + my $chipletId = sprintf("0x%X",($obus + 0x09)); + my $fapi_name = sprintf("pu.obus:k0:n%d:s0:p%02d:c%d", $node, $proc, $obus); my $affinityPath = "affinity:sys-$sys/node-$node/proc-$proc/obus-$obus"; @@ -4451,6 +4490,10 @@ sub generate_obus <attribute> <id>CHIP_UNIT</id> <default>$obus</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; addPervasiveParentLink($sys,$node,$proc,$obus,"obus"); @@ -4486,6 +4529,9 @@ sub generate_xbus my $fapi_name = sprintf("pu.xbus:k0:n%d:s0:p%02d:c%d", $node, $proc, $xbus); my $affinityPath = "affinity:sys-$sys/node-$node/proc-$proc/xbus-$xbus"; + #Chiplet ID for XBUS is 0x06 + my $chipletId = sprintf("0x%X", 0x06); + # Peer target variables my $peer; my $p_proc; @@ -4542,6 +4588,10 @@ sub generate_xbus <attribute> <id>CHIP_UNIT</id> <default>$xbus</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; if ($peer) @@ -4581,6 +4631,9 @@ sub generate_perv my $uidstr = sprintf("0x%02X2C%04X",${node},$proc*MAX_PERV_PER_PROC + $perv); my $mruData = get_mruid($ipath); + #Chiplet ID for PERV is 0x01 + my $chipletId = sprintf("0x%X", $perv); + my $lognode; my $logid; for (my $j = 0; $j <= $#chipIDs; $j++) @@ -4624,6 +4677,10 @@ sub generate_perv <attribute> <id>CHIP_UNIT</id> <default>$perv</default> + </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>$chipletId</default> </attribute>"; calcAndAddFapiPos("perv",$affinityPath,$perv,$fapiPosHr); diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 4994cb857..7a2d992dd 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -21628,7 +21628,8 @@ DEPRECATED!!!! <id>CHIPLET_ID</id> <description>The address offset which each Chiplet types pervasive address space used to represent the a chiplet. - 0x00 to 0x0F => For P9 all non-core and non-cache chiplets + 0x00 => Target does not have a chiplet id + 0x01 to 0x0F => For P9 all non-core and non-cache chiplets 0x10 to 0x1F => All Cache Chiplets 0x20 to 0x37 => All Core Chiplets 0x38 to 0x3F => Multicast Operation diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index 2e7bd2aa3..b7c1c272b 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -353,6 +353,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-16</default> </attribute> @@ -394,6 +398,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-17</default> </attribute> @@ -438,6 +446,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-18</default> </attribute> @@ -471,6 +483,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-19</default> </attribute> @@ -504,6 +520,10 @@ <default>4</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-20</default> </attribute> @@ -537,6 +557,10 @@ <default>5</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-21</default> </attribute> @@ -570,6 +594,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <targetInstance> @@ -599,6 +627,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq1 EX units --> @@ -629,6 +661,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <targetInstance> @@ -658,6 +694,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq2 EX units --> @@ -688,6 +728,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <targetInstance> @@ -717,6 +761,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq3 EX units --> @@ -747,6 +795,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <targetInstance> @@ -776,6 +828,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq4 EX units --> @@ -806,6 +862,10 @@ <id>CHIP_UNIT</id> <default>8</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <targetInstance> @@ -835,6 +895,10 @@ <id>CHIP_UNIT</id> <default>9</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq5 EX units --> @@ -865,6 +929,10 @@ <id>CHIP_UNIT</id> <default>10</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <targetInstance> @@ -894,6 +962,10 @@ <id>CHIP_UNIT</id> <default>11</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq0ex0 CORE units --> @@ -925,6 +997,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x20</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-32</default> </attribute> @@ -958,6 +1034,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x21</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-33</default> </attribute> @@ -992,6 +1072,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x22</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-34</default> </attribute> @@ -1025,6 +1109,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x23</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-35</default> </attribute> @@ -1059,6 +1147,10 @@ <default>4</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x24</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-36</default> </attribute> @@ -1092,6 +1184,10 @@ <default>5</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x25</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-37</default> </attribute> @@ -1126,6 +1222,10 @@ <default>6</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x26</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-38</default> </attribute> @@ -1159,6 +1259,10 @@ <default>7</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x27</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-39</default> </attribute> @@ -1193,6 +1297,10 @@ <default>8</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x28</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-40</default> </attribute> @@ -1226,6 +1334,10 @@ <default>9</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x29</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-41</default> </attribute> @@ -1260,6 +1372,10 @@ <default>10</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2A</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-42</default> </attribute> @@ -1293,6 +1409,10 @@ <default>11</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2B</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-43</default> </attribute> @@ -1327,6 +1447,10 @@ <default>12</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2C</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-44</default> </attribute> @@ -1360,6 +1484,10 @@ <default>13</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2D</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-45</default> </attribute> @@ -1394,6 +1522,10 @@ <default>14</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2E</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-46</default> </attribute> @@ -1427,6 +1559,10 @@ <default>15</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2F</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-47</default> </attribute> @@ -1461,6 +1597,10 @@ <default>16</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x30</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-48</default> </attribute> @@ -1494,6 +1634,10 @@ <default>17</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x31</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-49</default> </attribute> @@ -1528,6 +1672,10 @@ <default>18</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x32</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-50</default> </attribute> @@ -1561,6 +1709,10 @@ <default>19</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x33</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-51</default> </attribute> @@ -1595,6 +1747,10 @@ <default>20</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x34</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-52</default> </attribute> @@ -1628,6 +1784,10 @@ <default>21</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x35</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-53</default> </attribute> @@ -1662,6 +1822,10 @@ <default>22</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x36</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-54</default> </attribute> @@ -1695,6 +1859,10 @@ <default>23</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x37</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-55</default> </attribute> @@ -1729,6 +1897,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -1762,6 +1934,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -1799,6 +1975,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E58000000000</default> </attribute> @@ -1843,6 +2023,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E5A000000000</default> </attribute> @@ -1887,6 +2071,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E5C000000000</default> </attribute> @@ -1931,6 +2119,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E5E000000000</default> </attribute> @@ -1973,6 +2165,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -2006,6 +2202,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -2040,6 +2240,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -2073,6 +2277,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -2107,6 +2315,10 @@ <default>4</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2140,6 +2352,10 @@ <default>5</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2174,6 +2390,10 @@ <default>6</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2207,6 +2427,10 @@ <default>7</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2542,6 +2766,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x09</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-9</default> </attribute> @@ -2575,6 +2803,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x0C</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-12</default> </attribute> @@ -2703,6 +2935,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>1</default> + </attribute> </targetInstance> <targetInstance> @@ -2736,6 +2972,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>2</default> + </attribute> </targetInstance> <targetInstance> @@ -2769,6 +3009,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>3</default> + </attribute> </targetInstance> <targetInstance> @@ -2802,6 +3046,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>4</default> + </attribute> </targetInstance> <targetInstance> @@ -2835,6 +3083,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>5</default> + </attribute> </targetInstance> <targetInstance> @@ -2868,6 +3120,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>6</default> + </attribute> </targetInstance> <targetInstance> @@ -2901,6 +3157,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>7</default> + </attribute> </targetInstance> <targetInstance> @@ -2934,6 +3194,10 @@ <id>CHIP_UNIT</id> <default>8</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>8</default> + </attribute> </targetInstance> <targetInstance> @@ -2967,6 +3231,10 @@ <id>CHIP_UNIT</id> <default>9</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>9</default> + </attribute> </targetInstance> <targetInstance> @@ -3000,6 +3268,10 @@ <id>CHIP_UNIT</id> <default>12</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>12</default> + </attribute> </targetInstance> <targetInstance> @@ -3033,6 +3305,10 @@ <id>CHIP_UNIT</id> <default>13</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>13</default> + </attribute> </targetInstance> <targetInstance> @@ -3066,6 +3342,10 @@ <id>CHIP_UNIT</id> <default>14</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>14</default> + </attribute> </targetInstance> <targetInstance> @@ -3099,6 +3379,10 @@ <id>CHIP_UNIT</id> <default>15</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>15</default> + </attribute> </targetInstance> <targetInstance> @@ -3132,6 +3416,10 @@ <id>CHIP_UNIT</id> <default>16</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>16</default> + </attribute> </targetInstance> <targetInstance> @@ -3165,6 +3453,10 @@ <id>CHIP_UNIT</id> <default>17</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>17</default> + </attribute> </targetInstance> <targetInstance> @@ -3198,6 +3490,10 @@ <id>CHIP_UNIT</id> <default>18</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>18</default> + </attribute> </targetInstance> <targetInstance> @@ -3231,6 +3527,10 @@ <id>CHIP_UNIT</id> <default>19</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>19</default> + </attribute> </targetInstance> <targetInstance> @@ -3264,6 +3564,10 @@ <id>CHIP_UNIT</id> <default>20</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>20</default> + </attribute> </targetInstance> <targetInstance> @@ -3297,6 +3601,10 @@ <id>CHIP_UNIT</id> <default>21</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>21</default> + </attribute> </targetInstance> <targetInstance> @@ -3330,6 +3638,10 @@ <id>CHIP_UNIT</id> <default>32</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>32</default> + </attribute> </targetInstance> <targetInstance> @@ -3363,6 +3675,10 @@ <id>CHIP_UNIT</id> <default>33</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>33</default> + </attribute> </targetInstance> <targetInstance> @@ -3396,6 +3712,10 @@ <id>CHIP_UNIT</id> <default>34</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>34</default> + </attribute> </targetInstance> <targetInstance> @@ -3429,6 +3749,10 @@ <id>CHIP_UNIT</id> <default>35</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>35</default> + </attribute> </targetInstance> <targetInstance> @@ -3462,6 +3786,10 @@ <id>CHIP_UNIT</id> <default>36</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>36</default> + </attribute> </targetInstance> <targetInstance> @@ -3495,6 +3823,10 @@ <id>CHIP_UNIT</id> <default>37</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>37</default> + </attribute> </targetInstance> <targetInstance> @@ -3528,6 +3860,10 @@ <id>CHIP_UNIT</id> <default>38</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>38</default> + </attribute> </targetInstance> <targetInstance> @@ -3561,6 +3897,10 @@ <id>CHIP_UNIT</id> <default>39</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>39</default> + </attribute> </targetInstance> <targetInstance> @@ -3594,6 +3934,10 @@ <id>CHIP_UNIT</id> <default>40</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>40</default> + </attribute> </targetInstance> <targetInstance> @@ -3627,6 +3971,10 @@ <id>CHIP_UNIT</id> <default>41</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>41</default> + </attribute> </targetInstance> <targetInstance> @@ -3660,6 +4008,10 @@ <id>CHIP_UNIT</id> <default>42</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>42</default> + </attribute> </targetInstance> <targetInstance> @@ -3693,6 +4045,10 @@ <id>CHIP_UNIT</id> <default>43</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>43</default> + </attribute> </targetInstance> <targetInstance> @@ -3726,6 +4082,10 @@ <id>CHIP_UNIT</id> <default>44</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>44</default> + </attribute> </targetInstance> <targetInstance> @@ -3759,6 +4119,10 @@ <id>CHIP_UNIT</id> <default>45</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>45</default> + </attribute> </targetInstance> <targetInstance> @@ -3792,6 +4156,10 @@ <id>CHIP_UNIT</id> <default>46</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>46</default> + </attribute> </targetInstance> <targetInstance> @@ -3825,6 +4193,10 @@ <id>CHIP_UNIT</id> <default>47</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>47</default> + </attribute> </targetInstance> <targetInstance> @@ -3858,6 +4230,10 @@ <id>CHIP_UNIT</id> <default>48</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>48</default> + </attribute> </targetInstance> <targetInstance> @@ -3891,6 +4267,10 @@ <id>CHIP_UNIT</id> <default>49</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>49</default> + </attribute> </targetInstance> <targetInstance> @@ -3924,6 +4304,10 @@ <id>CHIP_UNIT</id> <default>50</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>50</default> + </attribute> </targetInstance> <targetInstance> @@ -3957,6 +4341,10 @@ <id>CHIP_UNIT</id> <default>51</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>51</default> + </attribute> </targetInstance> <targetInstance> @@ -3990,6 +4378,10 @@ <id>CHIP_UNIT</id> <default>52</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>52</default> + </attribute> </targetInstance> <targetInstance> @@ -4023,6 +4415,10 @@ <id>CHIP_UNIT</id> <default>53</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>53</default> + </attribute> </targetInstance> <targetInstance> @@ -4056,6 +4452,10 @@ <id>CHIP_UNIT</id> <default>54</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>54</default> + </attribute> </targetInstance> <targetInstance> @@ -4089,6 +4489,10 @@ <id>CHIP_UNIT</id> <default>55</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>55</default> + </attribute> </targetInstance> @@ -4121,6 +4525,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x06</default> + </attribute> + <attribute> <id>PEER_TARGET</id> <default>physical:sys-0/node-0/proc-1/xbus-1</default> </attribute> @@ -4158,6 +4566,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x06</default> + </attribute> + <attribute> <id>PEER_TARGET</id> <default>physical:sys-0/node-0/proc-1/xbus-1</default> </attribute> @@ -4720,6 +5132,8 @@ </attribute> </targetInstance> +<!-- ZZ n0p1 EX units --> + <targetInstance> <id>sys0node0proc1eq0ex0</id> <type>unit-ex-power9</type> @@ -4751,6 +5165,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <targetInstance> @@ -4784,6 +5202,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <targetInstance> @@ -4817,6 +5239,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <targetInstance> @@ -4850,6 +5276,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <targetInstance> @@ -4883,6 +5313,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <targetInstance> @@ -4916,6 +5350,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <targetInstance> @@ -4949,6 +5387,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <targetInstance> @@ -4982,6 +5424,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <targetInstance> @@ -5015,6 +5461,10 @@ <id>CHIP_UNIT</id> <default>8</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <targetInstance> @@ -5048,6 +5498,10 @@ <id>CHIP_UNIT</id> <default>9</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <targetInstance> @@ -5081,6 +5535,10 @@ <id>CHIP_UNIT</id> <default>10</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <targetInstance> @@ -5114,6 +5572,10 @@ <id>CHIP_UNIT</id> <default>11</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <!-- ZZ n0p1 EQ units --> @@ -5153,6 +5615,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <targetInstance> @@ -5190,6 +5656,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <targetInstance> @@ -5227,6 +5697,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <targetInstance> @@ -5264,6 +5738,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <targetInstance> @@ -5301,6 +5779,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <targetInstance> @@ -5338,6 +5820,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <!-- ZZ n0p1 core units --> @@ -6361,6 +6847,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> </targetInstance> <targetInstance> @@ -6398,6 +6888,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> </targetInstance> <targetInstance> @@ -6439,6 +6933,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> <default>0x0003E10000000000</default> @@ -6489,6 +6987,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> <default>0x0003E12000000000</default> @@ -6539,6 +7041,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> <default>0x0003E14000000000</default> @@ -6589,6 +7095,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <!-- baseAddr = 0x0003E00000000000, 128GB per MCS --> <default>0x0003E16000000000</default> @@ -6635,6 +7145,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> </targetInstance> <targetInstance> @@ -6672,6 +7186,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> </targetInstance> <targetInstance> @@ -6709,6 +7227,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> </targetInstance> <targetInstance> @@ -6746,6 +7268,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> </targetInstance> <targetInstance> @@ -6783,6 +7309,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> </targetInstance> <targetInstance> @@ -6820,6 +7350,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> </targetInstance> <targetInstance> @@ -6857,6 +7391,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> </targetInstance> <targetInstance> @@ -6894,6 +7432,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> </targetInstance> <targetInstance> @@ -7264,6 +7806,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x09</default> + </attribute> </targetInstance> <targetInstance> @@ -7301,6 +7847,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x0C</default> + </attribute> </targetInstance> <targetInstance> @@ -7342,6 +7892,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x06</default> + </attribute> </targetInstance> <targetInstance> @@ -7383,6 +7937,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x06</default> + </attribute> </targetInstance> <!-- Nimbus n0p1 NV units --> @@ -8055,6 +8613,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>1</default> + </attribute> </targetInstance> <targetInstance> @@ -8088,6 +8650,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>2</default> + </attribute> </targetInstance> <targetInstance> @@ -8121,6 +8687,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>3</default> + </attribute> </targetInstance> <targetInstance> @@ -8154,6 +8724,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>4</default> + </attribute> </targetInstance> <targetInstance> @@ -8187,6 +8761,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>5</default> + </attribute> </targetInstance> <targetInstance> @@ -8220,6 +8798,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>6</default> + </attribute> </targetInstance> <targetInstance> @@ -8253,6 +8835,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>7</default> + </attribute> </targetInstance> <targetInstance> @@ -8286,6 +8872,10 @@ <id>CHIP_UNIT</id> <default>8</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>8</default> + </attribute> </targetInstance> <targetInstance> @@ -8319,6 +8909,10 @@ <id>CHIP_UNIT</id> <default>9</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>9</default> + </attribute> </targetInstance> <targetInstance> @@ -8352,6 +8946,10 @@ <id>CHIP_UNIT</id> <default>12</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>12</default> + </attribute> </targetInstance> <targetInstance> @@ -8385,6 +8983,10 @@ <id>CHIP_UNIT</id> <default>13</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>13</default> + </attribute> </targetInstance> <targetInstance> @@ -8418,6 +9020,10 @@ <id>CHIP_UNIT</id> <default>14</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>14</default> + </attribute> </targetInstance> <targetInstance> @@ -8451,6 +9057,10 @@ <id>CHIP_UNIT</id> <default>15</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>15</default> + </attribute> </targetInstance> <targetInstance> @@ -8484,6 +9094,10 @@ <id>CHIP_UNIT</id> <default>16</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>16</default> + </attribute> </targetInstance> <targetInstance> @@ -8517,6 +9131,10 @@ <id>CHIP_UNIT</id> <default>17</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>17</default> + </attribute> </targetInstance> <targetInstance> @@ -8550,6 +9168,10 @@ <id>CHIP_UNIT</id> <default>18</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>18</default> + </attribute> </targetInstance> <targetInstance> @@ -8583,6 +9205,10 @@ <id>CHIP_UNIT</id> <default>19</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>19</default> + </attribute> </targetInstance> <targetInstance> @@ -8616,6 +9242,10 @@ <id>CHIP_UNIT</id> <default>20</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>20</default> + </attribute> </targetInstance> <targetInstance> @@ -8649,6 +9279,10 @@ <id>CHIP_UNIT</id> <default>21</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>21</default> + </attribute> </targetInstance> <targetInstance> @@ -8682,6 +9316,10 @@ <id>CHIP_UNIT</id> <default>32</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>32</default> + </attribute> </targetInstance> <targetInstance> @@ -8715,6 +9353,10 @@ <id>CHIP_UNIT</id> <default>33</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>33</default> + </attribute> </targetInstance> <targetInstance> @@ -8748,6 +9390,10 @@ <id>CHIP_UNIT</id> <default>34</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>34</default> + </attribute> </targetInstance> <targetInstance> @@ -8781,6 +9427,10 @@ <id>CHIP_UNIT</id> <default>35</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>35</default> + </attribute> </targetInstance> <targetInstance> @@ -8814,6 +9464,10 @@ <id>CHIP_UNIT</id> <default>36</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>36</default> + </attribute> </targetInstance> <targetInstance> @@ -8847,6 +9501,10 @@ <id>CHIP_UNIT</id> <default>37</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>37</default> + </attribute> </targetInstance> <targetInstance> @@ -8880,6 +9538,10 @@ <id>CHIP_UNIT</id> <default>38</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>38</default> + </attribute> </targetInstance> <targetInstance> @@ -8913,6 +9575,10 @@ <id>CHIP_UNIT</id> <default>39</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>39</default> + </attribute> </targetInstance> <targetInstance> @@ -8946,6 +9612,10 @@ <id>CHIP_UNIT</id> <default>40</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>40</default> + </attribute> </targetInstance> <targetInstance> @@ -8979,6 +9649,10 @@ <id>CHIP_UNIT</id> <default>41</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>41</default> + </attribute> </targetInstance> <targetInstance> @@ -9012,6 +9686,10 @@ <id>CHIP_UNIT</id> <default>42</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>42</default> + </attribute> </targetInstance> <targetInstance> @@ -9045,6 +9723,10 @@ <id>CHIP_UNIT</id> <default>43</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>43</default> + </attribute> </targetInstance> <targetInstance> @@ -9078,6 +9760,10 @@ <id>CHIP_UNIT</id> <default>44</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>44</default> + </attribute> </targetInstance> <targetInstance> @@ -9111,6 +9797,10 @@ <id>CHIP_UNIT</id> <default>45</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>45</default> + </attribute> </targetInstance> <targetInstance> @@ -9144,6 +9834,10 @@ <id>CHIP_UNIT</id> <default>46</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>46</default> + </attribute> </targetInstance> <targetInstance> @@ -9177,6 +9871,10 @@ <id>CHIP_UNIT</id> <default>47</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>47</default> + </attribute> </targetInstance> <targetInstance> @@ -9210,6 +9908,10 @@ <id>CHIP_UNIT</id> <default>48</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>48</default> + </attribute> </targetInstance> <targetInstance> @@ -9243,6 +9945,10 @@ <id>CHIP_UNIT</id> <default>49</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>49</default> + </attribute> </targetInstance> <targetInstance> @@ -9276,6 +9982,10 @@ <id>CHIP_UNIT</id> <default>50</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>50</default> + </attribute> </targetInstance> <targetInstance> @@ -9309,6 +10019,10 @@ <id>CHIP_UNIT</id> <default>51</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>51</default> + </attribute> </targetInstance> <targetInstance> @@ -9342,6 +10056,10 @@ <id>CHIP_UNIT</id> <default>52</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>52</default> + </attribute> </targetInstance> <targetInstance> @@ -9375,6 +10093,10 @@ <id>CHIP_UNIT</id> <default>53</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>53</default> + </attribute> </targetInstance> <targetInstance> @@ -9408,6 +10130,10 @@ <id>CHIP_UNIT</id> <default>54</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>54</default> + </attribute> </targetInstance> <targetInstance> @@ -9441,6 +10167,10 @@ <id>CHIP_UNIT</id> <default>55</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>55</default> + </attribute> </targetInstance> <targetInstance> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 89ad14f05..f1ccefb5d 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -346,6 +346,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0</default> + </attribute> </targetType> <!-- Memory Buffer Target Types --> @@ -1231,7 +1235,6 @@ </attribute> <attribute><id>DECONFIG_GARDABLE</id><default>1</default></attribute> <attribute><id>SCRATCH_UINT8_1</id><default>5</default></attribute> - <attribute><id>CHIPLET_ID</id></attribute> <attribute><id>PARENT_PERVASIVE</id></attribute> <attribute><id>CDM_DOMAIN</id><default>CPU</default></attribute> <attribute><id>CORE_PPM_ERRMASK</id></attribute> diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml index 948d76685..4bdfd3527 100644 --- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml @@ -317,6 +317,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-16</default> </attribute> @@ -358,6 +362,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-17</default> </attribute> @@ -402,6 +410,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-18</default> </attribute> @@ -435,6 +447,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-19</default> </attribute> @@ -468,6 +484,10 @@ <default>4</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-20</default> </attribute> @@ -501,6 +521,10 @@ <default>5</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-21</default> </attribute> @@ -534,6 +558,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <targetInstance> @@ -563,6 +591,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x10</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq1 EX units --> @@ -593,6 +625,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <targetInstance> @@ -622,6 +658,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x11</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq2 EX units --> @@ -652,6 +692,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <targetInstance> @@ -681,6 +725,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x12</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq3 EX units --> @@ -711,6 +759,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <targetInstance> @@ -740,6 +792,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x13</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq4 EX units --> @@ -770,6 +826,10 @@ <id>CHIP_UNIT</id> <default>8</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <targetInstance> @@ -799,6 +859,10 @@ <id>CHIP_UNIT</id> <default>9</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x14</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq5 EX units --> @@ -829,6 +893,10 @@ <id>CHIP_UNIT</id> <default>10</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <targetInstance> @@ -858,6 +926,10 @@ <id>CHIP_UNIT</id> <default>11</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x15</default> + </attribute> </targetInstance> <!-- nimbus n0p0eq0ex0 CORE units --> @@ -889,6 +961,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x20</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-32</default> </attribute> @@ -922,6 +998,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x21</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-33</default> </attribute> @@ -956,6 +1036,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x22</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-34</default> </attribute> @@ -989,6 +1073,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x23</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-35</default> </attribute> @@ -1023,6 +1111,10 @@ <default>4</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x24</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-36</default> </attribute> @@ -1056,6 +1148,10 @@ <default>5</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x25</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-37</default> </attribute> @@ -1090,6 +1186,10 @@ <default>6</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x26</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-38</default> </attribute> @@ -1123,6 +1223,10 @@ <default>7</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x27</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-39</default> </attribute> @@ -1157,6 +1261,10 @@ <default>8</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x28</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-40</default> </attribute> @@ -1190,6 +1298,10 @@ <default>9</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x29</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-41</default> </attribute> @@ -1224,6 +1336,10 @@ <default>10</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2A</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-42</default> </attribute> @@ -1257,6 +1373,10 @@ <default>11</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2B</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-43</default> </attribute> @@ -1291,6 +1411,10 @@ <default>12</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2C</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-44</default> </attribute> @@ -1324,6 +1448,10 @@ <default>13</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2D</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-45</default> </attribute> @@ -1358,6 +1486,10 @@ <default>14</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2E</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-46</default> </attribute> @@ -1391,6 +1523,10 @@ <default>15</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x2F</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-47</default> </attribute> @@ -1425,6 +1561,10 @@ <default>16</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x30</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-48</default> </attribute> @@ -1458,6 +1598,10 @@ <default>17</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x31</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-49</default> </attribute> @@ -1492,6 +1636,10 @@ <default>18</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x32</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-50</default> </attribute> @@ -1525,6 +1673,10 @@ <default>19</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x33</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-51</default> </attribute> @@ -1559,6 +1711,10 @@ <default>20</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x34</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-52</default> </attribute> @@ -1592,6 +1748,10 @@ <default>21</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x35</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-53</default> </attribute> @@ -1626,6 +1786,10 @@ <default>22</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x36</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-54</default> </attribute> @@ -1659,6 +1823,10 @@ <default>23</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x37</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-55</default> </attribute> @@ -1693,6 +1861,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -1726,6 +1898,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -1759,6 +1935,10 @@ <id>CHIP_UNIT</id> <default>0</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E58000000000</default> </attribute> @@ -1799,6 +1979,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E5A000000000</default> </attribute> @@ -1839,6 +2023,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E5C000000000</default> </attribute> @@ -1879,6 +2067,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> <attribute><id>IBSCOM_MCS_BASE_ADDR</id> <default>0x0003E5E000000000</default> </attribute> @@ -1921,6 +2113,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -1954,6 +2150,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -1988,6 +2188,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -2021,6 +2225,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x07</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-7</default> </attribute> @@ -2055,6 +2263,10 @@ <default>4</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2088,6 +2300,10 @@ <default>5</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2122,6 +2338,10 @@ <default>6</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2155,6 +2375,10 @@ <default>7</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x08</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-8</default> </attribute> @@ -2490,6 +2714,10 @@ <default>0</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x09</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-9</default> </attribute> @@ -2523,6 +2751,10 @@ <default>3</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x0C</default> + </attribute> + <attribute> <id>PARENT_PERVASIVE</id> <default>physical:sys-0/node-0/proc-0/perv-12</default> </attribute> @@ -2651,6 +2883,10 @@ <id>CHIP_UNIT</id> <default>1</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>1</default> + </attribute> </targetInstance> <targetInstance> @@ -2684,6 +2920,10 @@ <id>CHIP_UNIT</id> <default>2</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>2</default> + </attribute> </targetInstance> <targetInstance> @@ -2717,6 +2957,10 @@ <id>CHIP_UNIT</id> <default>3</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>3</default> + </attribute> </targetInstance> <targetInstance> @@ -2750,6 +2994,10 @@ <id>CHIP_UNIT</id> <default>4</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>4</default> + </attribute> </targetInstance> <targetInstance> @@ -2783,6 +3031,10 @@ <id>CHIP_UNIT</id> <default>5</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>5</default> + </attribute> </targetInstance> <targetInstance> @@ -2816,6 +3068,10 @@ <id>CHIP_UNIT</id> <default>6</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>6</default> + </attribute> </targetInstance> <targetInstance> @@ -2849,6 +3105,10 @@ <id>CHIP_UNIT</id> <default>7</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>7</default> + </attribute> </targetInstance> <targetInstance> @@ -2882,6 +3142,10 @@ <id>CHIP_UNIT</id> <default>8</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>8</default> + </attribute> </targetInstance> <targetInstance> @@ -2915,6 +3179,10 @@ <id>CHIP_UNIT</id> <default>9</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>9</default> + </attribute> </targetInstance> <targetInstance> @@ -2948,6 +3216,10 @@ <id>CHIP_UNIT</id> <default>12</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>12</default> + </attribute> </targetInstance> <targetInstance> @@ -2981,6 +3253,10 @@ <id>CHIP_UNIT</id> <default>13</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>13</default> + </attribute> </targetInstance> <targetInstance> @@ -3014,6 +3290,10 @@ <id>CHIP_UNIT</id> <default>14</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>14</default> + </attribute> </targetInstance> <targetInstance> @@ -3047,6 +3327,10 @@ <id>CHIP_UNIT</id> <default>15</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>15</default> + </attribute> </targetInstance> <targetInstance> @@ -3080,6 +3364,10 @@ <id>CHIP_UNIT</id> <default>16</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>16</default> + </attribute> </targetInstance> <targetInstance> @@ -3113,6 +3401,10 @@ <id>CHIP_UNIT</id> <default>17</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>17</default> + </attribute> </targetInstance> <targetInstance> @@ -3146,6 +3438,10 @@ <id>CHIP_UNIT</id> <default>18</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>18</default> + </attribute> </targetInstance> <targetInstance> @@ -3179,6 +3475,10 @@ <id>CHIP_UNIT</id> <default>19</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>19</default> + </attribute> </targetInstance> <targetInstance> @@ -3212,6 +3512,10 @@ <id>CHIP_UNIT</id> <default>20</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>20</default> + </attribute> </targetInstance> <targetInstance> @@ -3245,6 +3549,10 @@ <id>CHIP_UNIT</id> <default>21</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>21</default> + </attribute> </targetInstance> <targetInstance> @@ -3278,6 +3586,10 @@ <id>CHIP_UNIT</id> <default>32</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>32</default> + </attribute> </targetInstance> <targetInstance> @@ -3311,6 +3623,10 @@ <id>CHIP_UNIT</id> <default>33</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>33</default> + </attribute> </targetInstance> <targetInstance> @@ -3344,6 +3660,10 @@ <id>CHIP_UNIT</id> <default>34</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>34</default> + </attribute> </targetInstance> <targetInstance> @@ -3377,6 +3697,10 @@ <id>CHIP_UNIT</id> <default>35</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>35</default> + </attribute> </targetInstance> <targetInstance> @@ -3410,6 +3734,10 @@ <id>CHIP_UNIT</id> <default>36</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>36</default> + </attribute> </targetInstance> <targetInstance> @@ -3443,6 +3771,10 @@ <id>CHIP_UNIT</id> <default>37</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>37</default> + </attribute> </targetInstance> <targetInstance> @@ -3476,6 +3808,10 @@ <id>CHIP_UNIT</id> <default>38</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>38</default> + </attribute> </targetInstance> <targetInstance> @@ -3509,6 +3845,10 @@ <id>CHIP_UNIT</id> <default>39</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>39</default> + </attribute> </targetInstance> <targetInstance> @@ -3542,6 +3882,10 @@ <id>CHIP_UNIT</id> <default>40</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>40</default> + </attribute> </targetInstance> <targetInstance> @@ -3575,6 +3919,10 @@ <id>CHIP_UNIT</id> <default>41</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>41</default> + </attribute> </targetInstance> <targetInstance> @@ -3608,6 +3956,10 @@ <id>CHIP_UNIT</id> <default>42</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>42</default> + </attribute> </targetInstance> <targetInstance> @@ -3641,6 +3993,10 @@ <id>CHIP_UNIT</id> <default>43</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>43</default> + </attribute> </targetInstance> <targetInstance> @@ -3674,6 +4030,10 @@ <id>CHIP_UNIT</id> <default>44</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>44</default> + </attribute> </targetInstance> <targetInstance> @@ -3707,6 +4067,10 @@ <id>CHIP_UNIT</id> <default>45</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>45</default> + </attribute> </targetInstance> <targetInstance> @@ -3740,6 +4104,10 @@ <id>CHIP_UNIT</id> <default>46</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>46</default> + </attribute> </targetInstance> <targetInstance> @@ -3773,6 +4141,10 @@ <id>CHIP_UNIT</id> <default>47</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>47</default> + </attribute> </targetInstance> <targetInstance> @@ -3806,6 +4178,10 @@ <id>CHIP_UNIT</id> <default>48</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>48</default> + </attribute> </targetInstance> <targetInstance> @@ -3839,6 +4215,10 @@ <id>CHIP_UNIT</id> <default>49</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>49</default> + </attribute> </targetInstance> <targetInstance> @@ -3872,6 +4252,10 @@ <id>CHIP_UNIT</id> <default>50</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>50</default> + </attribute> </targetInstance> <targetInstance> @@ -3905,6 +4289,10 @@ <id>CHIP_UNIT</id> <default>51</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>51</default> + </attribute> </targetInstance> <targetInstance> @@ -3938,6 +4326,10 @@ <id>CHIP_UNIT</id> <default>52</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>52</default> + </attribute> </targetInstance> <targetInstance> @@ -3971,6 +4363,10 @@ <id>CHIP_UNIT</id> <default>53</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>53</default> + </attribute> </targetInstance> <targetInstance> @@ -4004,6 +4400,10 @@ <id>CHIP_UNIT</id> <default>54</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>54</default> + </attribute> </targetInstance> <targetInstance> @@ -4037,6 +4437,10 @@ <id>CHIP_UNIT</id> <default>55</default> </attribute> + <attribute> + <id>CHIPLET_ID</id> + <default>55</default> + </attribute> </targetInstance> @@ -4069,6 +4473,10 @@ <default>1</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x06</default> + </attribute> + <attribute> <id>PEER_TARGET</id> <default>physical:sys-0/node-0/proc-1/xbus-1</default> </attribute> @@ -4106,6 +4514,10 @@ <default>2</default> </attribute> <attribute> + <id>CHIPLET_ID</id> + <default>0x06</default> + </attribute> + <attribute> <id>PEER_TARGET</id> <default>physical:sys-0/node-0/proc-1/xbus-1</default> </attribute> |