soc/intel: Remove duplicate call to acpi_wake_source()

With SOC_INTEL_COMMON_BLOCK_ACPI=y the call was made twice,
possibly in the order:

  common/block/acpi.c: acpi_wake_source()
  common/acpi_wake_source.c: acpi_wake_source()

In this order later call would reset pm1i and gpei in GNVS.

Remove the implementation in block/acpi.c and rename existing
acpi_wake_source.c to block/acpi_wake_source.c.

Change-Id: I74fdae63111e3ea09000d888a918ebe70d711801
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49880
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

8 files changed, 7 insertions, 82 deletions

diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c
index 1a77b80f1e..e59f3eb886 100644
--- a/src/soc/intel/braswell/ramstage.c
+++ b/src/soc/intel/braswell/ramstage.c
@@ -10,6 +10,7 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
+#include <intelblocks/acpi_wake_source.h>
 #include <fsp/util.h>
 #include <soc/gpio.h>
 #include <soc/lpc.h>
@@ -18,7 +19,6 @@
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/ramstage.h>
-#include <soc/intel/common/acpi.h>
 #include <string.h>
 
 #define SHOW_PATTRS 1
diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc
index 9993bceedf..56e3336fd7 100644
--- a/src/soc/intel/common/Makefile.inc
+++ b/src/soc/intel/common/Makefile.inc
@@ -17,7 +17,6 @@ postcar-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c
 ramstage-y += hda_verb.c
 ramstage-$(CONFIG_SOC_INTEL_COMMON_RESET) += reset.c
 ramstage-$(CONFIG_MMA) += mma.c
-ramstage-$(CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE) += acpi_wake_source.c
 ramstage-y += vbt.c
 ramstage-$(CONFIG_SOC_INTEL_COMMON_NHLT) += nhlt.c
 
diff --git a/src/soc/intel/common/block/acpi/Makefile.inc b/src/soc/intel/common/block/acpi/Makefile.inc
index 4e3a323625..c605088dbe 100644
--- a/src/soc/intel/common/block/acpi/Makefile.inc
+++ b/src/soc/intel/common/block/acpi/Makefile.inc
@@ -1,2 +1,3 @@
 ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI) += acpi.c
 ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_LPIT) += lpit.c
+ramstage-$(CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE) += acpi_wake_source.c
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index dc98b0d636..b36f2567f3 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -14,6 +14,7 @@
 #include <cpu/intel/common/common.h>
 #include <cpu/x86/smm.h>
 #include <intelblocks/acpi.h>
