diff --git a/src/soc/amd/cezanne/fch.c b/src/soc/amd/cezanne/fch.c
index 028ffec17b..f02d1acec5 100644
--- a/src/soc/amd/cezanne/fch.c
+++ b/src/soc/amd/cezanne/fch.c
@@ -113,8 +113,14 @@ static void fch_init_acpi_ports(void)
 				PM_ACPI_TIMER_EN_EN);
 }
 
+static void fch_init_resets(void)
+{
+	pm_write16(PWR_RESET_CFG, pm_read16(PWR_RESET_CFG) | TOGGLE_ALL_PWR_GOOD);
+}
+
 void fch_init(void *chip_info)
 {
+	fch_init_resets();
 	i2c_soc_init();
 	fch_init_acpi_ports();
 
diff --git a/src/soc/amd/cezanne/reset.c b/src/soc/amd/cezanne/reset.c
index aae76bf4c6..d97f79eb20 100644
--- a/src/soc/amd/cezanne/reset.c
+++ b/src/soc/amd/cezanne/reset.c
@@ -7,6 +7,7 @@
 #include <amdblocks/acpimmio.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 = inw(NCP_ERR);
@@ -29,14 +30,13 @@ void do_cold_reset(void)
 
 void do_warm_reset(void)
 {
-	set_warm_reset_flag();
-
-	/* Assert reset signals only. */
+	/* Warm resets are not supported and must be executed as cold */
+	pm_write16(PWR_RESET_CFG, pm_read16(PWR_RESET_CFG) |
+		TOGGLE_ALL_PWR_GOOD);
 	outb(RST_CPU | SYS_RST, RST_CNT);
 }
 
 void do_board_reset(void)
 {
-	/* TODO: Would a warm_reset() suffice? */
 	do_cold_reset();
 }