diff options
| author | Andres Lugo-Reyes <aalugore@us.ibm.com> | 2015-05-07 11:39:45 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-05-19 19:17:49 -0500 |
| commit | c3c000781525740d736a00234d66d453c3c4ac2a (patch) | |
| tree | a959071292e5f9a0aba1dfac87a21e25b02b1e5e /src/usr/hwpf/hwp | |
| parent | ba7b110d036d4027b6ec9474b5f737c5eef8fca3 (diff) | |
| download | blackbird-hostboot-c3c000781525740d736a00234d66d453c3c4ac2a.tar.gz blackbird-hostboot-c3c000781525740d736a00234d66d453c3c4ac2a.zip | |
Allow use of non-compliant 1.5V DIMMs
Change-Id: I242b840ad4c1bdc3907c5ed6b2f6e208fc613183
RTC:117552
Depends-on: Idc00a24ad24505b820084690fdbca73d271544b1
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16414
Tested-by: Jenkins Server
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp')
| -rw-r--r-- | src/usr/hwpf/hwp/mc_config/mc_config.C | 34 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/mc_config/mss_volt/HBconfig | 4 |
2 files changed, 17 insertions, 21 deletions
diff --git a/src/usr/hwpf/hwp/mc_config/mc_config.C b/src/usr/hwpf/hwp/mc_config/mc_config.C index e230b88b7..6a725221d 100644 --- a/src/usr/hwpf/hwp/mc_config/mc_config.C +++ b/src/usr/hwpf/hwp/mc_config/mc_config.C @@ -59,6 +59,7 @@ #include <fapi.H> #include <fapiPlatHwpInvoker.H> #include <fapiAttributeIds.H> +#include <fapiAttributeService.H> #include "mc_config.H" @@ -470,6 +471,9 @@ void* call_mss_volt( void *io_pArgs ) //get a list of unique VmemIds std::vector<TARGETING::ATTR_VMEM_ID_type> l_VmemList; + //fapi Return Code + fapi::ReturnCode l_fapirc; + for (TargetHandleList::const_iterator l_membuf_iter = l_membufTargetList.begin(); l_membuf_iter != l_membufTargetList.end(); @@ -479,30 +483,22 @@ void* call_mss_volt( void *io_pArgs ) (*l_membuf_iter)->getAttr<ATTR_VMEM_ID>(); l_VmemList.push_back(l_VmemID); -#ifdef CONFIG_KINGSTON_1_35_VOLT - // TODO via RTC: 108833 and 117599 - // This is a temporary fix to support Kingston dimms until we've - // provided a mechanism for MFG and/or the customer to set the - // appropriate override for their dimms via the above mentioned - // stories + } - TARGETING::ATTR_MSS_VOLT_OVERRIDE_type l_volt_override = - (*l_membuf_iter)->getAttr<TARGETING::ATTR_MSS_VOLT_OVERRIDE>(); +#ifdef CONFIG_ALLOW_NON_COMPLIANT_DIMM + // Set ATTR_MSS_VOLT_COMPLIANT_DIMMS to ALL + // Value of ALL value in attribute enum + uint8_t l_allowNonCompliantDimms = + ENUM_ATTR_MSS_VOLT_COMPLIANT_DIMMS_ALL_VOLTAGES; - if(l_volt_override == ENUM_ATTR_MSS_VOLT_OVERRIDE_NONE) - { - l_volt_override = ENUM_ATTR_MSS_VOLT_OVERRIDE_VOLT_135; - (*l_membuf_iter)->setAttr<TARGETING::ATTR_MSS_VOLT_OVERRIDE> - (l_volt_override); + TARGETING::Target* l_sys = NULL; + targetService().getTopLevelTarget(l_sys); + l_sys->setAttr<TARGETING::ATTR_MSS_VOLT_COMPLIANT_DIMMS> + (l_allowNonCompliantDimms); - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "Running CONFIG_KINGSTON_1_35_VOLT workaround " - "for target HUID 0x%.8X", - TARGETING::get_huid(*l_membuf_iter)); - } #endif - } + std::sort(l_VmemList.begin(), l_VmemList.end()); diff --git a/src/usr/hwpf/hwp/mc_config/mss_volt/HBconfig b/src/usr/hwpf/hwp/mc_config/mss_volt/HBconfig index 047a6212f..94cdb36aa 100644 --- a/src/usr/hwpf/hwp/mc_config/mss_volt/HBconfig +++ b/src/usr/hwpf/hwp/mc_config/mss_volt/HBconfig @@ -1,4 +1,4 @@ -config KINGSTON_1_35_VOLT +config ALLOW_NON_COMPLIANT_DIMM default n help - Set ATTR_MSS_VOLT_OVERRIDE to be the 1.35V required for Kingston DIMMs + Set ATTR_MSS_VOLT_COMPLIANT_DIMMS to allow dimms that are not 1.35V |
