summaryrefslogtreecommitdiffstats
path: root/src/import/generic
diff options
context:
space:
mode:
authorAlvin Wang <wangat@tw.ibm.com>2019-03-26 10:42:21 +0800
committerDaniel M. Crowell <dcrowell@us.ibm.com>2019-05-08 15:10:27 -0500
commitd035a51f51ae137f24301cca137cf8bdd9d6d561 (patch)
tree6b5c8d2f4e7e22cc79cd3947c09c54fdf8d8853b /src/import/generic
parent58df73fd107419526422d2075e5085253a5202d2 (diff)
downloadtalos-hostboot-d035a51f51ae137f24301cca137cf8bdd9d6d561.tar.gz
talos-hostboot-d035a51f51ae137f24301cca137cf8bdd9d6d561.zip
Move kind library to generic
Change-Id: I3b5ce73bce01b36fa8faef7810002eecabbe6d35 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75003 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Dev-Ready: Alvin Wang <wangat@tw.ibm.com> Reviewed-by: Louis Stermole <stermole@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75056 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/generic')
-rw-r--r--src/import/generic/memory/lib/utils/dimm/kind.H9
-rw-r--r--src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H4
2 files changed, 8 insertions, 5 deletions
diff --git a/src/import/generic/memory/lib/utils/dimm/kind.H b/src/import/generic/memory/lib/utils/dimm/kind.H
index aecec90b9..cdabc493e 100644
--- a/src/import/generic/memory/lib/utils/dimm/kind.H
+++ b/src/import/generic/memory/lib/utils/dimm/kind.H
@@ -24,7 +24,7 @@
/* IBM_PROLOG_END_TAG */
///
-/// @file dimm.H
+/// @file kind.H
/// @brief Encapsulation for dimms of all types
///
// *HWP HWP Owner: Louis Stermole <stermole@us.ibm.com>
@@ -33,13 +33,14 @@
// *HWP Level: 3
// *HWP Consumed by: HB:FSP
-#ifndef _MSS_DIMM_H_
-#define _MSS_DIMM_H_
+#ifndef _GEN_MSS_KIND_H_
+#define _GEN_MSS_KIND_H_
#include <fapi2.H>
#include <generic/memory/lib/mss_generic_attribute_getters.H>
#include <generic/memory/lib/utils/c_str.H>
+#include <generic/memory/lib/utils/shared/mss_generic_consts.H>
namespace mss
{
@@ -49,8 +50,10 @@ namespace dimm
///
/// @class mss::dimm::kind
+/// @tparam MC the MC type
/// @brief A class containing information about a dimm like ranks, density, configuration - what kind of dimm is it?
///
+template<mss::mc_type MC = DEFAULT_MC_TYPE>
class kind
{
public:
diff --git a/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H b/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H
index 1c6365d37..e72173146 100644
--- a/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H
+++ b/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H
@@ -389,7 +389,7 @@ class decoder
public:
//IVs for all of the attributes per MCS
- const mss::dimm::kind iv_kind;
+ const mss::dimm::kind<MC> iv_kind;
//Left in here rather than calculating during encode for testing
uint8_t iv_dimms_per_port;
@@ -412,7 +412,7 @@ class decoder
/// @brief Constructor
/// @param[in] dimm::kind to call power thermal stuff on
///
- decoder( const mss::dimm::kind& i_kind):
+ decoder( const mss::dimm::kind<MC>& i_kind):
iv_kind(i_kind)
{
iv_dimms_per_port = mss::count_dimm (find_target<TT::PORT_TARGET_TYPE>(iv_kind.iv_target));
OpenPOWER on IntegriCloud