diff --git a/src/soc/amd/common/block/lpc/Kconfig b/src/soc/amd/common/block/lpc/Kconfig
index 125f8b326a..b1db1bd254 100644
--- a/src/soc/amd/common/block/lpc/Kconfig
+++ b/src/soc/amd/common/block/lpc/Kconfig
@@ -36,6 +36,12 @@ config SOC_AMD_COMMON_BLOCK_HAS_ESPI
 	  Select this option if platform supports eSPI using D14F3 configuration
 	  registers.
 
+config SOC_AMD_COMMON_BLOCK_HAS_ESPI_ALERT_ENABLE
+	bool
+	depends on SOC_AMD_COMMON_BLOCK_HAS_ESPI
+	help
+	  Selected by the SoC if it supports the ALERT_ENABLE bit.
+
 config SOC_AMD_COMMON_BLOCK_USE_ESPI
 	bool
 	depends on SOC_AMD_COMMON_BLOCK_HAS_ESPI
diff --git a/src/soc/amd/common/block/lpc/espi_def.h b/src/soc/amd/common/block/lpc/espi_def.h
index a14f10fac6..ef61a13929 100644
--- a/src/soc/amd/common/block/lpc/espi_def.h
+++ b/src/soc/amd/common/block/lpc/espi_def.h
@@ -25,6 +25,7 @@
 #define  ESPI_WDG_EN			(1 << 0)
 
 #define ESPI_GLOBAL_CONTROL_1		0x34
+#define  ESPI_ALERT_ENABLE		(1 << 20) /* Sabrina and later SoCs */
 #define  ESPI_RGCMD_INT_MAP_SHIFT	13
 #define  ESPI_RGCMD_INT_MAP_MASK	(0x1f << ESPI_RGCMD_INT_MAP_SHIFT)
 #define    ESPI_RGCMD_INT(irq)		((irq) << ESPI_RGCMD_INT_MAP_SHIFT)
diff --git a/src/soc/amd/common/block/lpc/espi_util.c b/src/soc/amd/common/block/lpc/espi_util.c
index 68d51f5ba0..c4d15e4b70 100644
--- a/src/soc/amd/common/block/lpc/espi_util.c
+++ b/src/soc/amd/common/block/lpc/espi_util.c
@@ -936,7 +936,7 @@ static void espi_setup_subtractive_decode(const struct espi_config *mb_cfg)
 
 enum cb_err espi_setup(void)
 {
-	uint32_t slave_caps;
+	uint32_t slave_caps, ctrl;
 	const struct espi_config *cfg = espi_get_config();
 
 	printk(BIOS_SPEW, "Initializing ESPI.\n");
@@ -1035,8 +1035,13 @@ enum cb_err espi_setup(void)
 	/* Enable subtractive decode if configured */
 	espi_setup_subtractive_decode(cfg);
 
-	espi_write32(ESPI_GLOBAL_CONTROL_1,
-		     espi_read32(ESPI_GLOBAL_CONTROL_1) | ESPI_BUS_MASTER_EN);
+	ctrl = espi_read32(ESPI_GLOBAL_CONTROL_1);
+	ctrl |= ESPI_BUS_MASTER_EN;
+
+	if (CONFIG(SOC_AMD_COMMON_BLOCK_HAS_ESPI_ALERT_ENABLE))
+		ctrl |= ESPI_ALERT_ENABLE;
+
+	espi_write32(ESPI_GLOBAL_CONTROL_1, ctrl);
 
 	printk(BIOS_SPEW, "Finished initializing ESPI.\n");