From 73c11194b0ea6a4fb93456fdff36cbd91838d4ec Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 6 Oct 2018 18:20:47 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/29053 Tested-by: build bot (Jenkins) Reviewed-by: Richard Spiegel --- src/soc/amd/common/block/pi/def_callouts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc/amd/common/block/pi') diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c index d136084612..27d4b0b552 100644 --- a/src/soc/amd/common/block/pi/def_callouts.c +++ b/src/soc/amd/common/block/pi/def_callouts.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #if ENV_BOOTBLOCK @@ -127,12 +127,12 @@ AGESA_STATUS agesa_Reset(UINT32 Func, UINTN Data, VOID *ConfigPtr) switch (ResetType) { case WARM_RESET_WHENEVER: case WARM_RESET_IMMEDIATELY: - do_soft_reset(); + warm_reset(); break; case COLD_RESET_WHENEVER: case COLD_RESET_IMMEDIATELY: - do_hard_reset(); + cold_reset(); break; default: -- cgit v1.2.3