diff options
| -rw-r--r-- | src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAttrData.C | 6 | ||||
| -rw-r--r-- | src/usr/hwpf/test/hwpMBvpdAccessorTest.H | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAttrData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAttrData.C index 4b18e4038..c7fa33526 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAttrData.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAttrData.C @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: getMBvpdAttrData.C,v 1.2 2015/02/24 19:23:06 whs Exp $ +// $Id: getMBvpdAttrData.C,v 1.4 2015/03/16 18:51:46 janssens Exp $ /** * @file getMBvpdAttrData.C * @@ -57,7 +57,7 @@ const MBvpdAttrDef g_MBVPD_ATTR_DEF_array [] = //---------------------------------------------------------------------------------- {ATTR_VPD_DIMM_RCD_IBT,ALL_DIMM,VD_01,MBVPD_KEYWORD_MT,34,UINT32_BY2_BY2|UINT8_DATA,0}, {ATTR_VPD_DIMM_RCD_OUTPUT_TIMING,ALL_DIMM,VD_01,MBVPD_KEYWORD_MT,36,UINT8_BY2_BY2|BOTH_DIMMS,0}, - {ATTR_VPD_DRAM_WR_VREF,ALL_DIMM,VD_01,MBVPD_KEYWORD_MT,38,UINT32_BY2|UINT8_DATA|XLATE_RD_VREF,0}, + {ATTR_VPD_DRAM_WR_VREF,ALL_DIMM,VD_01,MBVPD_KEYWORD_MT,38,UINT32_BY2|UINT8_DATA|XLATE_WR_VREF,0}, //---------------------------------------------------------------------------------- // Attribute exceptions to use with VINI VZ keyword @@ -71,7 +71,7 @@ const MBvpdAttrDef g_MBVPD_ATTR_DEF_array [] = {ATTR_VPD_DIMM_RCD_IBT,ISDIMM,VZ_13,MBVPD_KEYWORD_MT,34,UINT32_BY2_BY2|UINT8_DATA,0}, {ATTR_VPD_DIMM_RCD_OUTPUT_TIMING,ISDIMM,VZ_13,MBVPD_KEYWORD_MT,36,UINT8_BY2_BY2|BOTH_DIMMS,0}, // Create 3 reserved bytes in V13 - {ATTR_VPD_DRAM_WR_VREF,ISDIMM,VZ_13,MBVPD_KEYWORD_MT,38,UINT32_BY2|UINT8_DATA|XLATE_RD_VREF,0}, + {ATTR_VPD_DRAM_WR_VREF,ISDIMM,VZ_13,MBVPD_KEYWORD_MT,38,UINT32_BY2|UINT8_DATA|XLATE_WR_VREF,0}, // Need to include these exceptions to support early Palmetto and Habanero with VZ=11 and 10 {ATTR_VPD_DIMM_RCD_IBT,ISDIMM,ALL_VZ,MBVPD_KEYWORD_MT,34,UINT32_BY2_BY2|DEFAULT_VALUE,0x64}, {ATTR_VPD_DIMM_RCD_OUTPUT_TIMING,ISDIMM,ALL_VZ,MBVPD_KEYWORD_MT,35,UINT8_BY2_BY2|DEFAULT_VALUE,1}, diff --git a/src/usr/hwpf/test/hwpMBvpdAccessorTest.H b/src/usr/hwpf/test/hwpMBvpdAccessorTest.H index f7512469c..239a6ba25 100644 --- a/src/usr/hwpf/test/hwpMBvpdAccessorTest.H +++ b/src/usr/hwpf/test/hwpMBvpdAccessorTest.H @@ -1241,7 +1241,8 @@ public: &val1, sizeof(val1)+1); //invalid size if (l_fapirc != fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE) { - TS_FAIL("testGetTermData: expect invalid size RC:" + TS_FAIL("testGetTermData: expect invalid size RC" + " for output type UINT8_BY2_BY2_t:" " 0x%08x,0x%08x", fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE, static_cast<uint32_t>(l_fapirc)); @@ -1251,7 +1252,8 @@ public: &val2, sizeof(val2)-1); //invalid size if (l_fapirc != fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE) { - TS_FAIL("testGetTermData: expect invalid size RC:" + TS_FAIL("testGetTermData: expect invalid size RC" + " for output type UINT8_BY2_BY2_BY4_t:" " 0x%08x,0x%08x", fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE, static_cast<uint32_t>(l_fapirc)); @@ -1261,7 +1263,8 @@ public: &val3, sizeof(val3)+2); //invalid size if (l_fapirc != fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE) { - TS_FAIL("testGetTermData: expect invalid size RC:" + TS_FAIL("testGetTermData: expect invalid size RC" + " for output type UINT32_BY2_t:" " 0x%08x,0x%08x", fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE, static_cast<uint32_t>(l_fapirc)); @@ -1271,7 +1274,8 @@ public: &val4, 0); //invalid size if (l_fapirc != fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE) { - TS_FAIL("testGetTermData: expect invalid size RC:" + TS_FAIL("testGetTermData: expect invalid size RC" + " for output type UINT8_BY2_t:" " 0x%08x,0x%08x", fapi::RC_MBVPD_INVALID_OUTPUT_VARIABLE_SIZE, static_cast<uint32_t>(l_fapirc)); @@ -1280,11 +1284,11 @@ public: l_fapirc = (*l_getMBvpdAttr)(l_fapi_mba_target, (fapi::AttributeId)99, //invalid ID &val1, sizeof(val1)); - if (l_fapirc != fapi::RC_MBVPD_INVALID_ATTRIBUTE_ID) + if (l_fapirc != fapi::RC_MBVPD_ATTRIBUTE_NOT_FOUND) { - TS_FAIL("testGetTermData: expect invalid size RC:" + TS_FAIL("testGetTermData: expect invalid ID:" " 0x%08x,0x%08x", - fapi::RC_MBVPD_INVALID_ATTRIBUTE_ID, + fapi::RC_MBVPD_ATTRIBUTE_NOT_FOUND, static_cast<uint32_t>(l_fapirc)); } l_errorChk =0; |
