soc/amd/cezanne: remove warm reset flag code
The warm reset bit in the NCP_ERR register doesn't behave as the PPR [1] suggested; no matter if something was written to the register, the NCP_WARM_BOOT bit never got set and the NCP_ERR register in I/O-space always reads back as 0x7f. [1] checked with PPR for AMD Family 19h Model 51h A1 (CZN) #56569 Rev 3.01 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I569372db9f36ec7bbc741f4d7312ade312daa70b Reviewed-on: https://review.coreboot.org/c/coreboot/+/55101 Reviewed-by: Raul Rangel <rrangel@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
dee3bc34ad
commit
c0fd6e5ea6
|
@ -55,8 +55,6 @@ void mp_init_cpus(struct bus *cpu_bus)
|
||||||
|
|
||||||
/* pre_mp_init made the flash not cacheable. Reset to WP for performance. */
|
/* pre_mp_init made the flash not cacheable. Reset to WP for performance. */
|
||||||
mtrr_use_temp_range(FLASH_BASE_ADDR, CONFIG_ROM_SIZE, MTRR_TYPE_WRPROT);
|
mtrr_use_temp_range(FLASH_BASE_ADDR, CONFIG_ROM_SIZE, MTRR_TYPE_WRPROT);
|
||||||
|
|
||||||
set_warm_reset_flag();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void zen_2_3_init(struct device *dev)
|
static void zen_2_3_init(struct device *dev)
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
#endif /* ENV_X86 */
|
#endif /* ENV_X86 */
|
||||||
|
|
||||||
/* I/O Ranges */
|
/* I/O Ranges */
|
||||||
#define NCP_ERR 0x00f0
|
|
||||||
#define ACPI_IO_BASE 0x0400
|
#define ACPI_IO_BASE 0x0400
|
||||||
#define ACPI_PM_EVT_BLK (ACPI_IO_BASE + 0x00)
|
#define ACPI_PM_EVT_BLK (ACPI_IO_BASE + 0x00)
|
||||||
#define ACPI_PM1_STS (ACPI_PM_EVT_BLK + 0x00)
|
#define ACPI_PM1_STS (ACPI_PM_EVT_BLK + 0x00)
|
||||||
|
|
|
@ -118,9 +118,6 @@
|
||||||
#define FCH_AOAC_DEV_AMBA 17
|
#define FCH_AOAC_DEV_AMBA 17
|
||||||
#define FCH_AOAC_DEV_ESPI 27
|
#define FCH_AOAC_DEV_ESPI 27
|
||||||
|
|
||||||
/* IO 0xf0 NCP Error */
|
|
||||||
#define NCP_WARM_BOOT (1 << 7) /* Write-once */
|
|
||||||
|
|
||||||
void fch_pre_init(void);
|
void fch_pre_init(void);
|
||||||
void fch_early_init(void);
|
void fch_early_init(void);
|
||||||
void fch_init(void *chip_info);
|
void fch_init(void *chip_info);
|
||||||
|
|
|
@ -7,19 +7,6 @@
|
||||||
#include <amdblocks/acpimmio.h>
|
#include <amdblocks/acpimmio.h>
|
||||||
#include <amdblocks/reset.h>
|
#include <amdblocks/reset.h>
|
||||||
|
|
||||||
/* TODO: is NCP_ERR still valid? It appears reserved and always 0xff. b/184281092 */
|
|
||||||
void set_warm_reset_flag(void)
|
|
||||||
{
|
|
||||||
uint8_t ncp = inb(NCP_ERR);
|
|
||||||
|
|
||||||
outb(NCP_ERR, ncp | NCP_WARM_BOOT);
|
|
||||||
}
|
|
||||||
|
|
||||||
int is_warm_reset(void)
|
|
||||||
{
|
|
||||||
return !!(inb(NCP_ERR) & NCP_WARM_BOOT);
|
|
||||||
}
|
|
||||||
|
|
||||||
void do_cold_reset(void)
|
void do_cold_reset(void)
|
||||||
{
|
{
|
||||||
/* De-assert and then assert all PwrGood signals on CF9 reset. */
|
/* De-assert and then assert all PwrGood signals on CF9 reset. */
|
||||||
|
|
Loading…
Reference in New Issue