sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/x4x: Use system_reset() and full_reset()

Browse Source 
Use already defined system_reset() and full_reset() functions.

Change-Id: I0a05f3ac5c5340a509024de2b444960f498c3e99
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32492
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Elyes HAOUAS
2019-04-28 17:52:10 +02:00
committed by Nico Huber
parent cee06c458a
commit b559b3c785
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/northbridge/intel/x4x/raminit.c
View File

@@ -17,6 +17,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <cbmem.h> #include <cbmem.h>
#include <cf9_reset.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
@@ -654,13 +655,11 @@ void sdram_initialize(int boot_path, const u8 *spd_map)
if (cache_not_found || (region_device_sz(&rdev) < sizeof(s))) { if (cache_not_found || (region_device_sz(&rdev) < sizeof(s))) {
if (boot_path == BOOT_PATH_RESUME) { if (boot_path == BOOT_PATH_RESUME) {
/* Failed S3 resume, reset to come up cleanly */ /* Failed S3 resume, reset to come up cleanly */
outb(0x6, 0xcf9); system_reset();
halt();
} else if (boot_path == BOOT_PATH_WARM_RESET) { } else if (boot_path == BOOT_PATH_WARM_RESET) {
/* On warm reset some of dram calibrations fail /* On warm reset some of dram calibrations fail
and therefore requiring valid cached settings */ and therefore requiring valid cached settings */
outb(0xe, 0xcf9); full_reset();
halt();
} }
ctrl_cached = NULL; ctrl_cached = NULL;
} else { } else {
@@ -728,8 +727,7 @@ void sdram_initialize(int boot_path, const u8 *spd_map)
&s, sizeof(s)); &s, sizeof(s));
if (s.boot_path == BOOT_PATH_RESUME && !cbmem_was_inited) { if (s.boot_path == BOOT_PATH_RESUME && !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();
} }
timestamp_add_now(TS_AFTER_INITRAM); timestamp_add_now(TS_AFTER_INITRAM);