GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/sandybridge: Use system_reset() 

Use already defined system_reset() function.

Change-Id: Ic4716a3bb1dc6c6b29a028fc0ab28f9195f08416
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32493
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Elyes HAOUAS 2019-04-28 17:57:47 +02:00 committed by Nico Huber
parent bac27d5ebb
commit c056729bfd
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/northbridge/intel/sandybridge/raminit.c
View File

@ -18,6 +18,7 @@
#include <console/console.h> #include <console/console.h>
#include <commonlib/region.h> #include <commonlib/region.h>
#include <bootmode.h> #include <bootmode.h>
#include <cf9_reset.h>
#include <string.h> #include <string.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <arch/io.h> #include <arch/io.h>
@ -312,9 +313,7 @@ static void init_dram_ddr3(int min_tck, int s3resume)
&& reg_5d10 && !s3resume) { && reg_5d10 && !s3resume) {
MCHBAR32(0x5d10) = 0; MCHBAR32(0x5d10) = 0;
/* Need reset. */ /* Need reset. */
outb(0x6, 0xcf9); system_reset();
halt();
} }
early_pch_init_native(); early_pch_init_native();
@ -326,8 +325,7 @@ static void init_dram_ddr3(int min_tck, int s3resume)
if (cache_not_found || (region_device_sz(&rdev) < sizeof(ctrl))) { if (cache_not_found || (region_device_sz(&rdev) < sizeof(ctrl))) {
if (s3resume) { if (s3resume) {
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
outb(0x6, 0xcf9); system_reset();
halt();
} }
ctrl_cached = NULL; ctrl_cached = NULL;
} else { } else {
@ -356,8 +354,7 @@ static void init_dram_ddr3(int min_tck, int s3resume)
if (err) { if (err) {
if (s3resume) { if (s3resume) {
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
outb(0x6, 0xcf9); system_reset();
halt();
} }
/* no need to erase bad mrc cache here, it gets overwritten on /* no need to erase bad mrc cache here, it gets overwritten on
* successful boot. */ * successful boot. */
@ -430,8 +427,7 @@ static void init_dram_ddr3(int min_tck, int s3resume)
save_timings(&ctrl); save_timings(&ctrl);
if (s3resume && !cbmem_was_inited) { if (s3resume && !cbmem_was_inited) {
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
outb(0x6, 0xcf9); system_reset();
halt();
} }
if (!s3resume) if (!s3resume)

7
src/northbridge/intel/sandybridge/raminit_mrc.c
View File

@ -16,6 +16,7 @@
#include <console/console.h> #include <console/console.h>
#include <console/usb.h> #include <console/usb.h>
#include <bootmode.h> #include <bootmode.h>
#include <cf9_reset.h>
#include <string.h> #include <string.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
@ -212,8 +213,7 @@ void sdram_initialize(struct pei_data *pei_data)
/* If MRC data is not found we cannot continue S3 resume. */ /* If MRC data is not found we cannot continue S3 resume. */
if (pei_data->boot_mode == 2 && !pei_data->mrc_input) { if (pei_data->boot_mode == 2 && !pei_data->mrc_input) {
printk(BIOS_DEBUG, "Giving up in sdram_initialize: No MRC data\n"); printk(BIOS_DEBUG, "Giving up in sdram_initialize: No MRC data\n");
outb(0x6, 0xcf9); system_reset();
halt();
} }
/* Pass console handler in pei_data */ /* Pass console handler in pei_data */
@ -310,7 +310,6 @@ void perform_raminit(int s3resume)
if (s3resume && !cbmem_was_initted) { if (s3resume && !cbmem_was_initted) {
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
outb(0x6, 0xcf9); system_reset();
halt();
} }
} }