From 8fc0e7abffb04554f63196f5aaab035f1a72d245 Mon Sep 17 00:00:00 2001
From: Louis Stermole <stermole@us.ibm.com>
Date: Mon, 4 Mar 2019 17:05:49 -0500
Subject: Add p9a version of eff_memory_size API

  Adds mc_type template on eff_memory_size functions to avoid
  symbol duplication on future systems.

Change-Id: I11552c94ac1dfc7ea367e0a6bb5d63e13d18c183
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72790
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@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: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72896
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
---
 src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/import/chips/p9/procedures/hwp/memory/lib/mcbist')

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
index bafdc6e98..e42dcce00 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -41,10 +41,11 @@
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
 
+#include <lib/shared/mss_const.H>
+#include <generic/memory/lib/utils/find.H>
 #include <generic/memory/lib/utils/poll.H>
 #include <generic/memory/lib/utils/memory_size.H>
 #include <lib/utils/mss_nimbus_conversions.H>
-#include <lib/shared/mss_const.H>
 #include <lib/utils/bit_count.H>
 #include <lib/utils/num.H>
 #include <lib/mcbist/patterns.H>
@@ -1866,7 +1867,7 @@ class program
                         constexpr uint64_t l_seconds = SEC_IN_HOUR * BG_SCRUB_IN_HOURS;
 
                         FAPI_TRY( mss::freq(i_target, l_freq) );
-                        FAPI_TRY( mss::eff_memory_size(i_target, l_size) );
+                        FAPI_TRY( mss::eff_memory_size<mss::mc_type::NIMBUS>(i_target, l_size) );
 
                         calculate_min_cmd_gap(i_target, l_freq, l_size, l_min_cmd_gap, l_timebase);
 
-- 
cgit v1.2.1