diff options
| -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 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/reset.c | 11 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/southbridge.c | 4 |
5 files changed, 56 insertions, 8 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: diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 1f2331a07d..4411984d80 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -39,7 +39,6 @@ config CPU_SPECIFIC_OPTIONS select GENERIC_UDELAY select IOAPIC select HAVE_USBDEBUG_OPTIONS - select HAVE_HARD_RESET select HAVE_MONOTONIC_TIMER select SPI_FLASH if HAVE_ACPI_RESUME select TSC_SYNC_LFENCE 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(); +} diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index 37ebdc115d..326ea613b0 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -26,6 +26,7 @@ #include <elog.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/agesawrapper.h> +#include <amdblocks/reset.h> #include <soc/southbridge.h> #include <soc/smi.h> #include <soc/amd_pci_int_defs.h> @@ -33,7 +34,6 @@ #include <soc/pci_devs.h> #include <agesa_headers.h> #include <soc/nvs.h> -#include <reset.h> /* * Table of devices that need their AOAC registers enabled and waited @@ -639,7 +639,7 @@ void bootblock_fch_early_init(void) setup_misc(&reboot); if (reboot) - soft_reset(); + warm_reset(); sb_enable_legacy_io(); enable_aoac_devices(); |