summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Glancy <sglancy@us.ibm.com>2018-05-23 15:00:18 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-05-28 14:53:13 -0400
commit862ecf79aaecf5f1330e7c494f9a5e13c1b18f38 (patch)
tree982325332f2dfedd6519f0e8ee6804521958a092
parenta9986addb4ffeee06cb05144a11e820bdcbb27fe (diff)
downloadtalos-hostboot-862ecf79aaecf5f1330e7c494f9a5e13c1b18f38.tar.gz
talos-hostboot-862ecf79aaecf5f1330e7c494f9a5e13c1b18f38.zip
Fixes Centaur code to use ATTR_BAD_DQ_BITMAP
Change-Id: Ife10ecd59991b802967d9eeb552e690f854d9d58 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59273 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Louis Stermole <stermole@us.ibm.com> Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com> Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59282 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rwxr-xr-xsrc/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C8
-rw-r--r--src/import/chips/centaur/procedures/xml/attribute_info/dimm_attributes.xml18
-rw-r--r--src/import/chips/centaur/procedures/xml/attribute_info/dimm_spd_vpd_attributes.xml2
3 files changed, 6 insertions, 22 deletions
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C b/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C
index 3e768bc71..a4a4c719c 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016,2017 */
+/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -134,7 +134,7 @@ extern "C"
(new uint8_t[MAX_RANKS_PER_DIMM * DIMM_DQ_RANK_BITMAP_SIZE]));
FAPI_TRY(dimmBadDqCheckParamFindDimm(i_mba, i_port, i_dimm, i_rank, l_dimm));
- FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CEN_BAD_DQ_BITMAP, l_dimm, l_dqBitmap));
+ FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_BAD_DQ_BITMAP, l_dimm, l_dqBitmap));
//Write contents of DQ bitmap for specific rank to o_data.
memcpy(o_data, l_dqBitmap[i_rank], DIMM_DQ_RANK_BITMAP_SIZE);
@@ -171,12 +171,12 @@ extern "C"
(new uint8_t[MAX_RANKS_PER_DIMM * DIMM_DQ_RANK_BITMAP_SIZE]));
FAPI_TRY(dimmBadDqCheckParamFindDimm(i_mba, i_port, i_dimm, i_rank, l_dimm));
- FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CEN_BAD_DQ_BITMAP, l_dimm, l_dqBitmap));
+ FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_BAD_DQ_BITMAP, l_dimm, l_dqBitmap));
// 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_TRY(FAPI_ATTR_SET(fapi2::ATTR_CEN_BAD_DQ_BITMAP, l_dimm, l_dqBitmap));
+ FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_BAD_DQ_BITMAP, l_dimm, l_dqBitmap));
delete [] &l_dqBitmap;
diff --git a/src/import/chips/centaur/procedures/xml/attribute_info/dimm_attributes.xml b/src/import/chips/centaur/procedures/xml/attribute_info/dimm_attributes.xml
index a14cff354..e36ee8c13 100644
--- a/src/import/chips/centaur/procedures/xml/attribute_info/dimm_attributes.xml
+++ b/src/import/chips/centaur/procedures/xml/attribute_info/dimm_attributes.xml
@@ -5,7 +5,7 @@
<!-- -->
<!-- OpenPOWER HostBoot Project -->
<!-- -->
-<!-- Contributors Listed Below - COPYRIGHT 2016,2017 -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2018 -->
<!-- [+] International Business Machines Corp. -->
<!-- -->
<!-- -->
@@ -70,22 +70,6 @@
</attribute>
<attribute>
- <id>ATTR_CEN_BAD_DQ_BITMAP</id>
- <targetType>TARGET_TYPE_DIMM</targetType>
- <description>
- Bad DQ bitmap from a Centaur:MBA point of view.
- The data is a 10 byte bitmap for each of 4 possible ranks.
- The bad DQ data is stored in DIMM SPD, it is stored in a special format
- and is translated to a DIMM Connector point of view for IS-DIMMs.
- All of these details are hidden from the user of this attribute.
- </description>
- <valueType>uint8</valueType>
- <array>4 10</array>
- <platInit/>
- <writeable/>
-</attribute>
-
-<attribute>
<id>ATTR_CEN_VPD_DIMM_SPARE</id>
<targetType>TARGET_TYPE_MBA</targetType>
<description>
diff --git a/src/import/chips/centaur/procedures/xml/attribute_info/dimm_spd_vpd_attributes.xml b/src/import/chips/centaur/procedures/xml/attribute_info/dimm_spd_vpd_attributes.xml
index 5e9da90c2..b649ab738 100644
--- a/src/import/chips/centaur/procedures/xml/attribute_info/dimm_spd_vpd_attributes.xml
+++ b/src/import/chips/centaur/procedures/xml/attribute_info/dimm_spd_vpd_attributes.xml
@@ -585,7 +585,7 @@ The following attributes can be queried from both DDR3 and DDR4 DIMMs
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 use the
- ATTR_CEN_BAD_DQ_BITMAP attribute.
+ ATTR_BAD_DQ_BITMAP attribute.
</description>
<valueType>uint8</valueType>
<array>80</array>
OpenPOWER on IntegriCloud