+#include <intelblocks/acpi_wake_source.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/uart.h>
@@ -204,7 +205,7 @@ uint32_t acpi_fill_soc_wake(uint32_t generic_pm1_en,
  * return the number of registers in the gpe0 array
  */
 
-static int acpi_fill_wake(const struct chipset_power_state *ps, uint32_t *pm1, uint32_t **gpe0)
+int soc_fill_acpi_wake(const struct chipset_power_state *ps, uint32_t *pm1, uint32_t **gpe0)
 {
 	static uint32_t gpe0_sts[GPE0_REG_MAX];
 	uint32_t pm1_en;
@@ -438,73 +439,3 @@ void generate_cpu_entries(const struct device *device)
 	/* Add a method to notify processor nodes */
 	acpigen_write_processor_cnot(num_virt);
 }
-
-/* Save wake source data for ACPI _SWS methods in NVS */
-static void pm_fill_gnvs(struct global_nvs *gnvs, const struct chipset_power_state *ps)
-{
-	uint32_t pm1, *gpe0;
-	int gpe_reg, gpe_reg_count;
-	int reg_size = sizeof(uint32_t) * 8;
-
-	gpe_reg_count = acpi_fill_wake(ps, &pm1, &gpe0);
-	if (gpe_reg_count < 0)
-		return;
-
-	/* Scan for first set bit in PM1 */
-	for (gnvs->pm1i = 0; gnvs->pm1i < reg_size; gnvs->pm1i++) {
-		if (pm1 & 1)
-			break;
-		pm1 >>= 1;
-	}
-
-	/* If unable to determine then return -1 */
-	if (gnvs->pm1i >= 16)
-		gnvs->pm1i = -1;
-
-	/* Scan for first set bit in GPE registers */
-	for (gpe_reg = 0; gpe_reg < gpe_reg_count; gpe_reg++) {
-		uint32_t gpe = gpe0[gpe_reg];
-		int start = gpe_reg * reg_size;
-		int end = start + reg_size;
-
-		if (gpe == 0) {
-			if (!gnvs->gpei)
-				gnvs->gpei = end;
-			continue;
-		}
-
-		for (gnvs->gpei = start; gnvs->gpei < end; gnvs->gpei++) {
-			if (gpe & 1)
-				break;
-			gpe >>= 1;
-		}
-	}
-
-	/* If unable to determine then return -1 */
-	if (gnvs->gpei >= gpe_reg_count * reg_size)
-		gnvs->gpei = -1;
-
-	printk(BIOS_DEBUG, "ACPI _SWS is PM1 Index %lld GPE Index %lld\n",
-	       (long long)gnvs->pm1i, (long long)gnvs->gpei);
-}
-
-static void acpi_save_wake_source(void *unused)
-{
-	if (!CONFIG(SOC_INTEL_COMMON_ACPI_WAKE_SOURCE))
-		return;
-
-	const struct chipset_power_state *ps;
-	struct global_nvs *gnvs = acpi_get_gnvs();
-	if (!gnvs)
-		return;
-
-	gnvs->pm1i = -1;
-	gnvs->gpei = -1;
-
-	if (acpi_pm_state_for_wake(&ps) < 0)
-		return;
-
-	pm_fill_gnvs(gnvs, ps);
-}
-
-BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, acpi_save_wake_source, NULL);
diff --git a/src/soc/intel/common/acpi_wake_source.c b/src/soc/intel/common/block/acpi/acpi_wake_source.c
index 5e67e2adca..3ffcac813b 100644
--- a/src/soc/intel/common/acpi_wake_source.c
+++ b/src/soc/intel/common/block/acpi/acpi_wake_source.c
@@ -5,16 +5,10 @@
 #include <acpi/acpi_pm.h>
 #include <bootstate.h>
 #include <console/console.h>
+#include <intelblocks/acpi_wake_source.h>
 #include <soc/nvs.h>
 #include <soc/pm.h>
 #include <stdint.h>
-#include "acpi.h"
-
-__weak int soc_fill_acpi_wake(const struct chipset_power_state *ps, uint32_t *pm1,
-			      uint32_t **gpe0)
-{
-	return -1;
-}
 
 /* Save wake source data for ACPI _SWS methods in NVS */
 static void pm_fill_gnvs(struct global_nvs *gnvs, const struct chipset_power_state *ps)
diff --git a/src/soc/intel/common/acpi.h b/src/soc/intel/common/block/include/intelblocks/acpi_wake_source.h
index efa0336f47..efa0336f47 100644
--- a/src/soc/intel/common/acpi.h
+++ b/src/soc/intel/common/block/include/intelblocks/acpi_wake_source.h
diff --git a/src/soc/intel/denverton_ns/include/soc/nvs.h b/src/soc/intel/denverton_ns/include/soc/nvs.h
index 017a5808e9..3dd747dbbd 100644
--- a/src/soc/intel/denverton_ns/include/soc/nvs.h
+++ b/src/soc/intel/denverton_ns/include/soc/nvs.h
@@ -46,7 +46,7 @@ struct __packed global_nvs {
 	u32 tsegb;	 /* 0x54 - TSEG Base Low */
 	u32 tsegl;	 /* 0x58 - TSEG Length/Size */
 
-	/* Just to satisfy common/block/acpi/acpi.c. */
+	/* Required for future unified acpi_save_wake_source. */
 	u32 pm1i;
 	u32 gpei;
 
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index d62960dbe2..e1e950b376 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -12,12 +12,12 @@
 #include <cpu/x86/msr.h>
 #include <cpu/intel/common/common.h>
 #include <cpu/intel/turbo.h>
+#include <intelblocks/acpi_wake_source.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/sgx.h>
 #include <intelblocks/uart.h>
 #include <intelblocks/systemagent.h>
-#include <soc/intel/common/acpi.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>