intel: Use CF9 reset (part 2)
Make use of the common CF9 reset in SOC_INTEL_COMMON_RESET. Also implement board_reset() as a "full reset" (aka. cold reset) as that is what was used here for hard_reset(). Drop soc_reset_prepare() thereby, as it was only used for APL. Also, move the global-reset logic. We leave some comments to remind us that a system_reset() should be enough, where a full_reset() is called now (to retain current behaviour) and looks suspicious. Note, as no global_reset() is implemented for Denverton-NS, we halt there now instead of issuing a non-global reset. This seems safer; a non-global reset might result in a reset loop. Change-Id: I5e7025c3c9ea6ded18e72037412b60a1df31bd53 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/29169 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
committed by
Patrick Georgi
parent
45022ae056
commit
f677d17ab3
@ -15,12 +15,12 @@
|
||||
|
||||
#include <arch/acpi.h>
|
||||
#include <cbmem.h>
|
||||
#include <cf9_reset.h>
|
||||
#include <console/console.h>
|
||||
#include <fsp/memmap.h>
|
||||
#include <fsp/romstage.h>
|
||||
#include <fsp/util.h>
|
||||
#include <lib.h> /* hexdump */
|
||||
#include <reset.h>
|
||||
#include <string.h>
|
||||
#include <timestamp.h>
|
||||
#include <security/vboot/vboot_common.h>
|
||||
@ -164,7 +164,8 @@ void raminit(struct romstage_params *params)
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
|
||||
printk(BIOS_DEBUG, "Failed to recover CBMEM in S3 resume.\n");
|
||||
/* Failed S3 resume, reset to come up cleanly */
|
||||
hard_reset();
|
||||
/* FIXME: A "system" reset is likely enough: */
|
||||
full_reset();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user