From e4250e167e9fcc4003ca098dbafa807a3979ce71 Mon Sep 17 00:00:00 2001 From: Tristan Corrick Date: Wed, 10 May 2017 22:40:41 +1200 Subject: [PATCH] UPSTREAM: nb/intel/gm45: Fix raminit with mixed raw card types `cardF[n]` should indicate whether the DIMM in channel n is of raw card type F. However, `cardF[1]` was initialised with the value meant for `cardF[0]`. This patch results in the correct initialisation of `cardF`. Tested on a Lenovo T400 containing two DIMMs: one of raw card type F and the other of raw card type B. Before the patch, the system would not boot. After the patch, the system boots with all of the memory functional. BUG=none BRANCH=none TEST=none Change-Id: If1d8dd58d2a9953a2d6318efcfecd8ce6d8a5425 Signed-off-by: Patrick Georgi Original-Commit-Id: 12e6562289b85a9988048fc731be92966110c622 Original-Change-Id: I7409df0b8c67d7efbdadae39dc718c8df7a92552 Original-Signed-off-by: Tristan Corrick Original-Reviewed-on: https://review.coreboot.org/19652 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Arthur Heymans Original-Reviewed-by: Nico Huber Original-Reviewed-by: Paul Menzel Reviewed-on: https://chromium-review.googlesource.com/506210 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/northbridge/intel/gm45/raminit_receive_enable_calibration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c b/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c index c5614e1192..7d57a4e84b 100644 --- a/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c +++ b/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c @@ -211,7 +211,7 @@ static void receive_enable_calibration(const timings_t *const timings, const int cardF[] = { dimms[0].card_type == 0xf, - dimms[0].card_type == 0xf, + dimms[1].card_type == 0xf, }; const unsigned int t_bound =