From 8923dceaf7a78b1a5936033501328579a8ef80ce Mon Sep 17 00:00:00 2001
From: Nicolas Kochlowski <nickkochlowski@gmail.com>
Date: Thu, 19 Sep 2024 12:16:02 -0300
Subject: 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   | 2 +-
 src/soc/amd/genoa_poc/chip.c   | 2 +-
 src/soc/amd/genoa_poc/domain.c | 2 +-
 src/soc/amd/phoenix/acpi.c     | 2 +-
 src/soc/amd/phoenix/chip.c     | 2 +-
 src/soc/amd/phoenix/memmap.c   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/soc/amd')

diff --git a/src/soc/amd/genoa_poc/acpi.c b/src/soc/amd/genoa_poc/acpi.c
index fc223047be..9b8011dcc6 100644
--- a/src/soc/amd/genoa_poc/acpi.c
+++ b/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)
 {
diff --git a/src/soc/amd/genoa_poc/chip.c b/src/soc/amd/genoa_poc/chip.c
index a763dab862..75f5bccb00 100644
--- a/src/soc/amd/genoa_poc/chip.c
+++ b/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)
 {
diff --git a/src/soc/amd/genoa_poc/domain.c b/src/soc/amd/genoa_poc/domain.c
index b6369a47d0..65b13958cb 100644
--- a/src/soc/amd/genoa_poc/domain.c
+++ b/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
 
diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c
index c96d80c5fb..c6e06be0bb 100644
--- a/src/soc/amd/phoenix/acpi.c
+++ b/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"
 
 /*
diff --git a/src/soc/amd/phoenix/chip.c b/src/soc/amd/phoenix/chip.c
index a88468b28d..68bc408d2b 100644
--- a/src/soc/amd/phoenix/chip.c
+++ b/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)
diff --git a/src/soc/amd/phoenix/memmap.c b/src/soc/amd/phoenix/memmap.c
index 9e740cbb9c..d29dcbee63 100644
--- a/src/soc/amd/phoenix/memmap.c
+++ b/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>
 
 /*
  *                     +--------------------------------+
-- 
cgit v1.2.3