diff options
| author | Mike Jones <mjjones@us.ibm.com> | 2012-02-22 17:09:18 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-02-28 11:26:58 -0600 |
| commit | e4c32d91dc6100d9f9bac47855b3f0c675530b1f (patch) | |
| tree | cd40b68b135376f8b2d294b7af371405831482bd | |
| parent | fec524004b0f9e15a8f8a9986e0415b4aa0f75b7 (diff) | |
| download | talos-hostboot-e4c32d91dc6100d9f9bac47855b3f0c675530b1f.tar.gz talos-hostboot-e4c32d91dc6100d9f9bac47855b3f0c675530b1f.zip | |
HWPF Attribute Support. DQ Attribute
Change-Id: I05e6f4f435574e25f65702c875e332e253927ff7
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/686
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
36 files changed, 3258 insertions, 1892 deletions
@@ -44,4 +44,4 @@ if [ -n "${SANDBOXROOT}" ]; then fi fi -export DEFAULT_MACHINE=SALERNO +export DEFAULT_MACHINE=VENICE diff --git a/src/include/usr/hwpf/fapi/fapiReturnCode.H b/src/include/usr/hwpf/fapi/fapiReturnCode.H index bd19c40e8..504e82c9a 100644 --- a/src/include/usr/hwpf/fapi/fapiReturnCode.H +++ b/src/include/usr/hwpf/fapi/fapiReturnCode.H @@ -39,6 +39,7 @@ * mjjones 09/22/2011 Added ErrorInfo Support * mjjones 11/10/2011 Use ecmdDataBufferBase * mjjones 01/12/2012 Enforce correct usage + * mjjones 02/22/2012 Allow user to add Target FFDC */ #ifndef FAPIRETURNCODE_H_ @@ -46,6 +47,7 @@ #include <stdint.h> #include <stddef.h> +#include <string.h> #include <ecmdDataBufferBase.H> #include <fapiTarget.H> #include <fapiReturnCodes.H> @@ -397,6 +399,7 @@ namespace ReturnCodeFfdc enum ErrorInfoFfdcSize { EI_FFDC_SIZE_ECMDDB = -1, // ecmdDataBufferBase + EI_FFDC_SIZE_TARGET = -2, // fapi::Target }; /** @@ -426,6 +429,16 @@ namespace ReturnCodeFfdc } /** + * @brief Get FFDC Size specialization for fapi::Target + */ + template<> + inline int16_t getErrorInfoFfdcSize<fapi::Target>( + const fapi::Target &) + { + return EI_FFDC_SIZE_TARGET; + } + + /** * @brief Compile error if caller tries to get the FFDC size of a pointer * * If this function template is instantiated, the compile will fail due to @@ -472,12 +485,25 @@ namespace ReturnCodeFfdc // Deliberately not checking return code from extract to save code space i_ffdc.extract(l_pData, 0, i_ffdc.getBitLength()); - o_rc.addEIFfdc(l_pData, (i_ffdc.getWordLength() * 4)); delete [] l_pData; } /** + * @brief Specialization of addEIFfdc for fapi::Target + * + * @param[out] o_rc Reference to ReturnCode to copy FFDC to + * @param[in] i_ffdc Reference to fapi::Target to add FFDC for + */ + template<> + inline void addEIFfdc<fapi::Target>(ReturnCode & o_rc, + const fapi::Target & i_ffdc) + { + const char * l_ecmdString = i_ffdc.toEcmdString(); + o_rc.addEIFfdc(l_ecmdString, (strlen(l_ecmdString) + 1)); + } + + /** * @brief Compile error if caller tries to add a pointer as FFDC * * If this function template is instantiated, the compile will fail due to diff --git a/src/include/usr/hwpf/fapi/fapiSystemConfig.H b/src/include/usr/hwpf/fapi/fapiSystemConfig.H index 5bb704661..7c2b904ee 100644 --- a/src/include/usr/hwpf/fapi/fapiSystemConfig.H +++ b/src/include/usr/hwpf/fapi/fapiSystemConfig.H @@ -32,6 +32,8 @@ * Flag Defect/Feature User Date Description * ------ -------------- ---------- ----------- ---------------------------- * mjjones 09/12/2011 Updated with new functions. + * mjjones 02/17/2012 Updated fapiGetAssociatedDimms + * description to only allow MBA * */ @@ -65,12 +67,9 @@ fapi::ReturnCode fapiGetChildChiplets( const fapi::TargetState i_state = fapi::TARGET_STATE_FUNCTIONAL); /** - * @brief Gets the DIMMs that are logically associated with the input target + * @brief Gets the DIMMs that are logically associated with the input MBA target * - * The logical association is MCS-MBS-MBA-DIMM. The input target must be a MCS, - * MBS or MBA chiplet and the output will be the associated DIMMs - * - * @param[in] i_target Input target + * @param[in] i_target Input MBA chiplet target * @param[out] o_dimms Reference to vector that is cleared then filled in with * the associated DIMM Targets * @param[in] i_state Only return targets of the specified state. Either diff --git a/src/include/usr/hwpf/fapi/fapiTarget.H b/src/include/usr/hwpf/fapi/fapiTarget.H index 9a09c7644..e09e8fd5d 100644 --- a/src/include/usr/hwpf/fapi/fapiTarget.H +++ b/src/include/usr/hwpf/fapi/fapiTarget.H @@ -38,6 +38,7 @@ * mjjones 09/12/2011 Added isChip and isChiplet * mjjones 02/07/2012 Remove MBS_CHIPLET * Add XBUS_ENDPOINT ABUS_ENDPOINT + * mjjones 02/21/2012 Add high performance toEcmdString */ #ifndef FAPITARGET_H_ @@ -212,7 +213,21 @@ public: /** * @brief Convert a target to an ecmd-format target string * - * This is used in order to trace the target in the common SCAN trace + * This is used by HWP/FAPI code to trace the target. + * + * @return Pointer to NULL terminated character string. The caller must use + * the string before the Target object is destructed. + */ + const char * toEcmdString() const; + +private: + + /** + * @brief Convert a target to an ecmd-format target string + * + * This is a private function called by toEcmdString to load the ecmd-format + * string into the Target object. Subsequent calls of toEcmdString are high + * performance and just return a pointer to the internal string. * * @note Implemented by platform code * @@ -222,8 +237,6 @@ public: */ void toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const; -private: - /** * @brief Compare the handle * @@ -259,6 +272,9 @@ private: // Pointer to platform specific Target Handle void * iv_pHandle; + + // Pointer to the ecmd-format string representing the Target + mutable char * iv_pEcmdString; }; } diff --git a/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H b/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H new file mode 100644 index 000000000..fc7703ebc --- /dev/null +++ b/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H @@ -0,0 +1,77 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file dimmBadDqBitmapAccessHwp.H + * + * @brief FW Team HWP that accesses the Bad DQ Bitmap. + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/17/2012 Created. + */ + +#ifndef DIMMBADDQBITMAPACCESSHWP_H_ +#define DIMMBADDQBITMAPACCESSHWP_H_ + +#include <fapi.H> +#include <dimmConsts.H> + +typedef fapi::ReturnCode (*dimmBadDqBitmapAccessHwp_FP_t)( + const fapi::Target &, + const uint8_t (&)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE], + const bool); + +extern "C" +{ + +/** + * @brief FW Team HWP that accesses the Bad DQ Bitmap. It accesses the raw data + * from DIMM SPD and does any necessary processing to turn it into a + * bitmap from a Centaur DQ point of view. If the data in SPD is not + * valid then it has never been written and all zeroes are returned (no + * bad DQs). + * + * This HWP should be called by HWP/PLAT code to access the BAD DQ Bitmap + * + * Note that the MSB of each byte corresponds to the lowest DQ. + * if (data[1][0] == 0x80) then rank 1, Centaur DQ0 is bad + * if (data[1][0] == 0x40) then rank 1, Centaur DQ1 is bad + * if (data[1][1] == 0x20) then rank 1, Centaur DQ10 is bad + * + * @param[in] i_dimm Reference to DIMM Target + * @param[io] io_data Reference to bad DQ bitmap data for the DIMM. + * @param[in] i_get True if getting DQ Bitmap data. False if setting data. + * + * @return ReturnCode + */ +fapi::ReturnCode dimmBadDqBitmapAccessHwp( + const fapi::Target & i_dimm, + uint8_t (&io_data)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE], + const bool i_get); + +} + +#endif diff --git a/src/include/usr/hwpf/hwp/dimmBadDqBitmapFuncs.H b/src/include/usr/hwpf/hwp/dimmBadDqBitmapFuncs.H new file mode 100644 index 000000000..73a8ae8b6 --- /dev/null +++ b/src/include/usr/hwpf/hwp/dimmBadDqBitmapFuncs.H @@ -0,0 +1,94 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/include/usr/hwpf/hwp/dimmBadDqBitmapFuncs.H $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file dimmBadDqBitmapFuncs.H + * + * @brief FW Team Utility functions that accesses the Bad DQ Bitmap. + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/17/2012 Created. + */ + +#ifndef DIMMBADDQBITMAPFUNCS_H_ +#define DIMMBADDQBITMAPFUNCS_H_ + +#include <fapi.H> +#include <dimmConsts.H> + +extern "C" +{ + +/** + * @brief FW Team Utility function that gets the Bad DQ Bitmap. + * + * This utility functon should be called by a HWP needing to get the Bad DQ + * bitmap for a particular mba, port, dimm and rank. + * + * This function finds the corresponding DIMM Target, calls + * dimmBadDqBitmapAccessHwp to get the DQ bitmap and returns the data + * for the specified rank. + * + * @param[in] i_mba Reference to MBA Chiplet + * @param[in] i_port MBA port number (0-(DIMM_DQ_MAX_MBA_PORTS - 1)) + * @param[in] i_dimm MBA port DIMM number (0-(DIMM_DQ_MAX_MBAPORT_DIMMS - 1)) + * @param[in] i_rank DIMM rank number (0-(DIMM_DQ_MAX_DIMM_RANKS -1)) + * @param[out] o_data Reference to data where Bad DQ bitmap is copied to + * + * @return ReturnCode + */ +fapi::ReturnCode dimmGetBadDqBitmap(const fapi::Target & i_mba, + const uint8_t i_port, + const uint8_t i_dimm, + const uint8_t i_rank, + uint8_t (&o_data)[DIMM_DQ_RANK_BITMAP_SIZE]); + +/** + * @brief FW Team Utility function that sets the Bad DQ Bitmap. + * + * This utility functon should be called by a HWP needing to set the Bad DQ + * bitmap for a particular mba, port, dimm and rank. + * + * This utility function finds the corresponding DIMM Target, calls + * dimmBadDqBitmapAccessHwp to get the DQ bitmap, fills in the data for the + * specified rank and calls dimmBadDqBitmapAccessHwp to set the DQ bitmap + * + * @param[in] i_mba Reference to MBA Chiplet + * @param[in] i_port MBA port number (0-(DIMM_DQ_MAX_MBA_PORTS - 1)) + * @param[in] i_dimm MBA port DIMM number (0-(DIMM_DQ_MAX_MBAPORT_DIMMS - 1)) + * @param[in] i_rank DIMM rank number (0-(DIMM_DQ_MAX_DIMM_RANKS -1)) + * @param[in] i_data Reference to data where Bad DQ bitmap is copied from + * + * @return ReturnCode + */ +fapi::ReturnCode dimmSetBadDqBitmap(const fapi::Target & i_mba, + const uint8_t i_port, + const uint8_t i_dimm, + const uint8_t i_rank, + const uint8_t (&i_data)[DIMM_DQ_RANK_BITMAP_SIZE]); +} + +#endif diff --git a/src/include/usr/hwpf/hwp/dimmConsts.H b/src/include/usr/hwpf/hwp/dimmConsts.H new file mode 100644 index 000000000..cf63586b2 --- /dev/null +++ b/src/include/usr/hwpf/hwp/dimmConsts.H @@ -0,0 +1,60 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/include/usr/hwpf/hwp/dimmConsts.H $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file dimmConsts.H + * + * @brief DIMM Constants + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/17/2012 Created. + */ + +#ifndef DIMMCONSTS_H_ +#define DIMMCONSTS_H_ + +// Maximum number of ports on an MBA +const uint8_t DIMM_DQ_MAX_MBA_PORTS = 2; + +// Maximum number of DIMMs attached to an MBA PORT +const uint8_t DIMM_DQ_MAX_MBAPORT_DIMMS = 2; + +// Maximum number of ranks on a DIMM +const uint8_t DIMM_DQ_MAX_DIMM_RANKS = 4; + +// Size in bytes of the Bad DQ bitmap for a rank. +const uint8_t DIMM_DQ_RANK_BITMAP_SIZE = 10; + +// Number of DQs (data query pins). +// This is the number of bits in DIMM_DQ_RANK_BITMAP_SIZE. +const uint8_t DIMM_DQ_NUM_DQS = DIMM_DQ_RANK_BITMAP_SIZE * 8; + +// Size in bytes of Bad DQ Data in DIMM SPD +// This must be big enough to contain the bitmap for each rank +// (DIMM_DQ_MAX_DIMM_RANKS * DIMM_DQ_RANK_BITMAP_SIZE), plus the header +const uint8_t DIMM_DQ_SPD_DATA_SIZE = 80; + +#endif diff --git a/src/include/usr/hwpf/hwp/fapiTestHwpDq.H b/src/include/usr/hwpf/hwp/fapiTestHwpDq.H new file mode 100644 index 000000000..72c6aa8e1 --- /dev/null +++ b/src/include/usr/hwpf/hwp/fapiTestHwpDq.H @@ -0,0 +1,57 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/include/usr/hwpf/hwp/fapiTestHwpDq.H $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file fapiTestHwpDq.H + * + * @brief Test Hardware Procedure that exercises the bad DQ data + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/21/2012 Created + */ + +#ifndef FAPITESTHWPDQ_H_ +#define FAPITESTHWPDQ_H_ + +#include <fapi.H> + +typedef fapi::ReturnCode (*fapiTestHwpDq_FP_t)(const fapi::Target &); + +extern "C" +{ + +/** + * @brief Test Hardware Procedure that exercises the bad DQ data + * + * @param[in] i_mba Reference to MBA chiplet + * + * @return ReturnCode + */ +fapi::ReturnCode fapiTestHwpDq(const fapi::Target & i_mba); + +} + +#endif diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H index 6bd206383..f94e5dd4f 100755 --- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H +++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H @@ -53,6 +53,7 @@ #include <hwpf/fapi/fapiReturnCode.H> #include <hwpf/fapi/fapiTarget.H> #include <spd/spdenums.H> +#include <dimmConsts.H> //****************************************************************************** // Interface @@ -125,7 +126,7 @@ namespace platAttrSvc /** * @brief This function is called by the FAPI_ATTR_GET macro when accessing - * SPD ATTR. IT should not be called directly + * SPD ATTR. It should not be called directly * * @param[in] i_target Target pointer to operate on * @param[in] i_keyword SPD keyword @@ -133,9 +134,25 @@ namespace platAttrSvc * @param[in] i_len Size of storage * @return ReturnCode. Zero on success, else platform specified error */ -ReturnCode fapiPlatGetSpdAttr(const Target * i_target, - const uint16_t i_keyword, - void * o_data, size_t i_len ); +fapi::ReturnCode fapiPlatGetSpdAttr(const fapi::Target * i_target, + const uint16_t i_keyword, + void * o_data, + size_t i_len ); + +/** + * @brief This function is called by the FAPI_ATTR_SET macro when accessing + * SPD ATTR. It should not be called directly + * + * @param[in] i_target Target pointer to operate on + * @param[in] i_keyword SPD keyword + * @param[in] i_data Pointer to data + * @param[in] i_len Size of data + * @return ReturnCode. Zero on success, else platform specified error + */ +fapi::ReturnCode fapiPlatSetSpdAttr(const fapi::Target * i_target, + const uint16_t i_keyword, + void * i_data, + size_t i_len ); /** * @brief This function is called by the FAPI_ATTR_GET macro when getting @@ -159,6 +176,17 @@ fapi::ReturnCode fapiPlatGetMemoryBaseAddr(const fapi::Target * i_pMcsTarget, fapi::ReturnCode fapiPlatGetMirrorBaseAddr(const fapi::Target * i_pMcsTarget, uint64_t & o_addr); +/** + * @brief This function is called by the FAPI_ATTR_GET macro when getting + * ATTR_CEN_DQ_TO_DIMM_CONN_DQ. It should not be called directly + * + * @param[in] i_pDimmTarget DIMM target pointer + * @param[out] o_data Output data + * @return ReturnCode. Zero on success, else platform specified error + */ +fapi::ReturnCode fapiPlatGetDqMapping(const fapi::Target * i_pDimmTarget, + uint8_t (&o_data)[DIMM_DQ_NUM_DQS]); + } } @@ -254,6 +282,10 @@ fapi::ReturnCode fapiPlatGetMirrorBaseAddr(const fapi::Target * i_pMcsTarget, fapi::platAttrSvc::fapiPlatGetSpdAttr( PTARGET, SPD::MODULE_REVISION_CODE, &(VAL), sizeof(VAL) ) #define ATTR_SPD_DRAM_MANUFACTURER_JEDEC_ID_CODE_GETMACRO(ID, PTARGET, VAL) \ fapi::platAttrSvc::fapiPlatGetSpdAttr( PTARGET, SPD::DRAM_MANUFACTURER_ID, &(VAL), sizeof(VAL) ) +#define ATTR_SPD_BAD_DQ_DATA_GETMACRO(ID, PTARGET, VAL) \ + fapi::platAttrSvc::fapiPlatGetSpdAttr( PTARGET, SPD::DIMM_BAD_DQ_DATA, &(VAL), sizeof(VAL) ) +#define ATTR_SPD_BAD_DQ_DATA_SETMACRO(ID, PTARGET, VAL) \ + fapi::platAttrSvc::fapiPlatSetSpdAttr( PTARGET, SPD::DIMM_BAD_DQ_DATA, &(VAL), sizeof(VAL) ) //------------------------------------------------------------------------------ // MACROs to route ATTR Base Address accesses to the correct Hostboot function @@ -263,4 +295,11 @@ fapi::ReturnCode fapiPlatGetMirrorBaseAddr(const fapi::Target * i_pMcsTarget, #define ATTR_MSS_MIRROR_BASE_GETMACRO(ID, PTARGET, VAL) \ fapi::platAttrSvc::fapiPlatGetMirrorBaseAddr(PTARGET, VAL) +//------------------------------------------------------------------------------ +// MACRO to route ATTR_CEN_DQ_TO_DIMM_CONN_DQ access to the correct Hostboot +// function +//------------------------------------------------------------------------------ +#define ATTR_CEN_DQ_TO_DIMM_CONN_DQ_GETMACRO(ID, PTARGET, VAL) \ + fapi::platAttrSvc::fapiPlatGetDqMapping(PTARGET, VAL) + #endif // FAPIPLATATTRIBUTESERVICE_H_ diff --git a/src/include/usr/hwpf/plat/fapiPlatHwpExecutor.H b/src/include/usr/hwpf/plat/fapiPlatHwpExecutor.H index b3441ea9b..c179c0ddb 100644 --- a/src/include/usr/hwpf/plat/fapiPlatHwpExecutor.H +++ b/src/include/usr/hwpf/plat/fapiPlatHwpExecutor.H @@ -40,6 +40,8 @@ #include <fapiTestHwpFfdc.H> #include <fapiTestHwpConfig.H> #include <fapiTestHwpAttr.H> +#include <fapiTestHwpDq.H> +#include <dimmBadDqBitmapAccessHwp.H> /** * @brief HWP Executor macro diff --git a/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H b/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H index 0eaa87920..59e70adb6 100644 --- a/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H +++ b/src/include/usr/hwpf/plat/fapiPlatReasonCodes.H @@ -42,6 +42,7 @@ namespace fapi MOD_HANDLE_ECMD_BUF_RC = 0x06, MOD_VERIFY_CFAM_ACCESS_TARGET = 0x07, MOD_ATTR_BASE_ADDR_GET = 0x08, + MOD_ATTR_DQ_MAP_GET = 0x09, }; // Note that for HWP generated errors (MOD_HWP_RC_TO_ERRL), the diff --git a/src/usr/hwpf/fapi/fapiHwAccess.C b/src/usr/hwpf/fapi/fapiHwAccess.C index 901339341..9bb2ed630 100644 --- a/src/usr/hwpf/fapi/fapiHwAccess.C +++ b/src/usr/hwpf/fapi/fapiHwAccess.C @@ -38,6 +38,8 @@ * mjjones 09/14/2011 Prepended fapi to functions * and enabled all functions * mjjones 10/13/2011 util namespace change + * mjjones 02/21/2012 Use high performance Target + * toEcmdString */ #include <fapi.H> @@ -61,12 +63,8 @@ fapi::ReturnCode fapiGetScom(const fapi::Target& i_target, if( l_traceit ) { - // get the string representation of the target - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_target.toString(l_string); - FAPI_SCAN( "TRACE : GETSCOM : %s : %.16llX %.16llX", - l_string, + i_target.toEcmdString(), i_address, o_data.getDoubleWord( 0 ) ); } @@ -90,12 +88,8 @@ fapi::ReturnCode fapiPutScom(const fapi::Target& i_target, if( l_traceit ) { - // get the string representation of the target - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_target.toString(l_string); - FAPI_SCAN( "TRACE : PUTSCOM : %s : %.16llX %.16llX", - l_string, + i_target.toEcmdString(), i_address, i_data.getDoubleWord( 0 ) ); } @@ -119,12 +113,8 @@ fapi::ReturnCode fapiPutScomUnderMask(const fapi::Target& i_target, if( l_traceit ) { - // get the string representation of the target - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_target.toString(l_string); - FAPI_SCAN( "TRACE : PUTSCOMMASK : %s : %.16llX %.16llX %.16llX", - l_string, + i_target.toEcmdString(), i_address, i_data.getDoubleWord(0), i_mask.getDoubleWord(0)); @@ -148,12 +138,8 @@ fapi::ReturnCode fapiGetCfamRegister(const fapi::Target& i_target, if( l_traceit ) { - // get the string representation of the target - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_target.toString(l_string); - FAPI_SCAN( "TRACE : GETCFAMREG : %s : %.8X %.8X", - l_string, + i_target.toEcmdString(), i_address, o_data.getWord(0) ); } @@ -176,12 +162,8 @@ fapi::ReturnCode fapiPutCfamRegister(const fapi::Target& i_target, if( l_traceit ) { - // get the string representation of the target - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_target.toString(l_string); - FAPI_SCAN( "TRACE : PUTCFAMREG : %s : %.8X %.8X", - l_string, + i_target.toEcmdString(), i_address, i_data.getWord(0) ); } @@ -205,10 +187,6 @@ fapi::ReturnCode fapiModifyCfamRegister(const fapi::Target& i_target, if( l_traceit ) { - // get the string representation of the target - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_target.toString(l_string); - // get string representation of the modify mode const char * l_pMode = NULL; @@ -230,7 +208,7 @@ fapi::ReturnCode fapiModifyCfamRegister(const fapi::Target& i_target, } FAPI_SCAN( "TRACE : MODCFAMREG : %s : %.8X %.8X %s", - l_string, + i_target.toEcmdString(), i_address, i_data.getWord(0), l_pMode ); diff --git a/src/usr/hwpf/fapi/fapiReturnCode.C b/src/usr/hwpf/fapi/fapiReturnCode.C index 2af4ec44c..2de1f8e13 100644 --- a/src/usr/hwpf/fapi/fapiReturnCode.C +++ b/src/usr/hwpf/fapi/fapiReturnCode.C @@ -40,6 +40,7 @@ * ReturnCode * mjjones 09/22/2011 Added ErrorInfo Support * mjjones 01/12/2012 Enforce correct usage + * mjjones 02/22/2012 Allow user to add Target FFDC */ #include <fapiReturnCode.H> @@ -243,7 +244,6 @@ void ReturnCode::addErrorInfo(const void * const * i_pObjects, { // This is a regular FFDC data object that can be directly // memcopied - FAPI_ERR("addErrorInfo: Adding FFDC, size: %d", l_size); addEIFfdc(l_pObject, l_size); } else @@ -257,6 +257,14 @@ void ReturnCode::addErrorInfo(const void * const * i_pObjects, static_cast<const ecmdDataBufferBase *>(l_pObject); ReturnCodeFfdc::addEIFfdc(*this, *l_pDb); } + else if (l_size == ReturnCodeFfdc::EI_FFDC_SIZE_TARGET) + { + // The FFDC is a fapi::Target + FAPI_ERR("addErrorInfo: Adding fapi::Target FFDC"); + const fapi::Target * l_pTarget = + static_cast<const fapi::Target *>(l_pObject); + ReturnCodeFfdc::addEIFfdc(*this, *l_pTarget); + } else { FAPI_ERR("addErrorInfo: Unrecognized FFDC data: %d", diff --git a/src/usr/hwpf/fapi/fapiTarget.C b/src/usr/hwpf/fapi/fapiTarget.C index 5689b756f..b6305e581 100644 --- a/src/usr/hwpf/fapi/fapiTarget.C +++ b/src/usr/hwpf/fapi/fapiTarget.C @@ -35,6 +35,7 @@ * mjjones 09/12/2011 Added isChip and isChiplet * mjjones 02/07/2012 Remove MBS_CHIPLET * Add XBUS_ENDPOINT ABUS_ENDPOINT + * mjjones 02/21/2012 Add high performance toEcmdString */ #include <fapiTarget.H> @@ -46,7 +47,7 @@ namespace fapi // Default Constructor //****************************************************************************** Target::Target() : - iv_type(TARGET_TYPE_NONE), iv_pHandle(NULL) + iv_type(TARGET_TYPE_NONE), iv_pHandle(NULL), iv_pEcmdString(NULL) { } @@ -56,7 +57,7 @@ Target::Target() : //****************************************************************************** Target::Target(const TargetType i_type, void * i_pHandle) : - iv_type(i_type), iv_pHandle(i_pHandle) + iv_type(i_type), iv_pHandle(i_pHandle), iv_pEcmdString(NULL) { } @@ -65,7 +66,7 @@ Target::Target(const TargetType i_type, // Copy Constructor //****************************************************************************** Target::Target(const Target & i_right) : - iv_type(i_right.iv_type) + iv_type(i_right.iv_type), iv_pEcmdString(NULL) { (void) copyHandle(i_right); } @@ -76,6 +77,7 @@ Target::Target(const Target & i_right) : Target::~Target() { (void) deleteHandle(); + delete [] iv_pEcmdString; } //****************************************************************************** @@ -88,6 +90,8 @@ Target & Target::operator=(const Target & i_right) { iv_type = i_right.iv_type; (void) copyHandle(i_right); + delete [] iv_pEcmdString; + iv_pEcmdString = NULL; } return *this; } @@ -168,4 +172,21 @@ bool Target::isChiplet() const TARGET_TYPE_ABUS_ENDPOINT)) != 0); } +//****************************************************************************** +// Get the ecmd-format string +//****************************************************************************** +const char * Target::toEcmdString() const +{ + if (iv_pEcmdString == NULL) + { + iv_pEcmdString = new char[fapi::MAX_ECMD_STRING_LEN]; + char (&l_ecmdString)[fapi::MAX_ECMD_STRING_LEN] = + *(reinterpret_cast<char(*)[fapi::MAX_ECMD_STRING_LEN]> + (iv_pEcmdString)); + toString(l_ecmdString); + } + + return iv_pEcmdString; +} + } diff --git a/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C b/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C new file mode 100644 index 000000000..9775bb3d6 --- /dev/null +++ b/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C @@ -0,0 +1,205 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file dimmBadDqBitmapAccessHwp.C + * + * @brief FW Team HWP that accesses the Bad DQ Bitmap. + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/17/2012 Created. + */ + +#include <dimmBadDqBitmapAccessHwp.H> + +// DQ Data format in DIMM SPD +const uint32_t DIMM_BAD_DQ_MAGIC_NUMBER = 0xbadd4471; +const uint8_t DIMM_BAD_DQ_VERSION = 1; + +struct dimmBadDqDataFormat +{ + uint32_t iv_magicNumber; + uint8_t iv_version; + uint8_t iv_reserved1; + uint8_t iv_reserved2; + uint8_t iv_reserved3; + uint8_t iv_bitmaps[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE]; +}; + +extern "C" +{ + +fapi::ReturnCode dimmBadDqBitmapAccessHwp( + const fapi::Target & i_dimm, + uint8_t (&io_data)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE], + const bool i_get) +{ + if (i_get) + { + FAPI_INF(">>dimmBadDqBitmapAccessHwp: Getting bitmap"); + } + else + { + FAPI_INF(">>dimmBadDqBitmapAccessHwp: Setting bitmap"); + } + + fapi::ReturnCode l_rc; + + // Note the use of heap based arrays to avoid large stack allocations + + // Centaur DQ to DIMM Connector DQ Wiring attribute. + uint8_t (&l_wiringData)[DIMM_DQ_NUM_DQS] = + *(reinterpret_cast<uint8_t(*)[DIMM_DQ_NUM_DQS]> + (new uint8_t[DIMM_DQ_NUM_DQS])); + + // DQ SPD Attribute + uint8_t (&l_spdData)[DIMM_DQ_SPD_DATA_SIZE] = + *(reinterpret_cast<uint8_t(*)[DIMM_DQ_SPD_DATA_SIZE]> + (new uint8_t[DIMM_DQ_SPD_DATA_SIZE])); + + dimmBadDqDataFormat * l_pSpdData = + reinterpret_cast<dimmBadDqDataFormat *>(l_spdData); + + // Get the Centaur DQ to DIMM Connector DQ Wiring attribute. Note that for + // C-DIMMs, this will return a simple 1:1 mapping. This code cannot tell + // the difference between C-DIMMs and IS-DIMMs + l_rc = FAPI_ATTR_GET(ATTR_CEN_DQ_TO_DIMM_CONN_DQ, &i_dimm, l_wiringData); + + if (l_rc) + { + FAPI_ERR("dimmBadDqBitmapAccessHwp: Error getting wiring attribute"); + } + else + { + if (i_get) + { + // Get the SPD DQ attribute + l_rc = FAPI_ATTR_GET(ATTR_SPD_BAD_DQ_DATA, &i_dimm, l_spdData); + + if (l_rc) + { + FAPI_ERR("dimmBadDqBitmapAccessHwp: Error getting SPD data"); + } + else + { + // Zero caller's data + memset(io_data, 0, sizeof(io_data)); + + // Check the magic number and version number + if ((l_pSpdData->iv_magicNumber != DIMM_BAD_DQ_MAGIC_NUMBER) || + (l_pSpdData->iv_version != DIMM_BAD_DQ_VERSION)) + { + // SPD DQ data not initialized, return zeros + FAPI_INF("dimmBadDqBitmapAccessHwp: SPD DQ not initialized"); + } + else + { + // Translate bitmap from DIMM DQ to Centaur DQ point of view + // for each rank + for (uint8_t i = 0; i < DIMM_DQ_MAX_DIMM_RANKS; i++) + { + // Iterate through all the DQ bits in the rank + for (uint8_t j = 0; j < DIMM_DQ_NUM_DQS; j++) + { + // There is a byte for each 8 DQs, j/8 gives the + // byte number. The MSB in each byte is the lowest + // DQ, (0x80 >> (j % 8)) gives the bit mask + // corresponding to the DQ within the byte + if ((l_pSpdData->iv_bitmaps[i][j/8]) & + (0x80 >> (j % 8))) + { + // DIMM DQ bit is set in SPD data. + // Set Centaur DQ bit in caller's data. + // The wiring data maps Centaur DQ to DIMM DQ + // Find the Centaur DQ that maps to this DIMM DQ + uint8_t k = 0; + for (; k < DIMM_DQ_NUM_DQS; k++) + { + if (l_wiringData[k] == j) + { + io_data[i][k/8] |= (0x80 >> (k % 8)); + break; + } + } + + if (k == DIMM_DQ_NUM_DQS) + { + FAPI_ERR("dimmBadDqBitmapAccessHwp: Centaur DQ not found for %d!", + j); + } + } + } + } + } + } + } + else + { + // Set up the data to write to SPD + l_pSpdData->iv_magicNumber = DIMM_BAD_DQ_MAGIC_NUMBER; + l_pSpdData->iv_version = DIMM_BAD_DQ_VERSION; + l_pSpdData->iv_reserved1 = 0; + l_pSpdData->iv_reserved2 = 0; + l_pSpdData->iv_reserved3 = 0; + memset(l_pSpdData->iv_bitmaps, 0, sizeof(l_pSpdData->iv_bitmaps)); + + // Translate bitmap from Centaur DQ to DIMM DQ point of view for + // each rank + for (uint8_t i = 0; i < DIMM_DQ_MAX_DIMM_RANKS; i++) + { + // Iterate through all the DQ bits in the rank + for (uint8_t j = 0; j < DIMM_DQ_NUM_DQS; j++) + { + if ((io_data[i][j/8]) & (0x80 >> (j % 8))) + { + // Centaur DQ bit set in callers data. + // Set DIMM DQ bit in SPD data. + // The wiring data maps Centaur DQ to DIMM DQ + uint8_t dBit = l_wiringData[j]; + l_pSpdData->iv_bitmaps[i][dBit/8] |= + (0x80 >> (dBit % 8)); + } + } + } + + // Set the SPD DQ attribute + l_rc = FAPI_ATTR_SET(ATTR_SPD_BAD_DQ_DATA, &i_dimm, l_spdData); + + if (l_rc) + { + FAPI_ERR("dimmBadDqBitmapAccessHwp: Error setting SPD data"); + } + } + } + + delete [] &l_wiringData; + delete [] &l_spdData; + + FAPI_INF("<<dimmBadDqBitmapAccessHwp"); + return l_rc; +} + +} diff --git a/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C b/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C new file mode 100644 index 000000000..e9d413adc --- /dev/null +++ b/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C @@ -0,0 +1,230 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file dimmBadDqBitmapFuncs.C + * + * @brief FW Team Utility functions that accesses the Bad DQ Bitmap. + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/17/2012 Created. + */ + +#include <dimmBadDqBitmapFuncs.H> +#include <string.h> + +extern "C" +{ + +// TODO +// For the dimmGetBadDqBitmap and dimmSetBadDqBitmap funcs, the original plan to +// get/set the bitmap was to get/set a HWPF attribute called ATTR_BAD_DQ_BITMAP. +// This would automatically call the dimmBadDqBitmapAccessHwp HWP which would +// access the ATTR_SPD_BAD_DQ_DATA HWPF attribute and decode the data. However, +// automatically bridging an attribute request to a HWP turns out to be +// difficult due to the fact that the FAPI_ATTR_GET macro returns a ReturnCode +// and the FAPI_EXEC_HWP macro takes a ReturnCode as parameter. For now call the +// HWP directly and revisit later + + +//------------------------------------------------------------------------------ +// Utility function to check parameters and find a DIMM target +//------------------------------------------------------------------------------ +fapi::ReturnCode dimmBadDqCheckParamFindDimm(const fapi::Target & i_mba, + const uint8_t i_port, + const uint8_t i_dimm, + const uint8_t i_rank, + fapi::Target & o_dimm) +{ + fapi::ReturnCode l_rc; + + if ((i_port >= DIMM_DQ_MAX_MBA_PORTS) || + (i_dimm >= DIMM_DQ_MAX_MBAPORT_DIMMS) || + (i_rank >= DIMM_DQ_MAX_DIMM_RANKS)) + { + FAPI_ERR("dimmBadDqCheckParams: Bad parameter. %d:%d:%d", i_port, + i_dimm, i_rank); + const uint8_t & FFDC_PORT = i_port; + const uint8_t & FFDC_DIMM = i_dimm; + const uint8_t & FFDC_RANK = i_rank; + FAPI_SET_HWP_ERROR(l_rc, RC_BAD_DQ_DIMM_BAD_PARAM); + } + else + { + std::vector<fapi::Target> l_dimms; + + // Get the functional DIMMs associated with the MBA chiplet + l_rc = fapiGetAssociatedDimms(i_mba, l_dimms); + + if (l_rc) + { + FAPI_ERR("dimmBadDqFindDimm: Error from fapiGetAssociatedDimms"); + } + else + { + // Find the DIMM with the correct MBA port/dimm + uint8_t i = 0; + uint8_t l_port = 0; + uint8_t l_dimm = 0; + + for (; i < l_dimms.size(); i++) + { + l_rc = FAPI_ATTR_GET(ATTR_MBA_PORT, &(l_dimms[i]), l_port); + + if (l_rc) + { + FAPI_ERR("dimmBadDqFindDimm: Error getting ATTR_MBA_PORT for dimm"); + break; + } + else if (l_port == i_port) + { + l_rc = FAPI_ATTR_GET(ATTR_MBA_DIMM, &(l_dimms[i]), l_dimm); + + if (l_rc) + { + FAPI_ERR("dimmBadDqFindDimm: Error getting ATTR_MBA_DIMM for dimm"); + break; + } + else if (l_dimm == i_dimm) + { + o_dimm = l_dimms[i]; + break; + } + } + } + + if (!l_rc) + { + if (i == l_dimms.size()) + { + FAPI_ERR("dimmBadDqFindDimm: Did not find DIMM for %s:%d:%d", + i_mba.toEcmdString(), i_port, i_dimm); + const fapi::Target & FFDC_MBA_TARGET = i_mba; + const uint8_t & FFDC_PORT = i_port; + const uint8_t & FFDC_DIMM = i_dimm; + FAPI_SET_HWP_ERROR(l_rc, RC_BAD_DQ_DIMM_NOT_FOUND); + } + } + } + } + + return l_rc; +} + +//------------------------------------------------------------------------------ +fapi::ReturnCode dimmGetBadDqBitmap(const fapi::Target & i_mba, + const uint8_t i_port, + const uint8_t i_dimm, + const uint8_t i_rank, + uint8_t (&o_data)[DIMM_DQ_RANK_BITMAP_SIZE]) +{ + FAPI_INF(">>dimmGetBadDqBitmap. %s:%d:%d:%d", i_mba.toEcmdString(), i_port, + i_dimm, i_rank); + + fapi::ReturnCode l_rc; + + // Check parameters and find the DIMM Target + fapi::Target l_dimm; + l_rc = dimmBadDqCheckParamFindDimm(i_mba, i_port, i_dimm, i_rank, l_dimm); + + if (!l_rc) + { + // Get the Bad DQ bitmap by calling the dimmBadDqBitmapAccessHwp HWP. + // Use a heap based array to avoid large stack alloc + uint8_t (&l_dqBitmap)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE] = + *(reinterpret_cast<uint8_t(*)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE]> + (new uint8_t[DIMM_DQ_MAX_DIMM_RANKS*DIMM_DQ_RANK_BITMAP_SIZE])); + + FAPI_EXEC_HWP(l_rc, dimmBadDqBitmapAccessHwp, l_dimm, l_dqBitmap, true); + + if (l_rc) + { + FAPI_ERR("dimmGetBadDqBitmap: Error from dimmBadDqBitmapAccessHwp"); + } + else + { + memcpy(o_data, l_dqBitmap[i_rank], DIMM_DQ_RANK_BITMAP_SIZE); + } + + delete [] &l_dqBitmap; + } + + FAPI_INF("<<dimmGetBadDqBitmap"); + return l_rc; +} + +//------------------------------------------------------------------------------ +fapi::ReturnCode dimmSetBadDqBitmap( + const fapi::Target & i_mba, + const uint8_t i_port, + const uint8_t i_dimm, + const uint8_t i_rank, + const uint8_t (&i_data)[DIMM_DQ_RANK_BITMAP_SIZE]) +{ + FAPI_INF(">>dimmSetBadDqBitmap. %s:%d:%d:%d", i_mba.toEcmdString(), i_port, i_dimm, i_rank); + + fapi::ReturnCode l_rc; + + // Check parameters and find the DIMM Target + fapi::Target l_dimm; + l_rc = dimmBadDqCheckParamFindDimm(i_mba, i_port, i_dimm, i_rank, l_dimm); + + if (!l_rc) + { + // Get the Bad DQ bitmap by calling the dimmBadDqBitmapAccessHwp HWP. + // Use a heap based array to avoid large stack alloc + uint8_t (&l_dqBitmap)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE] = + *(reinterpret_cast<uint8_t(*)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE]> + (new uint8_t[DIMM_DQ_MAX_DIMM_RANKS*DIMM_DQ_RANK_BITMAP_SIZE])); + + FAPI_EXEC_HWP(l_rc, dimmBadDqBitmapAccessHwp, l_dimm, l_dqBitmap, true); + + if (l_rc) + { + FAPI_ERR("dimmSetBadDqBitmap: Error from dimmBadDqBitmapAccessHwp (get)"); + } + else + { + // Add the rank bitmap to the DIMM bitmap and write the bitmap + memcpy(l_dqBitmap[i_rank], i_data, DIMM_DQ_RANK_BITMAP_SIZE); + + FAPI_EXEC_HWP(l_rc, dimmBadDqBitmapAccessHwp, l_dimm, l_dqBitmap, false); + + if (l_rc) + { + FAPI_ERR("dimmSetBadDqBitmap: Error from dimmBadDqBitmapAccessHwp (set)"); + } + } + + delete [] &l_dqBitmap; + } + + + FAPI_INF("<<dimmSetBadDqBitmap"); + return l_rc; +} + +} // extern "C" diff --git a/src/usr/hwpf/hwp/dimm_attributes.xml b/src/usr/hwpf/hwp/dimm_attributes.xml new file mode 100644 index 000000000..c7573cbd6 --- /dev/null +++ b/src/usr/hwpf/hwp/dimm_attributes.xml @@ -0,0 +1,59 @@ +<!-- IBM_PROLOG_BEGIN_TAG + This is an automatically generated prolog. + + $Source: src/usr/hwpf/hwp/dimm_attributes.xml $ + + IBM CONFIDENTIAL + + COPYRIGHT International Business Machines Corp. 2012 + + p1 + + Object Code Only (OCO) source materials + Licensed Internal Code Source Materials + IBM HostBoot Licensed Internal Code + + The source code for this program is not published or other- + wise divested of its trade secrets, irrespective of what has + been deposited with the U.S. Copyright Office. + + Origin: 30 + + IBM_PROLOG_END --> +<!-- XML file specifying DIMM attributes used by HW Procedures. --> +<attributes> + +<attribute> + <id>ATTR_CEN_DQ_TO_DIMM_CONN_DQ</id> + <targetType>TARGET_TYPE_DIMM</targetType> + <description> + Centaur DQ to DIMM connector DQ mapping. + Uint8 value for each Centaur DQ (0-79). + The value is the corresponding DIMM Connector DQ. + Therefore if (data[2] == 60) then Centaur DQ 2 maps to DIMM DQ 60 + If the logical DIMM is on a Centaur-DIMM then the value is the same as the + array index because there is no DIMM connector. + If the logical DIMM is an IS-DIMM then the value depends on board wiring. + </description> + <valueType>uint8</valueType> + <array>80</array> + <platInit/> +</attribute> + +<attribute> + <id>ATTR_MBA_PORT</id> + <targetType>TARGET_TYPE_DIMM</targetType> + <description>MBA Chiplet port this DIMM is connected to</description> + <valueType>uint8</valueType> + <platInit/> +</attribute> + +<attribute> + <id>ATTR_MBA_DIMM</id> + <targetType>TARGET_TYPE_DIMM</targetType> + <description>MBA port DIMM number of this DIMM</description> + <valueType>uint8</valueType> + <platInit/> +</attribute> + +</attributes> diff --git a/src/usr/hwpf/hwp/dimm_errors.xml b/src/usr/hwpf/hwp/dimm_errors.xml new file mode 100644 index 000000000..c0e910a10 --- /dev/null +++ b/src/usr/hwpf/hwp/dimm_errors.xml @@ -0,0 +1,49 @@ +<!-- IBM_PROLOG_BEGIN_TAG + This is an automatically generated prolog. + + $Source: src/usr/hwpf/hwp/dimm_errors.xml $ + + IBM CONFIDENTIAL + + COPYRIGHT International Business Machines Corp. 2012 + + p1 + + Object Code Only (OCO) source materials + Licensed Internal Code Source Materials + IBM HostBoot Licensed Internal Code + + The source code for this program is not published or other- + wise divested of its trade secrets, irrespective of what has + been deposited with the U.S. Copyright Office. + + Origin: 30 + + IBM_PROLOG_END --> +<!-- XML file specifying errors generated by DIMM HWPs. --> + +<hwpErrors> + <!-- *********************************************************************** --> + <hwpError> + <rc>RC_BAD_DQ_DIMM_BAD_PARAM</rc> + <description> + A HWP called a utility function to access the bad DQ data but specified + an invalid PORT/DIMM/RANK + </description> + <ffdc>FFDC_PORT</ffdc> + <ffdc>FFDC_DIMM</ffdc> + <ffdc>FFDC_RANK</ffdc> + </hwpError> + <!-- *********************************************************************** --> + <hwpError> + <rc>RC_BAD_DQ_DIMM_NOT_FOUND</rc> + <description> + A HWP called a utility function to accessing the bad DQ data. The + utility function could not find a functional DIMM associated with the + specified MBA/PORT/DIMM + </description> + <ffdc>FFDC_MBA_TARGET</ffdc> + <ffdc>FFDC_PORT</ffdc> + <ffdc>FFDC_DIMM</ffdc> + </hwpError> +</hwpErrors> diff --git a/src/usr/hwpf/hwp/DIMM_SPD_attributes.xml b/src/usr/hwpf/hwp/dimm_spd_attributes.xml index f8ed67b23..a08062b94 100644 --- a/src/usr/hwpf/hwp/DIMM_SPD_attributes.xml +++ b/src/usr/hwpf/hwp/dimm_spd_attributes.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG This is an automatically generated prolog. - $Source: src/usr/hwpf/hwp/DIMM_SPD_attributes.xml $ + $Source: src/usr/hwpf/hwp/dimm_spd_attributes.xml $ IBM CONFIDENTIAL @@ -20,9 +20,10 @@ Origin: 30 IBM_PROLOG_END --> +<!-- XML file specifying DIMM SPD attributes used by HW Procedures. --> <attributes> - <!-- ********************************************************************* --> - <attribute> + +<attribute> <id>ATTR_SPD_DRAM_DEVICE_TYPE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -32,9 +33,9 @@ <valueType>uint8</valueType> <enum>DDR3 = 0x0b, DDR4 = 0x0c</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_TYPE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -44,9 +45,9 @@ <valueType>uint8</valueType> <enum>CDIMM = 0x00, RDIMM = 0x01, UDIMM = 0x02, LRDIMM = 0x0b</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_SDRAM_BANKS</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -56,9 +57,9 @@ <valueType>uint8</valueType> <enum>B8 = 0x00, B16 = 0x01, B32 = 0x02, B64 = 0x03</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_SDRAM_DENSITY</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -71,9 +72,9 @@ D8GB = 0x05, D16GB = 0x06 </enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_SDRAM_ROWS</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -83,9 +84,9 @@ <valueType>uint8</valueType> <enum>R12 = 0x00, R13 = 0x01, R14 = 0x02, R15 = 0x03, R16 = 0x04</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_SDRAM_COLUMNS</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -95,9 +96,9 @@ <valueType>uint8</valueType> <enum>C9 = 0x00, C10 = 0x01, C11 = 0x02, C12 = 0x03</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_NOMINAL_VOLTAGE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -107,9 +108,9 @@ <valueType>uint8</valueType> <enum>NOTOP1_5 = 0x01, OP1_35 = 0x02, OP1_2X = 0x04</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_NUM_RANKS</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -119,9 +120,9 @@ <valueType>uint8</valueType> <enum>R1 = 0x00, R2 = 0x01, R3 = 0x02, R4 = 0x03</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_DRAM_WIDTH</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -131,9 +132,9 @@ <valueType>uint8</valueType> <enum>W4 = 0x00, W8 = 0x01, W16 = 0x02, W32 = 0x03</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_MEMORY_BUS_WIDTH</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -143,9 +144,9 @@ <valueType>uint8</valueType> <enum>W8 = 0x00, W16 = 0x01, W32 = 0x02, W64 = 0x03</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_FTB_DIVIDEND</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -154,9 +155,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_FTB_DIVISOR</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -165,9 +166,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MTB_DIVIDEND</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -176,9 +177,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MTB_DIVISOR</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -187,9 +188,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TCKMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -198,9 +199,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_CAS_LATENCIES_SUPPORTED</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -226,9 +227,9 @@ CL_4 = 0x00000001, </enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TAAMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -237,9 +238,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TWRMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -248,9 +249,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRCDMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -259,9 +260,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRRDMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -270,9 +271,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRPMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -281,9 +282,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRASMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -292,9 +293,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRCMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -303,9 +304,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRFCMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -314,9 +315,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TWTRMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -325,9 +326,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TRTPMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -336,9 +337,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_TFAWMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -347,9 +348,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_SDRAM_OPTIONAL_FEATURES</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -359,9 +360,9 @@ <valueType>uint8</valueType> <enum>DLL_OFF = 0x80, RZQ7 = 0x02, RZQ6 = 0x01</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_SDRAM_THERMAL_AND_REFRESH_OPTIONS</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -371,9 +372,9 @@ <valueType>uint8</valueType> <enum>PASR = 0x80, ODTS = 0x08, ASR = 0x05, ETRR = 0x02, ETR = 0x01</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_THERMAL_SENSOR</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -383,9 +384,9 @@ <valueType>uint8</valueType> <enum>PRESENT = 0x80, ACCURACY_MASK = 0x7F</enum> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_FINE_OFFSET_TCKMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -394,9 +395,10 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + + +<attribute> <id>ATTR_SPD_FINE_OFFSET_TAAMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -405,9 +407,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_FINE_OFFSET_TRCDMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -416,9 +418,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_FINE_OFFSET_TRPMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -427,9 +429,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_FINE_OFFSET_TRCMIN</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -438,9 +440,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_SPECIFIC_SECTION</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -450,9 +452,9 @@ <valueType>uint8</valueType> <array>57</array> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_ID_MODULE_MANUFACTURERS_JEDEC_ID_CODE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -461,9 +463,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_ID_MODULE_MANUFACTURING_LOCATION</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -472,9 +474,9 @@ </description> <valueType>uint8</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_ID_MODULE_MANUFACTURING_DATE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -483,9 +485,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_ID_MODULE_SERIAL_NUMBER</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -494,9 +496,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_CYCLICAL_REDUNDANCY_CODE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -505,9 +507,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_PART_NUMBER</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -517,9 +519,9 @@ <valueType>uint8</valueType> <array>18</array> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_MODULE_REVISION_CODE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -528,9 +530,9 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> - <!-- ********************************************************************* --> - <attribute> +</attribute> + +<attribute> <id>ATTR_SPD_DRAM_MANUFACTURER_JEDEC_ID_CODE</id> <targetType>TARGET_TYPE_DIMM</targetType> <description> @@ -539,5 +541,21 @@ </description> <valueType>uint32</valueType> <platInit/> - </attribute> +</attribute> + +<attribute> + <id>ATTR_SPD_BAD_DQ_DATA</id> + <targetType>TARGET_TYPE_DIMM</targetType> + <description> + Bad DQ pin data stored in DIMM SPD. This data is in a special format. + This must only be called by a firmware HWP that knows how to decode the data. + HWP/PLAT firmware that needs to get/set the Bad DQ Bitmap from a Centaur + DQ point of view must call the dimmBadDqBitmapAccessHwp HWP. + </description> + <valueType>uint8</valueType> + <array>80</array> + <platInit/> + <writeable/> +</attribute> + </attributes> diff --git a/src/usr/hwpf/hwp/fapiHwpErrorInfo.xml b/src/usr/hwpf/hwp/fapiHwpErrorInfo.xml index 7374c965d..34b4a6752 100644 --- a/src/usr/hwpf/hwp/fapiHwpErrorInfo.xml +++ b/src/usr/hwpf/hwp/fapiHwpErrorInfo.xml @@ -67,6 +67,18 @@ </hwpError> <!-- *********************************************************************** --> <hwpError> + <rc>RC_TEST_DQ_NO_ERR_ON_BAD_PARAMS</rc> + <description>HWP DQ Unit Test did not get an expected error</description> + </hwpError> + <!-- *********************************************************************** --> + <hwpError> + <rc>RC_TEST_DQ_BAD_DATA</rc> + <description>HWP DQ Unit Test got bad data</description> + <ffdc>FFDC_DATA1</ffdc> + <ffdc>FFDC_DATA2</ffdc> + </hwpError> + <!-- *********************************************************************** --> + <hwpError> <rc>RC_INITFILE_INCORRECT_VER</rc> <description>InitFile has incorrect version</description> <!-- Collect local FFDC FFDC_IF_VER --> diff --git a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C index 4f10de175..ae354ad68 100644 --- a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C +++ b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C @@ -42,6 +42,7 @@ * mjjones 01/13/2012 Use new ReturnCode interfaces * camvanng 01/20/2012 Support for using a range * indexes for array attributes + * mjjones 02/21/2012 Use new Target toEcmdString */ #include <fapiHwpExecInitFile.H> @@ -234,9 +235,7 @@ fapi::ReturnCode fapiHwpExecInitFile(const fapi::Target & i_Target, FAPI_INF(">> fapiHwpExecInitFile: Performing HWP for %s", i_file); // Print the ecmd string of the chip - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_Target.toString(l_string); - FAPI_INF("fapiHwpExecInitFile: Target: %s", l_string); + FAPI_INF("fapiHwpExecInitFile: Target: %s", i_Target.toEcmdString()); fapi::ReturnCode l_rc = fapi::FAPI_RC_SUCCESS; fapi::ReturnCode l_tmpRc = fapi::FAPI_RC_SUCCESS; diff --git a/src/usr/hwpf/hwp/fapiTestHwp.C b/src/usr/hwpf/hwp/fapiTestHwp.C index cae558593..af622ccd8 100644 --- a/src/usr/hwpf/hwp/fapiTestHwp.C +++ b/src/usr/hwpf/hwp/fapiTestHwp.C @@ -41,7 +41,7 @@ * camvanng 11/16/2011 Change function name * fapiHwpExecInitFile() * mjjones 01/13/2012 Use new ReturnCode interfaces - * + * mjjones 02/21/2012 Use new Target toEcmdString */ #include <fapiTestHwp.H> @@ -63,9 +63,7 @@ fapi::ReturnCode hwpInitialTest(const fapi::Target & i_chip) FAPI_INF("Performing HWP: hwpInitialTest"); // Print the ecmd string of the chip - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_chip.toString(l_string); - FAPI_INF("hwpInitialTest: Chip: %s", l_string); + FAPI_INF("hwpInitialTest: Chip: %s", i_chip.toEcmdString()); fapi::ReturnCode l_rc; uint32_t l_ecmdRc = ECMD_DBUF_SUCCESS; diff --git a/src/usr/hwpf/hwp/fapiTestHwpConfig.C b/src/usr/hwpf/hwp/fapiTestHwpConfig.C index 17af655a4..6a3d06897 100644 --- a/src/usr/hwpf/hwp/fapiTestHwpConfig.C +++ b/src/usr/hwpf/hwp/fapiTestHwpConfig.C @@ -35,6 +35,7 @@ * mjjones 10/06/2011 Updated traces. * camvang 10/26/2011 Updated traces. * mjjones 01/13/2012 Use new ReturnCode interfaces + * mjjones 02/21/2012 Use new Target toEcmdString */ #include <fapiTestHwpConfig.H> @@ -50,9 +51,7 @@ fapi::ReturnCode hwpTestConfig(const fapi::Target & i_chip) FAPI_INF("hwpTestConfig: Start HWP"); // Print the ecmd string of the chip - char l_string[fapi::MAX_ECMD_STRING_LEN] = {0}; - i_chip.toString(l_string); - FAPI_INF("hwpTestConfig: Chip: %s", l_string); + FAPI_INF("hwpTestConfig: Chip: %s", i_chip.toEcmdString()); fapi::ReturnCode l_rc; std::vector<fapi::Target> l_targets; diff --git a/src/usr/hwpf/hwp/fapiTestHwpDq.C b/src/usr/hwpf/hwp/fapiTestHwpDq.C new file mode 100644 index 000000000..d3de5e1eb --- /dev/null +++ b/src/usr/hwpf/hwp/fapiTestHwpDq.C @@ -0,0 +1,151 @@ +// IBM_PROLOG_BEGIN_TAG +// This is an automatically generated prolog. +// +// $Source: src/usr/hwpf/hwp/fapiTestHwpDq.C $ +// +// IBM CONFIDENTIAL +// +// COPYRIGHT International Business Machines Corp. 2012 +// +// p1 +// +// Object Code Only (OCO) source materials +// Licensed Internal Code Source Materials +// IBM HostBoot Licensed Internal Code +// +// The source code for this program is not published or other- +// wise divested of its trade secrets, irrespective of what has +// been deposited with the U.S. Copyright Office. +// +// Origin: 30 +// +// IBM_PROLOG_END +/** + * @file fapiTestHwpDq.C + * + * @brief Implements a Test Hardware Procedure that exercises the bad DQ data + */ + +/* + * Change Log ****************************************************************** + * Flag Defect/Feature User Date Description + * ------ -------------- ---------- ----------- ---------------------------- + * mjjones 02/21/2012 Created + */ + +#include <fapiTestHwpDq.H> +#include <dimmBadDqBitmapFuncs.H> + +extern "C" +{ + +fapi::ReturnCode fapiTestHwpDq(const fapi::Target & i_mba) +{ + FAPI_INF(">>fapiTestHwpDq: %s", i_mba.toEcmdString()); + + fapi::ReturnCode l_rc; + uint8_t l_dqBitmap[DIMM_DQ_RANK_BITMAP_SIZE]; + + do + { + // Get the bad DQ Bitmap with an incorrect port + l_rc = dimmGetBadDqBitmap(i_mba, 5, 0, 0, l_dqBitmap); + + if (!l_rc) + { + FAPI_ERR("fapiTestHwpDq: Did not get expected error from dimmGetBadDqBitmap"); + FAPI_SET_HWP_ERROR(l_rc, RC_TEST_DQ_NO_ERR_ON_BAD_PARAMS); + break; + } + + // Do not log error to avoid adding an expected error to the log + FAPI_INF("fapiTestHwpDq: Got expected error from dimmGetBadDqBitmap"); + l_rc = fapi::FAPI_RC_SUCCESS; + + // Get the bad DQ Bitmap for port1, dimm0, rank3 + l_rc = dimmGetBadDqBitmap(i_mba, 1, 0, 3, l_dqBitmap); + + if (l_rc) + { + FAPI_ERR("fapiTestHwpDq: Error from dimmGetBadDqBitmap"); + break; + } + + // If the data is not all zeroes then skip the rest of the test, do not + // want to modify any real Bad DQ records + bool l_nonZeroData = false; + + for (uint8_t i = 0; i < DIMM_DQ_RANK_BITMAP_SIZE; i++) + { + if (l_dqBitmap[i] != 0) + { + FAPI_INF("fapiTestHwpDq: Non-zero DQ data, skipping test"); + l_nonZeroData = true; + break; + } + } + + if (l_nonZeroData) + { + break; + } + + // Set 2 bad DQ bits + l_dqBitmap[2] = 0x40; + l_dqBitmap[6] = 0x20; + + // Set the bad DQ Bitmap + l_rc = dimmSetBadDqBitmap(i_mba, 1, 0, 3, l_dqBitmap); + + if (l_rc) + { + FAPI_ERR("fapiTestHwpDq: Error from dimmSetBadDqBitmap"); + + // TODO + FAPI_ERR("fapiTestHwpDq: Waiting for SPD DD support for writes (story 35766)"); + l_rc = fapi::FAPI_RC_SUCCESS; + break; + } + + // Check that the data can be read back + l_dqBitmap[2] = 0; + l_dqBitmap[6] = 0; + + l_rc = dimmGetBadDqBitmap(i_mba, 1, 0, 3, l_dqBitmap); + + if (l_rc) + { + FAPI_ERR("fapiTestHwpDq: Error from dimmGetBadDqBitmap (2)"); + break; + } + + if ((l_dqBitmap[2] != 0x40) || (l_dqBitmap[6] != 0x20)) + { + FAPI_ERR("fapiTestHwpDq: Got bad data 0x%x:0x%x", + l_dqBitmap[2], l_dqBitmap[6]); + uint8_t & FFDC_DATA1 = l_dqBitmap[2]; + uint8_t & FFDC_DATA2 = l_dqBitmap[6]; + FAPI_SET_HWP_ERROR(l_rc, RC_TEST_DQ_BAD_DATA); + break; + } + + // Write the data back to zero + l_dqBitmap[2] = 0; + l_dqBitmap[6] = 0; + + l_rc = dimmSetBadDqBitmap(i_mba, 1, 0, 3, l_dqBitmap); + + if (l_rc) + { + FAPI_ERR("fapiTestHwpDq: Error from dimmSetBadDqBitmap (2)"); + break; + } + + } while (0); + + FAPI_INF("<<fapiTestHwpDq"); + return l_rc; +} + + +} // extern "C" diff --git a/src/usr/hwpf/hwp/makefile b/src/usr/hwpf/hwp/makefile index f61ada852..59d174969 100644 --- a/src/usr/hwpf/hwp/makefile +++ b/src/usr/hwpf/hwp/makefile @@ -34,7 +34,10 @@ OBJS = fapiTestHwp.o \ fapiTestHwpFfdc.o \ fapiTestHwpConfig.o \ fapiTestHwpAttr.o \ - fapiHwpExecInitFile.o + fapiTestHwpDq.o \ + fapiHwpExecInitFile.o \ + dimmBadDqBitmapFuncs.o \ + dimmBadDqBitmapAccessHwp.o SUBDIRS = dmi_training.d diff --git a/src/usr/hwpf/hwp/unit_attributes.xml b/src/usr/hwpf/hwp/unit_attributes.xml new file mode 100644 index 000000000..42b8300ad --- /dev/null +++ b/src/usr/hwpf/hwp/unit_attributes.xml @@ -0,0 +1,34 @@ +<!-- IBM_PROLOG_BEGIN_TAG + This is an automatically generated prolog. + + $Source: src/usr/hwpf/hwp/unit_attributes.xml $ + + IBM CONFIDENTIAL + + COPYRIGHT International Business Machines Corp. 2012 + + p1 + + Object Code Only (OCO) source materials + Licensed Internal Code Source Materials + IBM HostBoot Licensed Internal Code + + The source code for this program is not published or other- + wise divested of its trade secrets, irrespective of what has + been deposited with the U.S. Copyright Office. + + Origin: 30 + + IBM_PROLOG_END --> +<!-- XML file specifying Unit attributes used by HW Procedures. --> +<attributes> + +<attribute> + <id>ATTR_CHIP_UNIT_POS</id> + <targetType>TARGET_TYPE_EX_CHIPLET, TARGET_TYPE_MBA_CHIPLET, TARGET_TYPE_MCS_CHIPLET</targetType> + <description>A unit's offset number within the chip with respect to similar units. </description> + <valueType>uint8</valueType> + <platInit/> +</attribute> + +</attributes> diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index 09dbc61a4..a5d7ad575 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -32,14 +32,17 @@ SUBDIRS = fapi.d hwp.d plat.d test.d #------------------------------------------------------------------------------ HWP_ERROR_XML_FILES = hwp/fapiHwpErrorInfo.xml \ hwp/dmi_training/proc_cen_framelock/proc_cen_framelock_errors.xml \ - hwp/dmi_training/dmi_io_run_training/io_run_training_errors.xml + hwp/dmi_training/dmi_io_run_training/io_run_training_errors.xml \ + hwp/dimm_errors.xml HWP_ATTR_XML_FILES = hwp/memory_attributes.xml \ hwp/L2_L3_attributes.xml \ hwp/scratch_attributes.xml \ hwp/system_attributes.xml \ hwp/chip_attributes.xml \ - hwp/DIMM_SPD_attributes.xml + hwp/dimm_spd_attributes.xml \ + hwp/dimm_attributes.xml \ + hwp/unit_attributes.xml #------------------------------------------------------------------------------ # Initfiles diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C index c10b6613d..b7a0e1904 100644 --- a/src/usr/hwpf/plat/fapiPlatAttributeService.C +++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C @@ -175,22 +175,52 @@ fapi::ReturnCode fapiPlatGetSpdAttr(const fapi::Target * i_target, errlHndl_t l_err = NULL; size_t l_len = i_len; - l_err = deviceRead( l_target, o_data, l_len, DEVICE_SPD_ADDRESS(i_keyword)); + l_err = deviceRead(l_target, o_data, l_len, DEVICE_SPD_ADDRESS(i_keyword)); if (l_err) { // Add the error log pointer as data to the ReturnCode - FAPI_ERR("platGetSpdAttr: deviceOp() returns error"); + FAPI_ERR("platGetSpdAttr: deviceRead() returns error"); l_rc.setPlatError(reinterpret_cast<void *> (l_err)); } else { - platUpdateAttrValue( i_keyword, o_data ); + platUpdateAttrValue(i_keyword, o_data); } FAPI_DBG(EXIT_MRK "fapiPlatGetSpdAttr"); return l_rc; +} + +//****************************************************************************** +// fapiPlatSetSpdAttr function. +// Call SPD device driver to set the SPD attribute +//****************************************************************************** +fapi::ReturnCode fapiPlatSetSpdAttr(const fapi::Target * i_target, + const uint16_t i_keyword, + void * i_data, const size_t i_len) +{ + FAPI_DBG(ENTER_MRK "fapiPlatSetSpdAttr"); + + fapi::ReturnCode l_rc; + + // Extract the component pointer + TARGETING::Target* l_target = + reinterpret_cast<TARGETING::Target*>(i_target->get()); + errlHndl_t l_err = NULL; + size_t l_len = i_len; + l_err = deviceWrite(l_target, i_data, l_len, DEVICE_SPD_ADDRESS(i_keyword)); + + if (l_err) + { + // Add the error log pointer as data to the ReturnCode + FAPI_ERR("platSetSpdAttr: deviceWrite() returns error"); + l_rc.setPlatError(reinterpret_cast<void *> (l_err)); + } + + FAPI_DBG(EXIT_MRK "fapiPlatSetSpdAttr"); + return l_rc; } //****************************************************************************** @@ -352,6 +382,87 @@ fapi::ReturnCode fapiPlatGetMirrorBaseAddr(const fapi::Target * i_pMcsTarget, return l_rc; } +//****************************************************************************** +// fapiPlatGetDqMapping function. +//****************************************************************************** +fapi::ReturnCode fapiPlatGetDqMapping(const fapi::Target * i_pDimmTarget, + uint8_t (&o_data)[DIMM_DQ_NUM_DQS]) +{ + fapi::ReturnCode l_rc; + bool l_error = false; + + // Check that the FAPI Target pointer is not NULL + if (i_pDimmTarget == NULL) + { + FAPI_ERR("fapiPlatGetDqMapping. NULL FAPI Target passed"); + l_error = true; + } + else + { + // Extract the DIMM Hostboot Target pointer + TARGETING::Target * l_pDimmTarget = + reinterpret_cast<TARGETING::Target*>(i_pDimmTarget->get()); + + // Check that the DIMM Hostboot Target pointer is not NULL + if (l_pDimmTarget == NULL) + { + FAPI_ERR("fapiPlatGetDqMapping. NULL HB Target passed"); + l_error = true; + } + else + { + // Check that the Target is a DIMM + if (l_pDimmTarget->getAttr<TARGETING::ATTR_TYPE>() != + TARGETING::TYPE_DIMM) + { + FAPI_ERR("fapiPlatGetDqMapping. Not a DIMM (0x%x)", + l_pDimmTarget->getAttr<TARGETING::ATTR_TYPE>()); + l_error = true; + } + else + { + if (l_pDimmTarget->getAttr<TARGETING::ATTR_MODEL>() == + TARGETING::MODEL_CDIMM) + { + // C-DIMM. There is no DQ mapping from Centaur DQ to DIMM + // Connector DQ because there is no DIMM Connector. Return + // a direct 1:1 map (0->0, 1->1, etc) + for (uint8_t i = 0; i < DIMM_DQ_NUM_DQS; i++) + { + o_data[i] = i; + } + } + else + { + // IS-DIMM. Get the mapping using a Hostboot attribute + // Note that getAttr() cannot be used to get an array + // attribute so using tryGetAttr and ignoring result + l_pDimmTarget-> + tryGetAttr<TARGETING::ATTR_CEN_DQ_TO_DIMM_CONN_DQ> + (o_data); + } + } + } + } + + if (l_error) + { + /*@ + * @errortype + * @moduleid MOD_ATTR_DQ_MAP_GET + * @reasoncode RC_ATTR_BASE_BAD_PARAM + * @devdesc Failed to get DIMM DQ mapping attribute due to + * bad target parameter. + */ + errlHndl_t l_pError = new ERRORLOG::ErrlEntry( + ERRORLOG::ERRL_SEV_INFORMATIONAL, + fapi::MOD_ATTR_DQ_MAP_GET, + fapi::RC_ATTR_BASE_BAD_PARAM); + l_rc.setPlatError(reinterpret_cast<void *> (l_pError)); + } + + return l_rc; +} } // End platAttrSvc namespace diff --git a/src/usr/hwpf/plat/fapiPlatTarget.C b/src/usr/hwpf/plat/fapiPlatTarget.C index f0006d889..0578278d1 100644 --- a/src/usr/hwpf/plat/fapiPlatTarget.C +++ b/src/usr/hwpf/plat/fapiPlatTarget.C @@ -122,8 +122,10 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const // "p8.ex k0:n0:s0:p01:c0 " // "p8.mcs k0:n0:s0:p01:c0 " // "centaur k0:n0:s0:p01 " - const char * const ECMD_CHIP_PROC = "p8 "; - const char * const ECMD_CHIP_MEMBUF = "centaur "; + const char * const ECMD_CHIP_PROC = "p8"; + const char * const ECMD_CHIP_PROC_SPC = " "; + const char * const ECMD_CHIP_MEMBUF = "centaur"; + const char * const ECMD_CHIP_MEMBUF_SPC = " "; const char * const ECMD_CHIPLET_EX = "ex "; const char * const ECMD_CHIPLET_MCS = "mcs "; const char * const ECMD_CHIPLET_MBS = "mbs "; @@ -131,6 +133,7 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const // Look for a chip in the path const char * l_pChipType = NULL; + const char * l_pChipTypeSpc = NULL; uint32_t l_chipPos = 0; for (uint32_t i = 0; ((i < l_sizePath) && (l_pChipType == NULL)); @@ -139,11 +142,13 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const if (l_path[i].type == TARGETING::TYPE_PROC) { l_pChipType = ECMD_CHIP_PROC; + l_pChipTypeSpc = ECMD_CHIP_PROC_SPC; l_chipPos = l_path[i].instance; } else if (l_path[i].type == TARGETING::TYPE_MEMBUF) { l_pChipType = ECMD_CHIP_MEMBUF; + l_pChipTypeSpc = ECMD_CHIP_MEMBUF_SPC; l_chipPos = l_path[i].instance; } } @@ -200,6 +205,11 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const strcpy(l_pStr, l_pChipletType); l_pStr += strlen(l_pChipletType); } + else + { + strcpy(l_pStr, l_pChipTypeSpc); + l_pStr += strlen(l_pChipTypeSpc); + } // Middle of the string strcpy(l_pStr, "k0:n0:s0:p"); diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H index 3e564457f..21e26ca2c 100644 --- a/src/usr/hwpf/test/hwpftest.H +++ b/src/usr/hwpf/test/hwpftest.H @@ -38,6 +38,7 @@ #include <fapiHwpExecInitFile.H> #include <spd/spdenums.H> #include <targeting/predicates/predicatectm.H> +#include <targeting/iterators/rangefilter.H> using namespace fapi; using namespace TARGETING; @@ -694,6 +695,43 @@ public: } + /** + * @brief Call a test procedure that exercises the Bad DQ data + */ + void testHwpf9() + { + errlHndl_t l_err = NULL; + + // Look for MBA chiplets + TARGETING::PredicateCTM l_mbaFilter(CLASS_UNIT, TYPE_MBA); + TARGETING::TargetRangeFilter l_filter( + TARGETING::targetService().begin(), + TARGETING::targetService().end(), + &l_mbaFilter); + + // Invoke the HWP on the first one + if (l_filter) + { + fapi::Target l_fapiTarget(TARGET_TYPE_MBA_CHIPLET, + static_cast<void *> (*l_filter)); + + FAPI_INVOKE_HWP(l_err, fapiTestHwpDq, l_fapiTarget); + + if (l_err) + { + TS_FAIL("testHwpf9: fapiTestHwpDq failed. Error logged"); + errlCommit(l_err, HWPF_COMP_ID); + } + else + { + TS_TRACE("testHwpf9: Unit Test passed"); + } + } + else + { + TS_TRACE("testHwpf9: No MBAs found, skipping test"); + } + } }; #endif diff --git a/src/usr/targeting/xmltohb/attribute_types.xml b/src/usr/targeting/xmltohb/attribute_types.xml index f50d8b7a8..ecbd79691 100644 --- a/src/usr/targeting/xmltohb/attribute_types.xml +++ b/src/usr/targeting/xmltohb/attribute_types.xml @@ -2806,6 +2806,10 @@ </simpleType> <persistency>non-volatile</persistency> <readable/> + <hwpfToHbAttrMap> + <id>ATTR_CHIP_UNIT_POS</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> </attribute> <attribute> @@ -2830,11 +2834,15 @@ </simpleType> <persistency>non-volatile</persistency> <readable/> + <hwpfToHbAttrMap> + <id>ATTR_MBA_PORT</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> </attribute> <attribute> - <id>MBA_SLOT</id> - <description>MBA slot this DIMM is connected to</description> + <id>MBA_DIMM</id> + <description>MBA port DIMM number of this DIMM</description> <simpleType> <uint8_t> <default>0</default> @@ -2842,6 +2850,35 @@ </simpleType> <persistency>non-volatile</persistency> <readable/> + <hwpfToHbAttrMap> + <id>ATTR_MBA_DIMM</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>CEN_DQ_TO_DIMM_CONN_DQ</id> + <description> + Centaur DQ to DIMM connector DQ mapping for a JEDEC DIMM. + Uint8 value for each Centaur DQ (0-79). + The value is the corresponding DIMM Connector DQ. + </description> + <simpleType> + <uint8_t> + <!-- Default is 1:1 mapping, DQ0-DQ0, DQ1-DQ1 etc --> + <!-- Data will eventually come from MRW --> + <default> + 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, + 20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39, + 40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59, + 60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79 + </default> + </uint8_t> + <array>80</array> + </simpleType> + <persistency>non-volatile</persistency> + <readable/> + <writeable/> </attribute> </attributes> diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 567bcd8a0..8ed2e1e0c 100644 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -51,7 +51,9 @@ XMLTOHB_FAPIATTR_SOURCES = \ ${ROOTPATH}/src/usr/hwpf/hwp/scratch_attributes.xml \ ${ROOTPATH}/src/usr/hwpf/hwp/system_attributes.xml \ ${ROOTPATH}/src/usr/hwpf/hwp/chip_attributes.xml \ - ${ROOTPATH}/src/usr/hwpf/hwp/DIMM_SPD_attributes.xml + ${ROOTPATH}/src/usr/hwpf/hwp/dimm_spd_attributes.xml \ + ${ROOTPATH}/src/usr/hwpf/hwp/dimm_attributes.xml \ + ${ROOTPATH}/src/usr/hwpf/hwp/unit_attributes.xml VMM_CONSTS_FILE = \ ${ROOTPATH}/src/include/usr/vmmconst.h diff --git a/src/usr/targeting/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/xmltohb/simics_VENICE.system.xml index 96c20ae24..701beccb0 100644 --- a/src/usr/targeting/xmltohb/simics_VENICE.system.xml +++ b/src/usr/targeting/xmltohb/simics_VENICE.system.xml @@ -1,38 +1,38 @@ <!-- IBM_PROLOG_BEGIN_TAG This is an automatically generated prolog. - + $Source: src/usr/targeting/xmltohb/simics_VENICE.system.xml $ - + IBM CONFIDENTIAL - + COPYRIGHT International Business Machines Corp. 2011 - + p1 - + Object Code Only (OCO) source materials Licensed Internal Code Source Materials IBM HostBoot Licensed Internal Code - + The source code for this program is not published or other- wise divested of its trade secrets, irrespective of what has been deposited with the U.S. Copyright Office. - + Origin: 30 - + IBM_PROLOG_END --> <attributes> <!-- ===================================================================== - HOST BOOT TARGET INSTANCES - Contains target instance declarations for the Simics VENICE + HOST BOOT TARGET INSTANCES + Contains target instance declarations for the Simics VENICE configuration * MAXIMUM config has 8 Venice chips * each Venice has 8 MCS chiplets - * each MCS chiplet has 1 Centaur membuf chip + * each MCS chiplet connects to 1 Centaur membuf chip * each Centaur membuf chip has 2 MBA chiplets * each MBA chiplet has 2 ports - * each port has 2 dimms + * each MBA port connects to 2 dimms ================================================================= --> <!-- System --> @@ -62,7 +62,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 processor chip --> @@ -108,7 +108,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -121,7 +121,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -134,7 +134,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -147,7 +147,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -160,7 +160,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -173,7 +173,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 core units --> @@ -188,7 +188,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -201,7 +201,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -214,7 +214,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -227,7 +227,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -240,7 +240,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -253,7 +253,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 MCS units --> @@ -268,7 +268,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> @@ -285,7 +285,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-1</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>1</default> @@ -302,11 +302,11 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -323,7 +323,7 @@ <attribute> <id>CHIP_UNIT</id> <default>3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -336,7 +336,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -353,7 +353,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -370,7 +370,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -387,7 +387,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -406,7 +406,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 powerbus unit --> @@ -421,7 +421,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 PCI units --> @@ -436,7 +436,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -449,7 +449,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -462,7 +462,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p1 processor chip --> @@ -493,7 +493,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-1 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -529,7 +529,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -542,7 +542,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -555,7 +555,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -568,7 +568,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -581,7 +581,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -594,7 +594,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p1 core units --> @@ -609,7 +609,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -622,7 +622,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -635,7 +635,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -648,7 +648,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -661,7 +661,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -674,7 +674,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p1 MCS units --> @@ -689,7 +689,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> @@ -710,7 +710,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -727,7 +727,7 @@ <attribute> <id>CHIP_UNIT</id> <default>2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -740,7 +740,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -757,7 +757,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -778,7 +778,7 @@ <attribute> <id>CHIP_UNIT</id> <default>5</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -791,7 +791,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -808,7 +808,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -827,7 +827,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p1 powerbus unit --> @@ -842,7 +842,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p1 PCI units --> @@ -857,7 +857,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -870,7 +870,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -883,7 +883,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p2 processor chip --> @@ -914,7 +914,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-2 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -951,7 +951,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -964,7 +964,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -977,7 +977,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -990,7 +990,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1003,7 +1003,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1016,7 +1016,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p2 core units --> @@ -1031,7 +1031,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1044,7 +1044,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1057,7 +1057,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1070,7 +1070,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1083,7 +1083,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1096,7 +1096,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p2 MCS units --> @@ -1111,7 +1111,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> @@ -1132,7 +1132,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1145,7 +1145,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -1162,7 +1162,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -1179,7 +1179,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -1196,7 +1196,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -1213,7 +1213,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -1230,7 +1230,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -1249,7 +1249,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p2 powerbus unit --> @@ -1264,7 +1264,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p2 PCI units --> @@ -1279,7 +1279,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1292,7 +1292,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1305,7 +1305,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p3 processor chip --> @@ -1336,7 +1336,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-3 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -1372,7 +1372,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1385,7 +1385,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1398,7 +1398,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1411,7 +1411,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1424,7 +1424,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1437,7 +1437,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p3 core units --> @@ -1452,7 +1452,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1465,7 +1465,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1478,7 +1478,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1491,7 +1491,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1504,7 +1504,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1517,7 +1517,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p3 MCS units --> @@ -1536,7 +1536,7 @@ <attribute> <id>CHIP_UNIT</id> <default>0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1553,7 +1553,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1566,7 +1566,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -1583,7 +1583,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -1600,7 +1600,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -1617,7 +1617,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -1634,7 +1634,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -1651,7 +1651,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -1670,7 +1670,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p3 powerbus unit --> @@ -1685,7 +1685,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p3 PCI units --> @@ -1700,7 +1700,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1713,7 +1713,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1726,7 +1726,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p4 processor chip --> @@ -1757,7 +1757,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-4 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -1793,7 +1793,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1806,7 +1806,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1819,7 +1819,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1832,7 +1832,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1845,7 +1845,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1858,7 +1858,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p4 core units --> @@ -1873,7 +1873,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1886,7 +1886,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1899,7 +1899,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1912,7 +1912,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1925,7 +1925,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1938,7 +1938,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p4 MCS units --> @@ -1953,7 +1953,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> @@ -1974,7 +1974,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -1987,7 +1987,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -2004,7 +2004,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -2021,7 +2021,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -2038,7 +2038,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -2055,7 +2055,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -2072,7 +2072,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -2091,7 +2091,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Vencie n0p4 powerbus unit --> @@ -2106,7 +2106,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Vencie n0p4 PCI units --> @@ -2121,7 +2121,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2134,7 +2134,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2147,7 +2147,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p5 processor chip --> @@ -2178,7 +2178,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-5 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -2214,7 +2214,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2227,7 +2227,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2240,7 +2240,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2253,7 +2253,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2266,7 +2266,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2279,7 +2279,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p5 core units --> @@ -2294,7 +2294,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2307,7 +2307,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2320,7 +2320,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2333,7 +2333,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2346,7 +2346,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2359,7 +2359,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p5 MCS units --> @@ -2374,11 +2374,11 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2395,7 +2395,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2408,7 +2408,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -2425,7 +2425,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -2442,7 +2442,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -2459,7 +2459,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -2476,7 +2476,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -2493,7 +2493,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -2512,7 +2512,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p5 powerbus unit --> @@ -2527,7 +2527,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p5 PCI units --> @@ -2542,7 +2542,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2555,7 +2555,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2568,7 +2568,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p6 processor chip --> @@ -2599,7 +2599,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-6 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -2635,7 +2635,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2648,7 +2648,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2661,7 +2661,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2674,7 +2674,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2687,7 +2687,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2700,7 +2700,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p6 core units --> @@ -2715,7 +2715,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2728,7 +2728,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2741,7 +2741,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2754,7 +2754,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2767,7 +2767,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2780,7 +2780,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p6 MCS units --> @@ -2795,11 +2795,11 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2816,7 +2816,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2829,7 +2829,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -2846,7 +2846,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -2863,7 +2863,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -2880,7 +2880,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -2897,7 +2897,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -2914,7 +2914,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -2933,7 +2933,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p6 powerbus unit --> @@ -2948,7 +2948,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p6 PCI units --> @@ -2963,7 +2963,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2976,7 +2976,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -2989,7 +2989,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p7 processor chip --> @@ -3020,7 +3020,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:MFSI-7 --> <attribute> <id>FSI_MASTER_CHIP</id> @@ -3056,7 +3056,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3069,7 +3069,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3082,7 +3082,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3095,7 +3095,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3108,7 +3108,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3121,7 +3121,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p7 core units --> @@ -3136,7 +3136,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3149,7 +3149,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3162,7 +3162,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3175,7 +3175,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3188,7 +3188,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3201,7 +3201,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p7 MCS units --> @@ -3216,7 +3216,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> @@ -3237,7 +3237,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3250,7 +3250,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -3267,7 +3267,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -3284,7 +3284,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -3317,7 +3317,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -3334,7 +3334,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -3353,7 +3353,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p7 powerbus unit --> @@ -3368,7 +3368,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p7 PCI unit --> @@ -3383,7 +3383,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3396,7 +3396,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -3409,7 +3409,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/pci-2</default> - </attribute> + </attribute> </targetInstance> <!-- Centaur n0p0 : start --> @@ -3425,7 +3425,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-0 --> <attribute> @@ -3528,7 +3528,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-1 --> <attribute> @@ -3613,7 +3613,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-2 --> <attribute> @@ -3698,7 +3698,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-3 --> <attribute> @@ -3783,7 +3783,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-4 --> <attribute> @@ -3868,7 +3868,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-5 --> <attribute> @@ -3953,7 +3953,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-6 --> <attribute> @@ -4038,7 +4038,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-7 --> <attribute> @@ -4123,7 +4123,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-0 --> <attribute> @@ -4208,7 +4208,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-1 --> <attribute> @@ -4293,7 +4293,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-2 --> <attribute> @@ -4378,7 +4378,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-3 --> <attribute> @@ -4463,7 +4463,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-4 --> <attribute> @@ -4548,7 +4548,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-5 --> <attribute> @@ -4633,7 +4633,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-6 --> <attribute> @@ -4718,7 +4718,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc1:cMFSI-7 --> <attribute> @@ -4803,7 +4803,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-0 --> <attribute> @@ -4888,7 +4888,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-1 --> <attribute> @@ -4973,7 +4973,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-2 --> <attribute> @@ -5058,7 +5058,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-3 --> <attribute> @@ -5143,7 +5143,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-4 --> <attribute> @@ -5228,7 +5228,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-5 --> <attribute> @@ -5313,7 +5313,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-6 --> <attribute> @@ -5398,7 +5398,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc2:cMFSI-7 --> <attribute> @@ -5483,7 +5483,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-0 --> <attribute> @@ -5568,7 +5568,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-1 --> <attribute> @@ -5653,7 +5653,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-2 --> <attribute> @@ -5738,7 +5738,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-3 --> <attribute> @@ -5823,7 +5823,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-4 --> <attribute> @@ -5908,7 +5908,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-5 --> <attribute> @@ -5993,7 +5993,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-6 --> <attribute> @@ -6078,7 +6078,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc3:cMFSI-7 --> <attribute> @@ -6163,7 +6163,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-0 --> <attribute> @@ -6248,7 +6248,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-1 --> <attribute> @@ -6333,7 +6333,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-2 --> <attribute> @@ -6418,7 +6418,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-3 --> <attribute> @@ -6503,7 +6503,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-4 --> <attribute> @@ -6588,7 +6588,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-5 --> <attribute> @@ -6673,7 +6673,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-6 --> <attribute> @@ -6758,7 +6758,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc4:cMFSI-7 --> <attribute> @@ -6843,7 +6843,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-0 --> <attribute> @@ -6928,7 +6928,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-1 --> <attribute> @@ -7013,7 +7013,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-2 --> <attribute> @@ -7098,7 +7098,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-3 --> <attribute> @@ -7183,7 +7183,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-4 --> <attribute> @@ -7268,7 +7268,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-5 --> <attribute> @@ -7353,7 +7353,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-6 --> <attribute> @@ -7438,7 +7438,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc5:cMFSI-7 --> <attribute> @@ -7523,7 +7523,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-0 --> <attribute> @@ -7608,7 +7608,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-1 --> <attribute> @@ -7693,7 +7693,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-2 --> <attribute> @@ -7778,7 +7778,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-3 --> <attribute> @@ -7863,7 +7863,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-4 --> <attribute> @@ -7948,7 +7948,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-5 --> <attribute> @@ -8033,7 +8033,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-6 --> <attribute> @@ -8118,7 +8118,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc6:cMFSI-7 --> <attribute> @@ -8203,7 +8203,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-0 --> <attribute> @@ -8288,7 +8288,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-1 --> <attribute> @@ -8373,7 +8373,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-2 --> <attribute> @@ -8458,7 +8458,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-3 --> <attribute> @@ -8543,7 +8543,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-4 --> <attribute> @@ -8628,7 +8628,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-5 --> <attribute> @@ -8713,7 +8713,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-6 --> <attribute> @@ -8798,7 +8798,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc7:cMFSI-7 --> <attribute> @@ -8887,7 +8887,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-9</default> - </attribute> + </attribute> <!-- FSI is connected via wrapback to itself over MFSI-0 --> <attribute> @@ -8914,7 +8914,7 @@ <!-- DIMMS - id/physical is sys-0/node-0/dimm-[d] + id/physical is sys-0/node-0/dimm-[d] where d=[0-512] affinity is sys-0/node-0/proc-[i]/mcs-[j]/membuf-0/mbs-0/mba-[k]/mem_port-[l]/dimm-[m] where i=[0-7] j=[0-7] k=[0-1] l=[0-1] m=[0-1] @@ -8932,14 +8932,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm1</id> @@ -8953,14 +8953,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm2</id> @@ -8974,14 +8974,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm3</id> @@ -8995,14 +8995,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm4</id> @@ -9016,14 +9016,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm5</id> @@ -9037,14 +9037,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm6</id> @@ -9058,14 +9058,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm7</id> @@ -9079,14 +9079,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm8</id> @@ -9100,14 +9100,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm9</id> @@ -9121,14 +9121,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm10</id> @@ -9142,14 +9142,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm11</id> @@ -9163,14 +9163,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm12</id> @@ -9184,14 +9184,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm13</id> @@ -9205,14 +9205,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm14</id> @@ -9226,14 +9226,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm15</id> @@ -9247,14 +9247,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm16</id> @@ -9268,14 +9268,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm17</id> @@ -9289,14 +9289,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm18</id> @@ -9310,14 +9310,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm19</id> @@ -9331,14 +9331,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm20</id> @@ -9352,14 +9352,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm21</id> @@ -9373,14 +9373,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm22</id> @@ -9394,14 +9394,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm23</id> @@ -9415,14 +9415,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm24</id> @@ -9436,14 +9436,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm25</id> @@ -9457,14 +9457,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm26</id> @@ -9478,14 +9478,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm27</id> @@ -9499,14 +9499,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm28</id> @@ -9520,14 +9520,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm29</id> @@ -9541,14 +9541,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm30</id> @@ -9562,14 +9562,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm31</id> @@ -9583,14 +9583,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm32</id> @@ -9604,14 +9604,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm33</id> @@ -9625,14 +9625,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm34</id> @@ -9646,14 +9646,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm35</id> @@ -9667,14 +9667,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm36</id> @@ -9688,14 +9688,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm37</id> @@ -9709,14 +9709,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm38</id> @@ -9730,14 +9730,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm39</id> @@ -9751,14 +9751,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm40</id> @@ -9772,14 +9772,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm41</id> @@ -9793,14 +9793,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm42</id> @@ -9814,14 +9814,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm43</id> @@ -9835,14 +9835,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm44</id> @@ -9856,14 +9856,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm45</id> @@ -9877,14 +9877,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm46</id> @@ -9898,14 +9898,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm47</id> @@ -9919,14 +9919,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm48</id> @@ -9940,14 +9940,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm49</id> @@ -9961,14 +9961,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm50</id> @@ -9982,14 +9982,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm51</id> @@ -10003,14 +10003,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm52</id> @@ -10024,14 +10024,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm53</id> @@ -10045,14 +10045,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm54</id> @@ -10066,14 +10066,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm55</id> @@ -10087,14 +10087,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm56</id> @@ -10108,14 +10108,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm57</id> @@ -10129,14 +10129,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm58</id> @@ -10150,14 +10150,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm59</id> @@ -10171,14 +10171,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm60</id> @@ -10192,14 +10192,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm61</id> @@ -10213,14 +10213,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm62</id> @@ -10234,14 +10234,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm63</id> @@ -10255,14 +10255,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm64</id> @@ -10276,14 +10276,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm65</id> @@ -10297,14 +10297,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm66</id> @@ -10318,14 +10318,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm67</id> @@ -10339,14 +10339,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm68</id> @@ -10360,14 +10360,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm69</id> @@ -10381,14 +10381,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm70</id> @@ -10402,14 +10402,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm71</id> @@ -10423,14 +10423,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm72</id> @@ -10444,14 +10444,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm73</id> @@ -10465,14 +10465,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm74</id> @@ -10486,14 +10486,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm75</id> @@ -10507,14 +10507,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm76</id> @@ -10528,14 +10528,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm77</id> @@ -10549,14 +10549,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm78</id> @@ -10570,14 +10570,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm79</id> @@ -10591,14 +10591,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm80</id> @@ -10612,14 +10612,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm81</id> @@ -10633,14 +10633,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm82</id> @@ -10654,14 +10654,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm83</id> @@ -10675,14 +10675,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm84</id> @@ -10696,14 +10696,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm85</id> @@ -10717,14 +10717,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm86</id> @@ -10738,14 +10738,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm87</id> @@ -10759,14 +10759,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm88</id> @@ -10780,14 +10780,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm89</id> @@ -10801,14 +10801,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm90</id> @@ -10822,14 +10822,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm91</id> @@ -10843,14 +10843,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm92</id> @@ -10864,14 +10864,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm93</id> @@ -10885,14 +10885,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm94</id> @@ -10906,14 +10906,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm95</id> @@ -10927,14 +10927,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm96</id> @@ -10948,14 +10948,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm97</id> @@ -10969,14 +10969,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm98</id> @@ -10990,14 +10990,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm99</id> @@ -11011,14 +11011,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm100</id> @@ -11032,14 +11032,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm101</id> @@ -11053,14 +11053,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm102</id> @@ -11074,14 +11074,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm103</id> @@ -11095,14 +11095,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm104</id> @@ -11116,14 +11116,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm105</id> @@ -11137,14 +11137,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm106</id> @@ -11158,14 +11158,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm107</id> @@ -11179,14 +11179,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm108</id> @@ -11200,14 +11200,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm109</id> @@ -11221,14 +11221,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm110</id> @@ -11242,14 +11242,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm111</id> @@ -11263,14 +11263,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm112</id> @@ -11284,14 +11284,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm113</id> @@ -11305,14 +11305,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm114</id> @@ -11326,14 +11326,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm115</id> @@ -11347,14 +11347,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm116</id> @@ -11368,14 +11368,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm117</id> @@ -11389,14 +11389,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm118</id> @@ -11410,14 +11410,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm119</id> @@ -11431,14 +11431,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm120</id> @@ -11452,14 +11452,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm121</id> @@ -11473,14 +11473,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm122</id> @@ -11494,14 +11494,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm123</id> @@ -11515,14 +11515,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm124</id> @@ -11536,14 +11536,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm125</id> @@ -11557,14 +11557,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm126</id> @@ -11578,14 +11578,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm127</id> @@ -11599,14 +11599,14 @@ <default>affinity:sys-0/node-0/proc-1/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm128</id> @@ -11620,14 +11620,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm129</id> @@ -11641,14 +11641,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm130</id> @@ -11662,14 +11662,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm131</id> @@ -11683,14 +11683,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm132</id> @@ -11704,14 +11704,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm133</id> @@ -11725,14 +11725,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm134</id> @@ -11746,14 +11746,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm135</id> @@ -11767,14 +11767,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm136</id> @@ -11788,14 +11788,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm137</id> @@ -11809,14 +11809,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm138</id> @@ -11830,14 +11830,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm139</id> @@ -11851,14 +11851,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm140</id> @@ -11872,14 +11872,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm141</id> @@ -11893,14 +11893,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm142</id> @@ -11914,14 +11914,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm143</id> @@ -11935,14 +11935,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm144</id> @@ -11956,14 +11956,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm145</id> @@ -11977,14 +11977,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm146</id> @@ -11998,14 +11998,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm147</id> @@ -12019,14 +12019,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm148</id> @@ -12040,14 +12040,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm149</id> @@ -12061,14 +12061,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm150</id> @@ -12082,14 +12082,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm151</id> @@ -12103,14 +12103,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm152</id> @@ -12124,14 +12124,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm153</id> @@ -12145,14 +12145,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm154</id> @@ -12166,14 +12166,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm155</id> @@ -12187,14 +12187,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm156</id> @@ -12208,14 +12208,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm157</id> @@ -12229,14 +12229,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm158</id> @@ -12250,14 +12250,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm159</id> @@ -12271,14 +12271,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm160</id> @@ -12292,14 +12292,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm161</id> @@ -12313,14 +12313,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm162</id> @@ -12334,14 +12334,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm163</id> @@ -12355,14 +12355,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm164</id> @@ -12376,14 +12376,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm165</id> @@ -12397,14 +12397,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm166</id> @@ -12418,14 +12418,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm167</id> @@ -12439,14 +12439,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm168</id> @@ -12460,14 +12460,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm169</id> @@ -12481,14 +12481,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm170</id> @@ -12502,14 +12502,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm171</id> @@ -12523,14 +12523,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm172</id> @@ -12544,14 +12544,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm173</id> @@ -12565,14 +12565,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm174</id> @@ -12586,14 +12586,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm175</id> @@ -12607,14 +12607,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm176</id> @@ -12628,14 +12628,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm177</id> @@ -12649,14 +12649,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm178</id> @@ -12670,14 +12670,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm179</id> @@ -12691,14 +12691,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm180</id> @@ -12712,14 +12712,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm181</id> @@ -12733,14 +12733,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm182</id> @@ -12754,14 +12754,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm183</id> @@ -12775,14 +12775,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm184</id> @@ -12796,14 +12796,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm185</id> @@ -12817,14 +12817,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm186</id> @@ -12838,14 +12838,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm187</id> @@ -12859,14 +12859,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm188</id> @@ -12880,14 +12880,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm189</id> @@ -12901,14 +12901,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm190</id> @@ -12922,14 +12922,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm191</id> @@ -12943,14 +12943,14 @@ <default>affinity:sys-0/node-0/proc-2/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm192</id> @@ -12964,14 +12964,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm193</id> @@ -12985,14 +12985,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm194</id> @@ -13006,14 +13006,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm195</id> @@ -13027,14 +13027,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm196</id> @@ -13048,14 +13048,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm197</id> @@ -13069,14 +13069,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm198</id> @@ -13090,14 +13090,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm199</id> @@ -13111,14 +13111,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm200</id> @@ -13132,14 +13132,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm201</id> @@ -13153,14 +13153,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm202</id> @@ -13174,14 +13174,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm203</id> @@ -13195,14 +13195,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm204</id> @@ -13216,14 +13216,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm205</id> @@ -13237,14 +13237,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm206</id> @@ -13258,14 +13258,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm207</id> @@ -13279,14 +13279,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm208</id> @@ -13300,14 +13300,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm209</id> @@ -13321,14 +13321,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm210</id> @@ -13342,14 +13342,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm211</id> @@ -13363,14 +13363,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm212</id> @@ -13384,14 +13384,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm213</id> @@ -13405,14 +13405,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm214</id> @@ -13426,14 +13426,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm215</id> @@ -13447,14 +13447,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm216</id> @@ -13468,14 +13468,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm217</id> @@ -13489,14 +13489,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm218</id> @@ -13510,14 +13510,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm219</id> @@ -13531,14 +13531,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm220</id> @@ -13552,14 +13552,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm221</id> @@ -13573,14 +13573,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm222</id> @@ -13594,14 +13594,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm223</id> @@ -13615,14 +13615,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm224</id> @@ -13636,14 +13636,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm225</id> @@ -13657,14 +13657,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm226</id> @@ -13678,14 +13678,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm227</id> @@ -13699,14 +13699,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm228</id> @@ -13720,14 +13720,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm229</id> @@ -13741,14 +13741,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm230</id> @@ -13762,14 +13762,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm231</id> @@ -13783,14 +13783,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm232</id> @@ -13804,14 +13804,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm233</id> @@ -13825,14 +13825,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm234</id> @@ -13846,14 +13846,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm235</id> @@ -13867,14 +13867,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm236</id> @@ -13888,14 +13888,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm237</id> @@ -13909,14 +13909,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm238</id> @@ -13930,14 +13930,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm239</id> @@ -13951,14 +13951,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm240</id> @@ -13972,14 +13972,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm241</id> @@ -13993,14 +13993,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm242</id> @@ -14014,14 +14014,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm243</id> @@ -14035,14 +14035,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm244</id> @@ -14056,14 +14056,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm245</id> @@ -14077,14 +14077,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm246</id> @@ -14098,14 +14098,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm247</id> @@ -14119,14 +14119,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm248</id> @@ -14140,14 +14140,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm249</id> @@ -14161,14 +14161,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm250</id> @@ -14182,14 +14182,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm251</id> @@ -14203,14 +14203,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm252</id> @@ -14224,14 +14224,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm253</id> @@ -14245,14 +14245,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm254</id> @@ -14266,14 +14266,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm255</id> @@ -14287,14 +14287,14 @@ <default>affinity:sys-0/node-0/proc-3/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm256</id> @@ -14308,14 +14308,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm257</id> @@ -14329,14 +14329,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm258</id> @@ -14350,14 +14350,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm259</id> @@ -14371,14 +14371,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm260</id> @@ -14392,14 +14392,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm261</id> @@ -14413,14 +14413,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm262</id> @@ -14434,14 +14434,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm263</id> @@ -14455,14 +14455,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm264</id> @@ -14476,14 +14476,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm265</id> @@ -14497,14 +14497,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm266</id> @@ -14518,14 +14518,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm267</id> @@ -14539,14 +14539,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm268</id> @@ -14560,14 +14560,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm269</id> @@ -14581,14 +14581,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm270</id> @@ -14602,14 +14602,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm271</id> @@ -14623,14 +14623,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm272</id> @@ -14644,14 +14644,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm273</id> @@ -14665,14 +14665,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm274</id> @@ -14686,14 +14686,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm275</id> @@ -14707,14 +14707,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm276</id> @@ -14728,14 +14728,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm277</id> @@ -14749,14 +14749,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm278</id> @@ -14770,14 +14770,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm279</id> @@ -14791,14 +14791,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm280</id> @@ -14812,14 +14812,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm281</id> @@ -14833,14 +14833,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm282</id> @@ -14854,14 +14854,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm283</id> @@ -14875,14 +14875,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm284</id> @@ -14896,14 +14896,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm285</id> @@ -14917,14 +14917,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm286</id> @@ -14938,14 +14938,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm287</id> @@ -14959,14 +14959,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm288</id> @@ -14980,14 +14980,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm289</id> @@ -15001,14 +15001,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm290</id> @@ -15022,14 +15022,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm291</id> @@ -15043,14 +15043,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm292</id> @@ -15064,14 +15064,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm293</id> @@ -15085,14 +15085,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm294</id> @@ -15106,14 +15106,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm295</id> @@ -15127,14 +15127,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm296</id> @@ -15148,14 +15148,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm297</id> @@ -15169,14 +15169,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm298</id> @@ -15190,14 +15190,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm299</id> @@ -15211,14 +15211,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm300</id> @@ -15232,14 +15232,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm301</id> @@ -15253,14 +15253,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm302</id> @@ -15274,14 +15274,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm303</id> @@ -15295,14 +15295,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm304</id> @@ -15316,14 +15316,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm305</id> @@ -15337,14 +15337,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm306</id> @@ -15358,14 +15358,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm307</id> @@ -15379,14 +15379,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm308</id> @@ -15400,14 +15400,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm309</id> @@ -15421,14 +15421,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm310</id> @@ -15442,14 +15442,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm311</id> @@ -15463,14 +15463,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm312</id> @@ -15484,14 +15484,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm313</id> @@ -15505,14 +15505,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm314</id> @@ -15526,14 +15526,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm315</id> @@ -15547,14 +15547,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm316</id> @@ -15568,14 +15568,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm317</id> @@ -15589,14 +15589,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm318</id> @@ -15610,14 +15610,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm319</id> @@ -15631,14 +15631,14 @@ <default>affinity:sys-0/node-0/proc-4/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm320</id> @@ -15652,14 +15652,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm321</id> @@ -15673,14 +15673,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm322</id> @@ -15694,14 +15694,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm323</id> @@ -15715,14 +15715,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm324</id> @@ -15736,14 +15736,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm325</id> @@ -15757,14 +15757,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm326</id> @@ -15778,14 +15778,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm327</id> @@ -15799,14 +15799,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm328</id> @@ -15820,14 +15820,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm329</id> @@ -15841,14 +15841,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm330</id> @@ -15862,14 +15862,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm331</id> @@ -15883,14 +15883,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm332</id> @@ -15904,14 +15904,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm333</id> @@ -15925,14 +15925,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm334</id> @@ -15946,14 +15946,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm335</id> @@ -15967,14 +15967,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm336</id> @@ -15988,14 +15988,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm337</id> @@ -16009,14 +16009,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm338</id> @@ -16030,14 +16030,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm339</id> @@ -16051,14 +16051,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm340</id> @@ -16072,14 +16072,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm341</id> @@ -16093,14 +16093,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm342</id> @@ -16114,14 +16114,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm343</id> @@ -16135,14 +16135,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm344</id> @@ -16156,14 +16156,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm345</id> @@ -16177,14 +16177,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm346</id> @@ -16198,14 +16198,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm347</id> @@ -16219,14 +16219,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm348</id> @@ -16240,14 +16240,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm349</id> @@ -16261,14 +16261,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm350</id> @@ -16282,14 +16282,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm351</id> @@ -16303,14 +16303,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm352</id> @@ -16324,14 +16324,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm353</id> @@ -16345,14 +16345,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm354</id> @@ -16366,14 +16366,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm355</id> @@ -16387,14 +16387,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm356</id> @@ -16408,14 +16408,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm357</id> @@ -16429,14 +16429,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm358</id> @@ -16450,14 +16450,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm359</id> @@ -16471,14 +16471,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm360</id> @@ -16492,14 +16492,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm361</id> @@ -16513,14 +16513,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm362</id> @@ -16534,14 +16534,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm363</id> @@ -16555,14 +16555,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm364</id> @@ -16576,14 +16576,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm365</id> @@ -16597,14 +16597,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm366</id> @@ -16618,14 +16618,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm367</id> @@ -16639,14 +16639,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm368</id> @@ -16660,14 +16660,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm369</id> @@ -16681,14 +16681,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm370</id> @@ -16702,14 +16702,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm371</id> @@ -16723,14 +16723,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm372</id> @@ -16744,14 +16744,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm373</id> @@ -16765,14 +16765,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm374</id> @@ -16786,14 +16786,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm375</id> @@ -16807,14 +16807,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm376</id> @@ -16828,14 +16828,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm377</id> @@ -16849,14 +16849,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm378</id> @@ -16870,14 +16870,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm379</id> @@ -16891,14 +16891,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm380</id> @@ -16912,14 +16912,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm381</id> @@ -16933,14 +16933,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm382</id> @@ -16954,14 +16954,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm383</id> @@ -16975,14 +16975,14 @@ <default>affinity:sys-0/node-0/proc-5/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm384</id> @@ -16996,14 +16996,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm385</id> @@ -17017,14 +17017,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm386</id> @@ -17038,14 +17038,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm387</id> @@ -17059,14 +17059,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm388</id> @@ -17080,14 +17080,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm389</id> @@ -17101,14 +17101,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm390</id> @@ -17122,14 +17122,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm391</id> @@ -17143,14 +17143,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm392</id> @@ -17164,14 +17164,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm393</id> @@ -17185,14 +17185,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm394</id> @@ -17206,14 +17206,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm395</id> @@ -17227,14 +17227,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm396</id> @@ -17248,14 +17248,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm397</id> @@ -17269,14 +17269,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm398</id> @@ -17290,14 +17290,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm399</id> @@ -17311,14 +17311,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm400</id> @@ -17332,14 +17332,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm401</id> @@ -17353,14 +17353,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm402</id> @@ -17374,14 +17374,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm403</id> @@ -17395,14 +17395,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm404</id> @@ -17416,14 +17416,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm405</id> @@ -17437,14 +17437,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm406</id> @@ -17458,14 +17458,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm407</id> @@ -17479,14 +17479,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm408</id> @@ -17500,14 +17500,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm409</id> @@ -17521,14 +17521,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm410</id> @@ -17542,14 +17542,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm411</id> @@ -17563,14 +17563,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm412</id> @@ -17584,14 +17584,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm413</id> @@ -17605,14 +17605,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm414</id> @@ -17626,14 +17626,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm415</id> @@ -17647,14 +17647,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm416</id> @@ -17668,14 +17668,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm417</id> @@ -17689,14 +17689,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm418</id> @@ -17710,14 +17710,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm419</id> @@ -17731,14 +17731,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm420</id> @@ -17752,14 +17752,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm421</id> @@ -17773,14 +17773,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm422</id> @@ -17794,14 +17794,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm423</id> @@ -17815,14 +17815,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm424</id> @@ -17836,14 +17836,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm425</id> @@ -17857,14 +17857,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm426</id> @@ -17878,14 +17878,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm427</id> @@ -17899,14 +17899,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm428</id> @@ -17920,14 +17920,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm429</id> @@ -17941,14 +17941,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm430</id> @@ -17962,14 +17962,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm431</id> @@ -17983,14 +17983,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm432</id> @@ -18004,14 +18004,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm433</id> @@ -18025,14 +18025,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm434</id> @@ -18046,14 +18046,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm435</id> @@ -18067,14 +18067,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm436</id> @@ -18088,14 +18088,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm437</id> @@ -18109,14 +18109,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm438</id> @@ -18130,14 +18130,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm439</id> @@ -18151,14 +18151,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm440</id> @@ -18172,14 +18172,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm441</id> @@ -18193,14 +18193,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm442</id> @@ -18214,14 +18214,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm443</id> @@ -18235,14 +18235,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm444</id> @@ -18256,14 +18256,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm445</id> @@ -18277,14 +18277,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm446</id> @@ -18298,14 +18298,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm447</id> @@ -18319,14 +18319,14 @@ <default>affinity:sys-0/node-0/proc-6/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm448</id> @@ -18340,14 +18340,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm449</id> @@ -18361,14 +18361,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm450</id> @@ -18382,14 +18382,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm451</id> @@ -18403,14 +18403,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm452</id> @@ -18424,14 +18424,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm453</id> @@ -18445,14 +18445,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm454</id> @@ -18466,14 +18466,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm455</id> @@ -18487,14 +18487,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm456</id> @@ -18508,14 +18508,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm457</id> @@ -18529,14 +18529,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm458</id> @@ -18550,14 +18550,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm459</id> @@ -18571,14 +18571,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm460</id> @@ -18592,14 +18592,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm461</id> @@ -18613,14 +18613,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm462</id> @@ -18634,14 +18634,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm463</id> @@ -18655,14 +18655,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm464</id> @@ -18676,14 +18676,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm465</id> @@ -18697,14 +18697,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm466</id> @@ -18718,14 +18718,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm467</id> @@ -18739,14 +18739,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm468</id> @@ -18760,14 +18760,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm469</id> @@ -18781,14 +18781,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm470</id> @@ -18802,14 +18802,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm471</id> @@ -18823,14 +18823,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-2/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm472</id> @@ -18844,14 +18844,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm473</id> @@ -18865,14 +18865,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm474</id> @@ -18886,14 +18886,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm475</id> @@ -18907,14 +18907,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm476</id> @@ -18928,14 +18928,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm477</id> @@ -18949,14 +18949,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm478</id> @@ -18970,14 +18970,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm479</id> @@ -18991,14 +18991,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-3/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm480</id> @@ -19012,14 +19012,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm481</id> @@ -19033,14 +19033,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm482</id> @@ -19054,14 +19054,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm483</id> @@ -19075,14 +19075,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm484</id> @@ -19096,14 +19096,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm485</id> @@ -19117,14 +19117,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm486</id> @@ -19138,14 +19138,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm487</id> @@ -19159,14 +19159,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-4/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm488</id> @@ -19180,14 +19180,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm489</id> @@ -19201,14 +19201,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm490</id> @@ -19222,14 +19222,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm491</id> @@ -19243,14 +19243,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm492</id> @@ -19264,14 +19264,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm493</id> @@ -19285,14 +19285,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm494</id> @@ -19306,14 +19306,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm495</id> @@ -19327,14 +19327,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-5/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm496</id> @@ -19348,14 +19348,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm497</id> @@ -19369,14 +19369,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm498</id> @@ -19390,14 +19390,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm499</id> @@ -19411,14 +19411,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm500</id> @@ -19432,14 +19432,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm501</id> @@ -19453,14 +19453,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm502</id> @@ -19474,14 +19474,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm503</id> @@ -19495,14 +19495,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-6/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm504</id> @@ -19516,14 +19516,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm505</id> @@ -19537,14 +19537,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm506</id> @@ -19558,14 +19558,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm507</id> @@ -19579,14 +19579,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm508</id> @@ -19600,14 +19600,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm509</id> @@ -19621,14 +19621,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm510</id> @@ -19642,14 +19642,14 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm511</id> @@ -19663,7 +19663,7 @@ <default>affinity:sys-0/node-0/proc-7/mcs-7/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> diff --git a/src/usr/targeting/xmltohb/target_types.xml b/src/usr/targeting/xmltohb/target_types.xml index bf90d3ad7..030d0d760 100644 --- a/src/usr/targeting/xmltohb/target_types.xml +++ b/src/usr/targeting/xmltohb/target_types.xml @@ -799,7 +799,7 @@ <id>MBA_PORT</id> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> </attribute> <!-- Defaulting this info to the one Simics Dummy device that we have --> @@ -818,6 +818,7 @@ <id>lcard-dimm-jedec</id> <parent>lcard-dimm</parent> <attribute><id>MODEL</id><default>JEDEC</default></attribute> + <attribute><id>CEN_DQ_TO_DIMM_CONN_DQ</id></attribute> </targetType> <targetType> diff --git a/src/usr/targeting/xmltohb/vbu.system.xml b/src/usr/targeting/xmltohb/vbu.system.xml index 1d562fda9..76c6f7412 100644 --- a/src/usr/targeting/xmltohb/vbu.system.xml +++ b/src/usr/targeting/xmltohb/vbu.system.xml @@ -1,30 +1,30 @@ <!-- IBM_PROLOG_BEGIN_TAG This is an automatically generated prolog. - + $Source: src/usr/targeting/xmltohb/vbu_A.system.xml $ - + IBM CONFIDENTIAL - + COPYRIGHT International Business Machines Corp. 2011 - + p1 - + Object Code Only (OCO) source materials Licensed Internal Code Source Materials IBM HostBoot Licensed Internal Code - + The source code for this program is not published or other- wise divested of its trade secrets, irrespective of what has been deposited with the U.S. Copyright Office. - + Origin: 30 - + IBM_PROLOG_END --> <attributes> <!-- ===================================================================== - HOST BOOT TARGET INSTANCES + HOST BOOT TARGET INSTANCES Contains target instance declarations for the VBU configuration ================================================================= --> @@ -38,11 +38,11 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0</default> - </attribute> + </attribute> <attribute> <id>IS_SIMULATION</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -55,7 +55,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 processor chip --> @@ -86,7 +86,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 EX units --> @@ -101,7 +101,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -114,7 +114,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -127,7 +127,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-2</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -140,7 +140,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-3</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -153,7 +153,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-4</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -166,7 +166,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-5</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 core units --> @@ -181,7 +181,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-0/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -194,7 +194,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-1/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -207,7 +207,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-2/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -220,7 +220,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-3/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -233,7 +233,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-4/core-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -246,7 +246,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/ex-5/core-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 MCS units --> @@ -261,11 +261,11 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-0</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -282,7 +282,7 @@ <attribute> <id>CHIP_UNIT</id> <default>1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -295,7 +295,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-2</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>2</default> @@ -312,7 +312,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-3</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>3</default> @@ -329,7 +329,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-4</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>4</default> @@ -346,7 +346,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-5</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>5</default> @@ -363,7 +363,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-6</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>6</default> @@ -380,7 +380,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-7</default> - </attribute> + </attribute> <attribute> <id>CHIP_UNIT</id> <default>7</default> @@ -399,7 +399,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pervasive-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 powerbus unit --> @@ -414,7 +414,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/powerbus-0</default> - </attribute> + </attribute> </targetInstance> <!-- Venice n0p0 PCI units --> @@ -429,7 +429,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pci-0</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -442,7 +442,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pci-1</default> - </attribute> + </attribute> </targetInstance> <targetInstance> @@ -455,7 +455,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/pci-2</default> - </attribute> + </attribute> </targetInstance> @@ -473,7 +473,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-0 --> <attribute> @@ -558,7 +558,7 @@ <attribute> <id>AFFINITY_PATH</id> <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0</default> - </attribute> + </attribute> <!-- FSI is connected via proc0:cMFSI-1 --> <attribute> @@ -628,8 +628,8 @@ <!-- Centaur n0p1 : end --> -<!-- DIMMS - id/physical is sys-0/node-0/dimm-[i] +<!-- DIMMS + id/physical is sys-0/node-0/dimm-[i] where i=[0-255] affinity is sys-0/node-0/proc-[i]/mcs-[j]/membuf-0/mbs-0/mba-[k]/mem_port-[l]/dimm-[m] where i=[0] j=[0-1] k=[0-1] l=[0-1] m=[0-1] @@ -647,14 +647,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm1</id> @@ -668,14 +668,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm2</id> @@ -689,14 +689,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm3</id> @@ -710,14 +710,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm4</id> @@ -731,14 +731,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm5</id> @@ -752,14 +752,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm6</id> @@ -773,14 +773,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm7</id> @@ -794,14 +794,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm8</id> @@ -815,14 +815,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm9</id> @@ -836,14 +836,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm10</id> @@ -857,14 +857,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm11</id> @@ -878,14 +878,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>0</default> + <id>MBA_DIMM</id> + <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm12</id> @@ -899,14 +899,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm13</id> @@ -920,14 +920,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>0</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm14</id> @@ -941,14 +941,14 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default> </attribute> <attribute> - <id>MBA_SLOT</id> - <default>1</default> + <id>MBA_DIMM</id> + <default>0</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> <targetInstance> <id>sys0node0dimm15</id> @@ -962,13 +962,13 @@ <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default> </attribute> <attribute> - <id>MBA_SLOT</id> + <id>MBA_DIMM</id> <default>1</default> </attribute> <attribute> <id>MBA_PORT</id> <default>1</default> </attribute> -</targetInstance> +</targetInstance> </attributes> diff --git a/src/usr/targeting/xmltohb/xmltohb.pl b/src/usr/targeting/xmltohb/xmltohb.pl index 61b520f74..3fdcbd6e4 100755 --- a/src/usr/targeting/xmltohb/xmltohb.pl +++ b/src/usr/targeting/xmltohb/xmltohb.pl @@ -1997,7 +1997,44 @@ sub packEntityPath { ################################################################################ # Pack an attribute into a binary data stream ################################################################################ - +sub packSingleSimpleTypeAttribute { + my($binaryDataRef,$attributesRef,$attributeRef,$typeName,$value) = @_; + + my $simpleType = $$attributeRef->{simpleType}; + my $simpleTypeProperties = simpleTypeProperties(); + + if($typeName eq "enumeration") + { + my $enumeration = getEnumerationType($$attributesRef,$simpleType-> + {enumeration}->{id}); + + # Here $value is the enumerator name + my $enumeratorValue = enumNameToValue($enumeration,$value); + $$binaryDataRef .= packEnumeration($enumeration,$enumeratorValue); + } + else + { + if($simpleTypeProperties->{$typeName}{canBeHex}) + { + $value = unhexify($value); + } + + # Apply special policy enforcement, if any + $simpleTypeProperties->{$typeName}{specialPolicies}->($$attributeRef,$value); + + if(ref ($simpleTypeProperties->{$typeName}{packfmt}) eq "CODE") + { + $$binaryDataRef .= $simpleTypeProperties->{$typeName}{packfmt}-> + ($value); + } + else + { + $$binaryDataRef .= pack($simpleTypeProperties->{$typeName}{packfmt}, + $value); + } + } +} + sub packAttribute { my($attributes,$attribute,$value) = @_; @@ -2015,54 +2052,46 @@ sub packAttribute { { $alignment = $simpleTypeProperties->{$typeName}{alignment}; - if($typeName eq "enumeration") - { - my $enumeration = getEnumerationType($attributes,$simpleType->{enumeration}->{id}); - - # Here $value is the enumerator name - my $enumeratorValue = enumNameToValue($enumeration,$value); - $binaryData = packEnumeration($enumeration,$enumeratorValue); - } - else + if (($simpleTypeProperties->{$typeName}{supportsArray}) && + (exists $simpleType->{array})) { - if($simpleTypeProperties->{$typeName}{canBeHex}) - { - $value = unhexify($value); - } + # This is an array attribute, handle the value parameter as + # an array, if there are not enough values for the whole + # array then use the last value to fill in the remainder - # Apply special policy enforcement, if any - $simpleTypeProperties-> - {$typeName}{specialPolicies}->($attribute,$value); - - if(ref ($simpleTypeProperties->{$typeName}{packfmt}) eq "CODE") - { - $binaryData .= - $simpleTypeProperties->{$typeName}{packfmt}->($value); - } - else - { - $binaryData .= - pack($simpleTypeProperties->{$typeName}{packfmt}, - $value); - } - } - - my $arrayMultiplier = 1; - if( ($simpleTypeProperties->{$typeName}{supportsArray}) - && (exists $simpleType->{array}) ) - { + # Figure out the array size (possibly multidimensional) + my $arraySize = 1; my @bounds = split(/,/,$simpleType->{array}); foreach my $bound (@bounds) { - $arrayMultiplier *= $bound; + $arraySize *= $bound; } - my $tmpBinaryData = $binaryData; - for( my $i = 1; $i < $arrayMultiplier; ++$i) + # Split the values into an array + my @values = split(/,/,$value); + my $valueArraySize = scalar(@values); + + # Iterate over the entire array creating values + my $val = ""; + for (my $i = 0; $i < $arraySize; $i++) { - $binaryData .= $tmpBinaryData; + if ($i < $valueArraySize) + { + # Get the value from the value array + $val = $values[$i]; + } + # else use the last value + + packSingleSimpleTypeAttribute(\$binaryData, \$attributes, + \$attribute, $typeName, $val); } } + else + { + # Not an array attribute + packSingleSimpleTypeAttribute(\$binaryData, \$attributes, + \$attribute,$typeName, $value); + } last; } |
