diff options
author | Prachi Gupta <pragupta@us.ibm.com> | 2015-07-14 16:32:54 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-07-27 22:46:07 -0500 |
commit | b53bd18946559295508fe3339606ff1039065515 (patch) | |
tree | 0fc8250c3db880b59cb7727003c8e0431120e566 /src/usr/hwpf/hwp/mc_config | |
parent | 18ffa035e9552c1a044baebef653be71d4b17ceb (diff) | |
download | talos-hostboot-b53bd18946559295508fe3339606ff1039065515.tar.gz talos-hostboot-b53bd18946559295508fe3339606ff1039065515.zip |
SW308640: INITPROC: Hostboot - DDR4 changes (HWP Review)
CQ:SW308640
Change-Id: I5b68f907612130d902e5e85d67b6238ae8e25db6
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18101
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Tested-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19088
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp/mc_config')
-rw-r--r-- | src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C b/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C index 95294acaa..a1a3a3f28 100644 --- a/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C +++ b/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: mss_volt.C,v 1.21 2015/04/29 21:18:40 jdsloat Exp $ +// $Id: mss_volt.C,v 1.22 2015/05/01 15:14:45 jdsloat Exp $ /* File mss_volt.C created by JEFF SABROWSKI on Fri 21 Oct 2011. */ //------------------------------------------------------------------------------ @@ -64,6 +64,7 @@ // 1.19 | jdsloat | 04/07/15 | Called out dimms configured for 1.5V unless specified in ATTR_MSS_VOLT_COMPLIANT_DIMMS // 1.20 | jdsloat | 04/08/15 | Added fapi:: to Enums used with ATTR_MSS_VOLT_COMPLIANT_DIMMS // 1.21 | jdsloat | 04/29/15 | Made the error return for compliant unique and added a return RC +// 1.22 | jdsloat | 05/01/15 | Fixed initialization of dimm_spd and Enum use for DDR4 dimms, Added FAPI_INF message // This procedure takes a vector of Centaurs behind a voltage domain, // reads in supported DIMM voltages from SPD and determines optimal @@ -93,7 +94,7 @@ fapi::ReturnCode mss_volt(std::vector<fapi::Target> & i_targets_memb) uint8_t l_dimm_functionality=0; uint8_t l_spd_dramtype=0; uint8_t l_spd_volts=0; - uint8_t l_spd_volts_all_dimms=0x06; //start assuming all voltages supported + uint8_t l_spd_volts_all_dimms=0xFF; //start assuming all voltages supported uint8_t l_dram_ddr3_found_flag=0; uint8_t l_dram_ddr4_found_flag=0; uint8_t l_volt_override = 0x00; @@ -257,9 +258,11 @@ fapi::ReturnCode mss_volt(std::vector<fapi::Target> & i_targets_memb) break; } + FAPI_INF( "Bitwise and of all DIMM_SPD: 0x%02x", l_spd_volts_all_dimms); + // If we are going to land on using 1.5V and we are not enabling that usage via attribute. if ( ((l_spd_volts_all_dimms & fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_35) != fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_35) && - ((l_spd_volts_all_dimms & fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2X) != fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2X) && + ((l_spd_volts_all_dimms & fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2V) != fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2V) && ((l_spd_volts_all_dimms & fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_NOTOP1_5) != fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_NOTOP1_5) && (l_compliant_dimm_voltages == fapi::ENUM_ATTR_MSS_VOLT_COMPLIANT_DIMMS_PROCEDURE_DEFINED) ) { @@ -340,7 +343,7 @@ fapi::ReturnCode mss_volt(std::vector<fapi::Target> & i_targets_memb) l_selected_dram_voltage=1350; l_selected_dram_voltage_vpp = DDR3_VPP_VOLT; } - else if (l_dram_ddr4_found_flag && ((l_spd_volts_all_dimms & fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2X) == fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2X)) + else if (l_dram_ddr4_found_flag && ((l_spd_volts_all_dimms & fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2V) == fapi::ENUM_ATTR_SPD_MODULE_NOMINAL_VOLTAGE_OP1_2V)) { l_selected_dram_voltage=1200; l_selected_dram_voltage_vpp = DDR4_VPP_VOLT; |