diff options
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C | 24 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/xml/error_info/p9_get_mem_vpd_keyword.xml | 76 |
2 files changed, 80 insertions, 20 deletions
diff --git a/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C b/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C index bd8be32fb..c03ab1304 100644 --- a/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C +++ b/src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C @@ -208,7 +208,7 @@ extern "C" default: FAPI_ASSERT(false, fapi2::GET_MEM_VPD_UNSUPPORTED_TYPE(). - set_TARGET(i_target). + set_MCS_TARGET(i_target). set_VPDTYPE(i_vpd_info.iv_vpd_type), "Invalid vpd type = %d", i_vpd_info.iv_vpd_type); @@ -221,8 +221,8 @@ extern "C" fapi2::GET_MEM_VPD_MAPPING_TOO_SMALL(). set_SIZE(size_t(i_mappingSize)). set_EXPECTED(l_mapping_layout_maxsize). - set_TARGET(i_target). - set_VPDTYPE(i_vpd_info.iv_vpd_type), + set_VPDTYPE(i_vpd_info.iv_vpd_type). + set_MCS_TARGET(i_target), "Mapping keyword size %d less than min %d expected", i_mappingSize, l_mapping_layout_maxsize); @@ -232,8 +232,8 @@ extern "C" fapi2::GET_MEM_VPD_UNSUPPORTED_VERSION(). set_VERSION(uint8_t(l_mappingHeader->layoutVersion)). set_EXPECTED(uint8_t(l_mapping_layout_version)). - set_TARGET(i_target). - set_VPDTYPE(i_vpd_info.iv_vpd_type), + set_VPDTYPE(i_vpd_info.iv_vpd_type). + set_MCS_TARGET(i_target), "Header version %d not supported % expected", l_mappingHeader->layoutVersion, l_mapping_layout_version); @@ -248,7 +248,7 @@ extern "C" fapi2::GET_MEM_VPD_POS_OUT_OF_RANGE(). set_MCS_POS(l_mcsPos). set_MAX_MEMVPD_POS(MAX_MEMVPD_POS). - set_TARGET(i_target). + set_MCS_TARGET(i_target). set_VPDTYPE(i_vpd_info.iv_vpd_type), "ATTR_MEMVPD_POS out of range (=%d)", l_mcsPos); @@ -264,8 +264,8 @@ extern "C" set_ENTRY(l_mcsPos). set_MAX_ENTRIES(uint8_t(l_mappingHeader2->numEntries)). set_VERSION(uint8_t(l_mappingHeader2->layoutVersion)). - set_TARGET(i_target). - set_VPDTYPE(i_vpd_info.iv_vpd_type), + set_VPDTYPE(i_vpd_info.iv_vpd_type). + set_MCS_TARGET(i_target), "Unsupported entry (%d), max entries (%d)", l_mcsPos, uint8_t(l_mappingHeader2->numEntries)); @@ -321,7 +321,7 @@ extern "C" set_MEMVPDFREQ1(uint32_t(l_freqTable[1])). set_MEMVPDFREQ2(uint32_t(l_freqTable[2])). set_MEMVPDFREQ3(uint32_t(l_freqTable[3])). - set_TARGET(i_target). + set_MCS_TARGET(i_target). set_VPDTYPE(i_vpd_info.iv_vpd_type), "Frequency %d not supported by Nimbus", i_vpd_info.iv_freq_mhz); @@ -350,7 +350,7 @@ extern "C" FAPI_ASSERT(false, fapi2::GET_MEM_VPD_UNSUPPORTED_RANK(). set_RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_0)). - set_TARGET(i_target). + set_MCS_TARGET(i_target). set_VPDTYPE(i_vpd_info.iv_vpd_type), "Unsupported rank = %d should be 0,1,2, or 4", i_vpd_info.iv_rank_count_dimm_0); @@ -372,7 +372,7 @@ extern "C" FAPI_ASSERT(false, fapi2::GET_MEM_VPD_UNSUPPORTED_RANK(). set_RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_1)). - set_TARGET(i_target). + set_MCS_TARGET(i_target). set_VPDTYPE(i_vpd_info.iv_vpd_type), "Unsupported rank = %d should be 0,1,2, or 4", i_vpd_info.iv_rank_count_dimm_1); @@ -432,7 +432,7 @@ extern "C" set_DIMM0RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_0)). set_DIMM1RANK(uint64_t(i_vpd_info.iv_rank_count_dimm_1)). set_HEADER(mappingHeader_t(*l_mappingHeader)). - set_TARGET(i_target). + set_MCS_TARGET(i_target). set_VPDTYPE(i_vpd_info.iv_vpd_type). set_MAPROW0(l_ffdc_MAPROW[0]). set_MAPROW1(l_ffdc_MAPROW[1]). diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_get_mem_vpd_keyword.xml b/src/import/chips/p9/procedures/xml/error_info/p9_get_mem_vpd_keyword.xml index 278c690c5..48be558fe 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_get_mem_vpd_keyword.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_get_mem_vpd_keyword.xml @@ -30,8 +30,19 @@ <description>Mapping keyword smaller than minimum expected</description> <ffdc>SIZE</ffdc> <ffdc>EXPECTED</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <hw> + <hwid>VPD_PART</hwid> + <refTarget>MCS_TARGET</refTarget> + </hw> + <priority>HIGH</priority> + </callout> + <callout> + <procedure>CODE</procedure> + <priority>LOW</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> @@ -39,15 +50,30 @@ <description>Version in vpd mapping keyword not supported</description> <ffdc>VERSION</ffdc> <ffdc>EXPECTED</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <procedure>CODE</procedure> + <priority>HIGH</priority> + </callout> + <callout> + <hw> + <hwid>VPD_PART</hwid> + <refTarget>MCS_TARGET</refTarget> + </hw> + <priority>MEDIUM</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> <rc>RC_GET_MEM_VPD_UNSUPPORTED_TYPE</rc> <description>Type not supported. Supported types are MR, MT, DQ, and CK</description> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <procedure>CODE</procedure> + <priority>HIGH</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> @@ -58,16 +84,24 @@ <ffdc>MEMVPDFREQ1</ffdc> <ffdc>MEMVPDFREQ2</ffdc> <ffdc>MEMVPDFREQ3</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <procedure>CODE</procedure> + <priority>HIGH</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> <rc>RC_GET_MEM_VPD_UNSUPPORTED_RANK</rc> <description>Invalid Rank. Valid values are 0,1,2 and 4</description> <ffdc>RANK</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <procedure>CODE</procedure> + <priority>HIGH</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> @@ -80,7 +114,7 @@ <ffdc>DIMM0RANK</ffdc> <ffdc>DIMM1RANK</ffdc> <ffdc>HEADER</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> <!-- Contents of mapping keyword, i.e. MR, MT, DQ --> <ffdc>MAPROW0</ffdc> @@ -94,6 +128,17 @@ <ffdc>MAPROW8</ffdc> <ffdc>MAPROW9</ffdc> <!-- Should use a variable ffdc for the rows but that isn't supported --> + <callout> + <hw> + <hwid>VPD_PART</hwid> + <refTarget>MCS_TARGET</refTarget> + </hw> + <priority>HIGH</priority> + </callout> + <callout> + <procedure>CODE</procedure> + <priority>LOW</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> @@ -102,8 +147,19 @@ <ffdc>ENTRY</ffdc> <ffdc>MAX_ENTRIES</ffdc> <ffdc>VERSION</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <hw> + <hwid>VPD_PART</hwid> + <refTarget>MCS_TARGET</refTarget> + </hw> + <priority>HIGH</priority> + </callout> + <callout> + <procedure>CODE</procedure> + <priority>LOW</priority> + </callout> </hwpError> <!-- ********************************************************************* --> <hwpError> @@ -111,8 +167,12 @@ <description>ATTR_MEMVPD_POS is out of range</description> <ffdc>MCS_POS</ffdc> <ffdc>MAX_MEMVPD_POS</ffdc> - <ffdc>TARGET</ffdc> + <ffdc>MCS_TARGET</ffdc> <ffdc>VPDTYPE</ffdc> + <callout> + <procedure>CODE</procedure> + <priority>HIGH</priority> + </callout> </hwpError> <!-- ********************************************************************* --> </hwpErrors> |
