vc/amd/opensil: Move openSIL interface declarations to common header

The declarations describing interface functions between SoCs
and openSIL glue code are common for the stub and Genoa POC,
and likely with future SoC openSIL implementations. Therefore,
move these out of SoC-specific header files and into
vc/amd/opensil/opensil.h.

This change facilitates swapping out the stub for the actual
openSIL glue code.

Change-Id: Icc8783ddb868f9f0c4cd357245604313eadfe531
Signed-off-by: Nicolas Kochlowski <nickkochlowski@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84428
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Varshit Pandya <pandyavarshit@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/amd/genoa_poc/acpi.c

@@ -8,7 +8,7 @@
 #include <amdblocks/cpu.h>
 #include <arch/ioapic.h>
 #include <device/device.h>
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 void acpi_fill_fadt(acpi_fadt_t *fadt)
 {

src/soc/amd/genoa_poc/chip.c

@@ -5,7 +5,7 @@
 #include <device/device.h>
 #include <soc/southbridge.h>
 #include <soc/southbridge.h>
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 static void soc_init(void *chip_info)
 {

src/soc/amd/genoa_poc/domain.c

@@ -11,7 +11,7 @@
 #include <device/device.h>
 #include <types.h>
 
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 #define IOHC_IOAPIC_BASE_ADDR_LO 0x2f0
 

src/soc/amd/phoenix/acpi.c

@@ -19,7 +19,7 @@
 #include <device/device.h>
 #include <soc/iomap.h>
 #include <types.h>
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 #include "chip.h"
 
 /*

src/soc/amd/phoenix/chip.c

@@ -14,7 +14,7 @@
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 #include <types.h>
-#include <vendorcode/amd/opensil/stub/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 #include "chip.h"
 
 static const char *soc_acpi_name(const struct device *dev)

src/soc/amd/phoenix/memmap.c

@@ -5,7 +5,7 @@
 #include <amdblocks/root_complex.h>
 #include <device/device.h>
 #include <stdint.h>
-#include <vendorcode/amd/opensil/stub/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 /*
  *                     +--------------------------------+

src/vendorcode/amd/opensil/genoa_poc/acpi.c

@@ -5,7 +5,7 @@
 #include <SilCommon.h>
 #include <xSIM-api.h>
 #include <FCH/Common/FchCommonCfg.h>
-#include "opensil.h"
+#include "../opensil.h"
 
 void opensil_fill_fadt_io_ports(acpi_fadt_t *fadt)
 {

src/vendorcode/amd/opensil/genoa_poc/memmap.c

@@ -12,7 +12,7 @@
 #include <cbmem.h>
 #include <amdblocks/memmap.h>
 
-#include "opensil.h"
+#include "../opensil.h"
 
 static const char *hole_info_type(MEMORY_HOLE_TYPES type)
 {

src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c

@@ -7,7 +7,7 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include "chip.h"
-#include "../opensil.h"
+#include "../../opensil.h"
 
 struct chip_operations vendorcode_amd_opensil_chip_mpio_ops = {
 	.name = "AMD GENOA MPIO",

src/vendorcode/amd/opensil/genoa_poc/ramstage.c

@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <xSIM-api.h>
 #include "opensil_console.h"
-#include "opensil.h"
+#include "../opensil.h"
 
 void SIL_STATUS_report(const char *function, const int status)
 {

src/vendorcode/amd/opensil/stub/opensil.h

@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _OPENSIL_H_
-#define _OPENSIL_H_
-
-#include <acpi/acpi.h>
-#include <device/device.h>
-
-// Add the memory map to dev, starting at index idx, returns last use idx
-void add_opensil_memmap(struct device *dev, unsigned long *idx);
-// Fill in FADT from openSIL
-void opensil_fill_fadt_io_ports(acpi_fadt_t *fadt);
-
-void setup_opensil(void);
-void opensil_xSIM_timepoint_1(void);
-void opensil_xSIM_timepoint_2(void);
-void opensil_xSIM_timepoint_3(void);
-
-#endif

src/vendorcode/amd/opensil/stub/ramstage.c

@@ -3,7 +3,7 @@
 #include <acpi/acpi.h>
 #include <amdblocks/acpi.h>
 #include <device/device.h>
-#include "opensil.h"
+#include "../opensil.h"
 
 void add_opensil_memmap(struct device *dev, unsigned long *idx)
 {