soc/amd: Implement common reset API

Add an `amdblocks` internal API and rename
  soft_reset() => warm_reset()
  hard_reset() => cold_reset()
as these terms are commonly used in the surrounding code.

On Stoney Ridge, make board_reset() call cold_reset() to keep
current behaviour of common code calling hard_reset(). But add
a TODO if this is intended.

Note: Stoney Ridge is using CF9 for the actual reset but the
configuration for a cold reset doesn't use the usual full reset
bit but some other mechanism.

Change-Id: Id33eda676d79529db759b85fa8e28386846e6fa4
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/29053
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/soc/amd/stoneyridge/reset.c b/src/soc/amd/stoneyridge/reset.c
index 738ec59354..34aa576a09 100644
--- a/src/soc/amd/stoneyridge/reset.c
+++ b/src/soc/amd/stoneyridge/reset.c
@@ -20,6 +20,7 @@
 #include <soc/pci_devs.h>
 #include <device/pci_ops.h>
 #include <soc/southbridge.h>
+#include <amdblocks/reset.h>
 
 void set_warm_reset_flag(void)
 {
@@ -45,7 +46,7 @@ static void clear_bios_reset(void)
 	pci_write_config32(SOC_HT_DEV, HT_INIT_CONTROL, htic);
 }
 
-void do_hard_reset(void)
+void do_cold_reset(void)
 {
 	clear_bios_reset();
 
@@ -55,7 +56,7 @@ void do_hard_reset(void)
 	outb(RST_CMD | SYS_RST, SYS_RESET);
 }
 
-void do_soft_reset(void)
+void do_warm_reset(void)
 {
 	set_warm_reset_flag();
 	clear_bios_reset();
@@ -63,3 +64,9 @@ void do_soft_reset(void)
 	/* Assert reset signals only. */
 	outb(RST_CMD | SYS_RST, SYS_RESET);
 }
+
+void do_board_reset(void)
+{
+	/* TODO: Would a warm_reset() suffice? */
+	do_cold_reset();
+}