diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c
index 3015d17079..28a912818f 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -182,4 +182,7 @@ void bootblock_soc_early_init(void)
 	enable_spibar();
 
 	cache_bios_region();
+
+	/* Initialize GPE for use as interrupt status */
+	pmc_gpe_init();
 }
diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h
index 2c12c8d28e..dd9e5265a1 100644
--- a/src/soc/intel/apollolake/include/soc/pm.h
+++ b/src/soc/intel/apollolake/include/soc/pm.h
@@ -206,6 +206,7 @@ void enable_gpe(uint32_t mask);
 void disable_gpe(uint32_t mask);
 void disable_all_gpe(void);
 uintptr_t get_pmc_mmio_bar(void);
+void pmc_gpe_init(void);
 
 void global_reset_enable(bool enable);
 void global_reset_lock(void);
diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c
index c58314494c..20c9492026 100644
--- a/src/soc/intel/apollolake/pmc.c
+++ b/src/soc/intel/apollolake/pmc.c
@@ -65,65 +65,6 @@ static void set_resources(device_t dev)
 	report_resource_stored(dev, res, " ACPI BAR");
 }
 
-static void pmc_gpe_init(void)
-{
-	uint32_t gpio_cfg = 0;
-	uint32_t gpio_cfg_reg;
-	uint8_t dw1, dw2, dw3;
-	const struct soc_intel_apollolake_config *config;
-
-	struct device *dev = NB_DEV_ROOT;
-	if (!dev || !dev->chip_info) {
-		printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
-		return;
-	}
-	config = dev->chip_info;
-
-	uintptr_t pmc_bar = get_pmc_mmio_bar();
-
-	const uint32_t gpio_cfg_mask =
-		(GPE0_DWX_MASK << GPE0_DW1_SHIFT) |
-		(GPE0_DWX_MASK << GPE0_DW2_SHIFT) |
-		(GPE0_DWX_MASK << GPE0_DW3_SHIFT);
-
-	/* Assign to local variable */
-	dw1 = config->gpe0_dw1;
-	dw2 = config->gpe0_dw2;
-	dw3 = config->gpe0_dw3;
-
-	/* Making sure that bad values don't bleed into the other fields */
-	dw1 &= GPE0_DWX_MASK;
-	dw2 &= GPE0_DWX_MASK;
-	dw3 &= GPE0_DWX_MASK;
-
-	/* Route the GPIOs to the GPE0 block. Determine that all values
-	 * are different, and if they aren't use the reset values.
-	 * DW0 is reserved/unused */
-	if (dw1 == dw2 || dw2 == dw3) {
-		printk(BIOS_INFO, "PMC: Using default GPE route.\n");
-		gpio_cfg = read32((void *)pmc_bar + GPIO_GPE_CFG);
-
-		dw1 = (gpio_cfg >> GPE0_DW1_SHIFT) & GPE0_DWX_MASK;
-		dw2 = (gpio_cfg >> GPE0_DW2_SHIFT) & GPE0_DWX_MASK;
-		dw3 = (gpio_cfg >> GPE0_DW3_SHIFT) & GPE0_DWX_MASK;
-	} else {
-		gpio_cfg |= (uint32_t)dw1 << GPE0_DW1_SHIFT;
-		gpio_cfg |= (uint32_t)dw2 << GPE0_DW2_SHIFT;
-		gpio_cfg |= (uint32_t)dw3 << GPE0_DW3_SHIFT;
-	}
-
-	gpio_cfg_reg = read32((void *)pmc_bar + GPIO_GPE_CFG) & ~gpio_cfg_mask;
-	gpio_cfg_reg |= gpio_cfg & gpio_cfg_mask;
-
-	write32((void *)pmc_bar + GPIO_GPE_CFG, gpio_cfg_reg);
-
-	/* Set the routes in the GPIO communities as well. */
-	gpio_route_gpe(dw1, dw2, dw3);
-
-	/* Reset the power state in cbmem as routing */
-	fixup_power_state();
-}
-
 static void pch_set_acpi_mode(void)
 {
 	if (IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) && !acpi_is_wakeup_s3()) {
@@ -192,6 +133,7 @@ static void pmc_init(struct device *dev)
 
 	/* Set up GPE configuration */
 	pmc_gpe_init();
+	fixup_power_state();
 	pch_set_acpi_mode();
 
 	if (cfg != NULL)
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 39edc45886..2aef18c8e6 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -29,6 +29,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <vboot/vboot_common.h>
+#include "chip.h"
 
 static uintptr_t read_pmc_mmio_bar(void)
 {
@@ -462,3 +463,60 @@ void poweroff(void)
 	if (!ENV_SMM)
 		halt();
 }
+
+void pmc_gpe_init(void)
+{
+	uint32_t gpio_cfg = 0;
+	uint32_t gpio_cfg_reg;
+	uint8_t dw1, dw2, dw3;
+	ROMSTAGE_CONST struct soc_intel_apollolake_config *config;
+
+	/* Look up the device in devicetree */
+	ROMSTAGE_CONST struct device *dev = dev_find_slot(0, NB_DEVFN);
+	if (!dev || !dev->chip_info) {
+		printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
+		return;
+	}
+	config = dev->chip_info;
+
+	uintptr_t pmc_bar = get_pmc_mmio_bar();
+
+	const uint32_t gpio_cfg_mask =
+		(GPE0_DWX_MASK << GPE0_DW1_SHIFT) |
+		(GPE0_DWX_MASK << GPE0_DW2_SHIFT) |
+		(GPE0_DWX_MASK << GPE0_DW3_SHIFT);
+
+	/* Assign to local variable */
+	dw1 = config->gpe0_dw1;
+	dw2 = config->gpe0_dw2;
+	dw3 = config->gpe0_dw3;
+
+	/* Making sure that bad values don't bleed into the other fields */
+	dw1 &= GPE0_DWX_MASK;
+	dw2 &= GPE0_DWX_MASK;
+	dw3 &= GPE0_DWX_MASK;
+
+	/* Route the GPIOs to the GPE0 block. Determine that all values
+	 * are different, and if they aren't use the reset values.
+	 * DW0 is reserved/unused */
+	if (dw1 == dw2 || dw2 == dw3) {
+		printk(BIOS_INFO, "PMC: Using default GPE route.\n");
+		gpio_cfg = read32((void *)pmc_bar + GPIO_GPE_CFG);
+
+		dw1 = (gpio_cfg >> GPE0_DW1_SHIFT) & GPE0_DWX_MASK;
+		dw2 = (gpio_cfg >> GPE0_DW2_SHIFT) & GPE0_DWX_MASK;
+		dw3 = (gpio_cfg >> GPE0_DW3_SHIFT) & GPE0_DWX_MASK;
+	} else {
+		gpio_cfg |= (uint32_t)dw1 << GPE0_DW1_SHIFT;
+		gpio_cfg |= (uint32_t)dw2 << GPE0_DW2_SHIFT;
+		gpio_cfg |= (uint32_t)dw3 << GPE0_DW3_SHIFT;
+	}
+
+	gpio_cfg_reg = read32((void *)pmc_bar + GPIO_GPE_CFG) & ~gpio_cfg_mask;
+	gpio_cfg_reg |= gpio_cfg & gpio_cfg_mask;
+
+	write32((void *)pmc_bar + GPIO_GPE_CFG, gpio_cfg_reg);
+
+	/* Set the routes in the GPIO communities as well. */
+	gpio_route_gpe(dw1, dw2, dw3);
+}