Change in coreboot[master]: soc/intel/xeon_sp: Don't use common block acpi.h

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48254 )

Change subject: soc/intel/xeon_sp: Don't use common block acpi.h
......................................................................

soc/intel/xeon_sp: Don't use common block acpi.h

Don't use the common block acpi.h when we aren't using the
COMMON_ACPI config. Fixes a dependency build issue in an upcoming
commit.

Change-Id: I3b80f7bbdf81e594fdde5b750c666edd8ca7268d
Signed-off-by: Marc Jones 
---
M src/soc/intel/xeon_sp/acpi.c
M src/soc/intel/xeon_sp/cpx/soc_acpi.c
M src/soc/intel/xeon_sp/include/soc/acpi.h
M src/soc/intel/xeon_sp/nb_acpi.c
M src/soc/intel/xeon_sp/skx/soc_acpi.c
5 files changed, 9 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/48254/1

diff --git a/src/soc/intel/xeon_sp/acpi.c b/src/soc/intel/xeon_sp/acpi.c
index fb4cd78..4fe8b20 100644
--- a/src/soc/intel/xeon_sp/acpi.c
+++ b/src/soc/intel/xeon_sp/acpi.c
@@ -4,12 +4,12 @@
 #include <acpi/acpi_gnvs.h>
 #include <acpi/acpigen.h>
 #include <arch/smp/mpspec.h>
-#include <intelblocks/acpi.h>
 #include <device/pci.h>
 #include <cbmem.h>
 #include <cpu/x86/smm.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
+#include <soc/intel/common/acpi.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/soc_util.h>
diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
index 599ccff..8e73008 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
@@ -8,7 +8,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <intelblocks/acpi.h>
+#include <intelblocks/cpulib.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h
index 60d6321..2f22c62 100644
--- a/src/soc/intel/xeon_sp/include/soc/acpi.h
+++ b/src/soc/intel/xeon_sp/include/soc/acpi.h
@@ -19,8 +19,13 @@

unsigned long northbridge_write_acpi_tables(const struct device *device,
    unsigned long current, struct acpi_rsdp *rsdp);
-
-
+unsigned long southbridge_write_acpi_tables(const struct device *device,
+	unsigned long current, struct acpi_rsdp *rsdp);
+uint32_t soc_read_sci_irq_select(void);
+int soc_madt_sci_irq_polarity(int sci);
+void soc_power_states_generation(int core, int cores_per_package);
+acpi_tstate_t *soc_get_tss_table(int *entries);
+acpi_cstate_t *soc_get_cstate_map(size_t *entries);
 int calculate_power(int tdp, int p1_ratio, int ratio);
 void uncore_inject_dsdt(const struct device *device);
 unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current);
diff --git a/src/soc/intel/xeon_sp/nb_acpi.c b/src/soc/intel/xeon_sp/nb_acpi.c
index cb7ae40..19c3921 100644
--- a/src/soc/intel/xeon_sp/nb_acpi.c
+++ b/src/soc/intel/xeon_sp/nb_acpi.c
@@ -5,7 +5,6 @@
 #include <cbmem.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <intelblocks/acpi.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index 3ac46ff..53b9d27 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -8,7 +8,6 @@
 #include <cpu/intel/turbo.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <intelblocks/acpi.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>

[Jay Talbott (Code Review)]

Jay Talbott has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48254 )

Change subject: soc/intel/xeon_sp: Don't use common block acpi.h
......................................................................

Patch Set 2: Code-Review+1

[Jonathan Zhang (Code Review)]

Jonathan Zhang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48254 )

Change subject: soc/intel/xeon_sp: Don't use common block acpi.h
......................................................................

Patch Set 2: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48254 )

Change subject: soc/intel/xeon_sp: Don't use common block acpi.h
......................................................................

soc/intel/xeon_sp: Don't use common block acpi.h

Don't use the common block acpi.h when we aren't using the
COMMON_ACPI config. Fixes a dependency build issue in an upcoming
commit.

Change-Id: I3b80f7bbdf81e594fdde5b750c666edd8ca7268d
Signed-off-by: Marc Jones 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48254
Tested-by: build bot (Jenkins) 
Reviewed-by: Jay Talbott 
Reviewed-by: Jonathan Zhang 
---
M src/soc/intel/xeon_sp/acpi.c
M src/soc/intel/xeon_sp/cpx/soc_acpi.c
M src/soc/intel/xeon_sp/include/soc/acpi.h
M src/soc/intel/xeon_sp/nb_acpi.c
M src/soc/intel/xeon_sp/skx/soc_acpi.c
5 files changed, 9 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Jay Talbott: Looks good to me, but someone else must approve
  Jonathan Zhang: Looks good to me, approved

diff --git a/src/soc/intel/xeon_sp/acpi.c b/src/soc/intel/xeon_sp/acpi.c
index fb4cd78..4fe8b20 100644
--- a/src/soc/intel/xeon_sp/acpi.c
+++ b/src/soc/intel/xeon_sp/acpi.c
@@ -4,12 +4,12 @@
 #include <acpi/acpi_gnvs.h>
 #include <acpi/acpigen.h>
 #include <arch/smp/mpspec.h>
-#include <intelblocks/acpi.h>
 #include <device/pci.h>
 #include <cbmem.h>
 #include <cpu/x86/smm.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
+#include <soc/intel/common/acpi.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/soc_util.h>
diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
index 599ccff..8e73008 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
@@ -8,7 +8,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <intelblocks/acpi.h>
+#include <intelblocks/cpulib.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h
index 60d6321..2f22c62 100644
--- a/src/soc/intel/xeon_sp/include/soc/acpi.h
+++ b/src/soc/intel/xeon_sp/include/soc/acpi.h
@@ -19,8 +19,13 @@

unsigned long northbridge_write_acpi_tables(const struct device *device,
    unsigned long current, struct acpi_rsdp *rsdp);
-
-
+unsigned long southbridge_write_acpi_tables(const struct device *device,
+	unsigned long current, struct acpi_rsdp *rsdp);
+uint32_t soc_read_sci_irq_select(void);
+int soc_madt_sci_irq_polarity(int sci);
+void soc_power_states_generation(int core, int cores_per_package);
+acpi_tstate_t *soc_get_tss_table(int *entries);
+acpi_cstate_t *soc_get_cstate_map(size_t *entries);
 int calculate_power(int tdp, int p1_ratio, int ratio);
 void uncore_inject_dsdt(const struct device *device);
 unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current);
diff --git a/src/soc/intel/xeon_sp/nb_acpi.c b/src/soc/intel/xeon_sp/nb_acpi.c
index cb7ae40..19c3921 100644
--- a/src/soc/intel/xeon_sp/nb_acpi.c
+++ b/src/soc/intel/xeon_sp/nb_acpi.c
@@ -5,7 +5,6 @@
 #include <cbmem.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <intelblocks/acpi.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index 3ac46ff..53b9d27 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -8,7 +8,6 @@
 #include <cpu/intel/turbo.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <intelblocks/acpi.h>
 #include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>