diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-10-06 18:20:47 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-10-22 08:34:56 +0000 |
| commit | 73c11194b0ea6a4fb93456fdff36cbd91838d4ec (patch) | |
| tree | 0ac3c3429f443cd7d0f708a8b33706a1996d43fc /src/soc/amd/common/block | |
| parent | 8ba7023cf87413256bfc9c0902d9e69300e91a0b (diff) | |
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>
Diffstat (limited to 'src/soc/amd/common/block')
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/reset.h | 42 | ||||
| -rw-r--r-- | src/soc/amd/common/block/pi/def_callouts.c | 6 |
2 files changed, 45 insertions, 3 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/reset.h b/src/soc/amd/common/block/include/amdblocks/reset.h new file mode 100644 index 0000000000..4f149eadb9 --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/reset.h @@ -0,0 +1,42 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __AMD_RESET_H__ +#define __AMD_RESET_H__ + +#include <console/console.h> +#include <arch/cache.h> +#include <halt.h> + +void do_warm_reset(void); +void do_cold_reset(void); + +static inline __noreturn void warm_reset(void) +{ + printk(BIOS_INFO, "%s() called!\n", __func__); + dcache_clean_all(); + do_warm_reset(); + halt(); +} + +static inline __noreturn void cold_reset(void) +{ + printk(BIOS_INFO, "%s() called!\n", __func__); + dcache_clean_all(); + do_cold_reset(); + halt(); +} + +#endif /* __AMD_RESET_H__ */ 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 <amdblocks/BiosCallOuts.h> #include <amdblocks/agesawrapper.h> #include <amdblocks/agesawrapper_call.h> -#include <reset.h> +#include <amdblocks/reset.h> #include <soc/southbridge.h> #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: |