diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2019-08-02 20:16:36 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-08-30 10:44:53 +0000 |
| commit | 0802d7b3d19e5db3bfa48141f0bd031399261616 (patch) | |
| tree | a3d36fe4327fab3d330ef2acb22714d56f95aaa0 | |
| parent | 7f742241b8116c6c8db80eeefd4189eed4c59160 (diff) | |
| download | coreboot-0802d7b3d19e5db3bfa48141f0bd031399261616.tar.gz coreboot-0802d7b3d19e5db3bfa48141f0bd031399261616.tar.bz2 coreboot-0802d7b3d19e5db3bfa48141f0bd031399261616.zip | |
drivers/fsp1_1/raminit: fix use of mrc_hob
Commit 509f469 [drivers/fsp1_1/raminit.c: Always check FSP HOBs]
inadvertently made use of the mrc_hob conditional on
CONFIG_DISPLAY_HOBS, when there is no relation between the two,
leading to MRC cache data being corrupted. On some devices this
caused RAM training to be redone, on others it resulted in a
bricked device.
Fix this by removing the condition on CONFIG_DISPLAY_HOBS.
Test: boot google/{cyan,edgar}, observe third boot and onward do not
brick device, properly use mrc_hob via cbmem console and timestamps.
Change-Id: I01f6d1d6dfd10297b30de638301c5e0b6545da9c
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34685
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
(cherry picked from commit 4183312cec55f00fe22c4dbfd682376e521fc6d3)
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35047
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/drivers/intel/fsp1_1/raminit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/intel/fsp1_1/raminit.c b/src/drivers/intel/fsp1_1/raminit.c index e71c9a2ddf85..21f4ab9b0586 100644 --- a/src/drivers/intel/fsp1_1/raminit.c +++ b/src/drivers/intel/fsp1_1/raminit.c @@ -259,7 +259,7 @@ void raminit(struct romstage_params *params) /* Locate the memory configuration data to speed up the next reboot */ mrc_hob = get_next_guid_hob(&mrc_guid, hob_list_ptr); - if ((mrc_hob == NULL) && CONFIG(DISPLAY_HOBS)) + if (mrc_hob == NULL) printk(BIOS_DEBUG, "Memory Configuration Data Hob not present\n"); else if (!vboot_recovery_mode_enabled()) { |