commit 8066fda9ed53da095b17188e3b96265810534985
author Marc Jones <marcjones@sysproconsulting.com> Mon Oct 19 15:52:52 2020 -0600
committer Marc Jones <marc@marcjonesconsulting.com> Thu Oct 22 21:34:29 2020 +0000
tree a627722ecce0798cb92cf4652814631aa823cccb
parent 8972750b266f97975949821f1075a1104dd2f915

soc/intel/xeon_sp: Move ACPI prototypes from chip.h

Prepare for common ACPI. Move the soc ACPI function prototypes from
cpx and skx chip.h to include/soc/acpi.h.

Change-Id: Ib7037cfb58825a2f6c25c122b95f72d5992dc04e
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46595
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/soc/intel/xeon_sp/cpx/acpi.c

diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c
index 8d3e86a..658c951 100644
--- a/src/soc/intel/xeon_sp/cpx/acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/acpi.c
@@ -23,8 +23,6 @@
 #include <soc/pm.h>
 #include <soc/soc_util.h>
 
-#include "chip.h"
-
 static int acpi_sci_irq(void)
 {
 	int sci_irq = 9;

src/soc/intel/xeon_sp/cpx/chip.h

diff --git a/src/soc/intel/xeon_sp/cpx/chip.h b/src/soc/intel/xeon_sp/cpx/chip.h
index e7c146c..434b343 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.h
+++ b/src/soc/intel/xeon_sp/cpx/chip.h
@@ -99,10 +99,4 @@
 
 typedef struct soc_intel_xeon_sp_cpx_config config_t;
 
-/* soc acpi function prototypes. To be removed when acpi.c is replaced by common/acpi.c */
-void cpx_generate_p_state_entries(int core, int cores_per_package);
-int calculate_power(int tdp, int p1_ratio, int ratio);
-void uncore_inject_dsdt(void);
-unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current);
-
 #endif

src/soc/intel/xeon_sp/cpx/soc_acpi.c

diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
index fab2211..cf84334 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
@@ -17,8 +17,6 @@
 #include <soc/pm.h>
 #include <soc/soc_util.h>
 
-#include "chip.h"
-
 /* TODO: Check if the common/acpi weak function can be used */
 unsigned long acpi_fill_mcfg(unsigned long current)
 {

src/soc/intel/xeon_sp/include/soc/acpi.h

diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h
index 6a76ef2..b46914d 100644
--- a/src/soc/intel/xeon_sp/include/soc/acpi.h
+++ b/src/soc/intel/xeon_sp/include/soc/acpi.h
@@ -22,4 +22,9 @@
 
 void motherboard_fill_fadt(acpi_fadt_t *fadt);
 
+void cpx_generate_p_state_entries(int core, int cores_per_package);
+int calculate_power(int tdp, int p1_ratio, int ratio);
+void uncore_inject_dsdt(void);
+unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current);
+
 #endif /* _SOC_ACPI_H_ */

src/soc/intel/xeon_sp/skx/acpi.c

diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index cbafbdb..c446a51 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -15,8 +15,6 @@
 #include <soc/pm.h>
 #include <string.h>
 
-#include "chip.h"
-
 acpi_cstate_t *soc_get_cstate_map(size_t *entries)
 {
 	*entries = 0;

src/soc/intel/xeon_sp/skx/chip.h

diff --git a/src/soc/intel/xeon_sp/skx/chip.h b/src/soc/intel/xeon_sp/skx/chip.h
index adb70e5..0860899 100644
--- a/src/soc/intel/xeon_sp/skx/chip.h
+++ b/src/soc/intel/xeon_sp/skx/chip.h
@@ -76,8 +76,4 @@
 
 typedef struct soc_intel_xeon_sp_skx_config config_t;
 
-/* soc acpi function prototypes. To be removed when acpi.c is replaced by common/acpi.c */
-void uncore_inject_dsdt(void);
-unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current);
-
 #endif

src/soc/intel/xeon_sp/skx/soc_acpi.c

diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index b6b39f2..afbcf84 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -18,8 +18,6 @@
 #include <soc/pm.h>
 #include <soc/soc_util.h>
 
-#include "chip.h"
-
 /* TODO: Check if the common/acpi weak function can be used */
 unsigned long acpi_fill_mcfg(unsigned long current)
 {