Skip to content

Commit

Permalink
RAS updates to get_mem_vpd
Browse files Browse the repository at this point in the history 
Change-Id: I96297a7f49d70c33d5d791b2ea992e4f0414d7bd
RTC: 175652
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41911
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41940
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@mderkse1 @dcrowell77
mderkse1 authored and dcrowell77 committed Jun 23, 2017
1 parent 0f0924b commit 3e3e4b4
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 20 deletions.
24 changes: 12 additions & 12 deletions src/import/chips/p9/procedures/hwp/accessors/p9_get_mem_vpd_keyword.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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));
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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]).
Expand Down
76 changes: 68 additions & 8 deletions src/import/chips/p9/procedures/xml/error_info/p9_get_mem_vpd_keyword.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,50 @@
<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>
<rc>RC_GET_MEM_VPD_UNSUPPORTED_VERSION</rc>
<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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -102,17 +147,32 @@
<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>
<rc>RC_GET_MEM_VPD_POS_OUT_OF_RANGE</rc>
<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>

0 comments on commit 3e3e4b4

Please sign in to comment.