Skip to content

Commit

Permalink
p9_query_mssinfo -- fill mirror_policy regardless of platform mirror …
Browse files Browse the repository at this point in the history
…support

  uninitialized variable was preventing correct total memory (node, system)
  accounting on Nimbus where mirroring itself is not supported

Change-Id: Idb5ed3c1f70bd4e3fd2940b5e2b97459ad74728d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46573
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Michael D. Pardeik <pardeik@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72546
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: Christian R. Geddes <crgeddes@us.ibm.com>
  • Loading branch information
jjmcgill authored and crgeddes committed Feb 28, 2019
1 parent 9ac0a51 commit 975f684
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/import/chips/p9/procedures/hwp/nest/p9_query_mssinfo.C
Original file line number Diff line number Diff line change
Expand Up @@ -203,21 +203,22 @@ fapi2::ReturnCode p9_query_mssinfo(const std::vector<fapi2::Target<fapi2::TARGET

FAPI_DBG("p9_query_mssinfo: Current l_mirrorEnabled=%u!\n", l_mirrorEnabled);

// retrieve mirroring placement policy attribute
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MEM_MIRROR_PLACEMENT_POLICY,
i_vect_pu_targets[i].getParent<fapi2::TARGET_TYPE_SYSTEM>(), mirror_policy),
"Error reading ATTR_MEM_MIRROR_PLACEMENT_POLICY, l_rc 0x%.8X",
(uint64_t)fapi2::current_err);

FAPI_DBG("p9_query_mssinfo: Current mirror_policy=%u!\n", mirror_policy);


if (l_mirrorEnabled == 1)
{
// ATTR_PROC_MIRROR_SIZES
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_MIRROR_SIZES, i_vect_pu_targets[i], mirror_sizes),
"Error reading ATTR_PROC_MIRROR_SIZES, l_rc 0x%.8X",
(uint64_t)fapi2::current_err);

// retrieve mirroring placement policy attribute
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MEM_MIRROR_PLACEMENT_POLICY,
i_vect_pu_targets[i].getParent<fapi2::TARGET_TYPE_SYSTEM>(), mirror_policy),
"Error reading ATTR_MEM_MIRROR_PLACEMENT_POLICY, l_rc 0x%.8X",
(uint64_t)fapi2::current_err);

FAPI_DBG("p9_query_mssinfo: Current mirror_policy=%u!\n", mirror_policy);

// ATTR_PROC_MIRROR_BASES
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_MIRROR_BASES, i_vect_pu_targets[i], mirror_bases),
"Error reading ATTR_PROC_MIRROR_BASES, l_rc 0x%.8X",
Expand Down

0 comments on commit 975f684

Please sign in to comment.