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>

1 files changed, 0 insertions, 14 deletions

diff --git a/src/lib/reset.c b/src/lib/reset.c
index 283f72c2bf..4b19e1e7e6 100644
--- a/src/lib/reset.c
+++ b/src/lib/reset.c
@@ -51,24 +51,11 @@ __noreturn static void __hard_reset(void) {
 }
 
 /* Not all platforms implement all reset types. Fall back to hard_reset. */
-__weak void do_global_reset(void) { __hard_reset(); }
 __weak void do_soft_reset(void) { __hard_reset(); }
 
-__weak void soc_reset_prepare(enum reset_type rt) { /* no-op */ }
-
-void global_reset(void)
-{
-	printk(BIOS_INFO, "%s() called!\n", __func__);
-	soc_reset_prepare(GLOBAL_RESET);
-	dcache_clean_all();
-	do_global_reset();
-	halt();
-}
-
 void hard_reset(void)
 {
 	printk(BIOS_INFO, "%s() called!\n", __func__);
-	soc_reset_prepare(HARD_RESET);
 	dcache_clean_all();
 	__hard_reset();
 }
@@ -76,7 +63,6 @@ void hard_reset(void)
 void soft_reset(void)
 {
 	printk(BIOS_INFO, "%s() called!\n", __func__);
-	soc_reset_prepare(SOFT_RESET);
 	dcache_clean_all();
 	do_soft_reset();
 	halt();