diff --git a/src/soc/amd/common/block/acpi/acpi.c b/src/soc/amd/common/block/acpi/acpi.c
index 2be9b9e25e..be331e3fea 100644
--- a/src/soc/amd/common/block/acpi/acpi.c
+++ b/src/soc/amd/common/block/acpi/acpi.c
@@ -91,6 +91,28 @@ static void log_pm1_status(uint16_t pm1_sts)
 		elog_add_event_wake(ELOG_WAKE_SOURCE_PCIE, 0);
 }
 
+void acpi_fill_pm_gpe_state(struct acpi_pm_gpe_state *state)
+{
+	state->pm1_sts = acpi_read16(MMIO_ACPI_PM1_STS);
+	state->pm1_en = acpi_read16(MMIO_ACPI_PM1_EN);
+	state->gpe0_sts = acpi_read32(MMIO_ACPI_GPE0_STS);
+	state->gpe0_en = acpi_read32(MMIO_ACPI_GPE0_EN);
+	state->previous_sx_state = acpi_get_sleep_type();
+	state->aligning_field = 0;
+}
+
+void acpi_pm_gpe_add_events_print_events(const struct acpi_pm_gpe_state *state)
+{
+	log_pm1_status(state->pm1_sts);
+	print_pm1_status(state->pm1_sts);
+}
+
+void acpi_clear_pm_gpe_status(void)
+{
+	acpi_write16(MMIO_ACPI_PM1_STS, acpi_read16(MMIO_ACPI_PM1_STS));
+	acpi_write32(MMIO_ACPI_GPE0_STS, acpi_read32(MMIO_ACPI_GPE0_STS));
+}
+
 static void save_sws(uint16_t pm1_status)
 {
 	struct soc_power_reg *sws;
diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h
index 4d227350fa..8f16054fd7 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpi.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpi.h
@@ -16,6 +16,23 @@
 #define MMIO_ACPI_GPE0_STS		0x14
 #define MMIO_ACPI_GPE0_EN		0x18
 
+/* Structure to maintain standard ACPI register state for reporting purposes. */
+struct acpi_pm_gpe_state {
+	uint16_t pm1_sts;
+	uint16_t pm1_en;
+	uint32_t gpe0_sts;
+	uint32_t gpe0_en;
+	uint16_t previous_sx_state;
+	uint16_t aligning_field;
+};
+
+/* Fill object with the ACPI PM and GPE state. */
+void acpi_fill_pm_gpe_state(struct acpi_pm_gpe_state *state);
+/* Save events to eventlog log and also print information on console. */
+void acpi_pm_gpe_add_events_print_events(const struct acpi_pm_gpe_state *state);
+/* Clear PM and GPE status registers. */
+void acpi_clear_pm_gpe_status(void);
+
 void acpi_clear_pm1_status(void);
 
 /*