diff options
| author | Marc Jones <marcjones@sysproconsulting.com> | 2020-12-02 16:25:16 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-12-05 08:10:33 +0000 |
| commit | c987e65eb4391aeb2fecd8461e879424be20dd08 (patch) | |
| tree | eb0c1bea297d16728b69c00db16120c7405c28f6 /src | |
| parent | 2c9d65b51b9ed5af092434d1172a43628ef068d5 (diff) | |
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 <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48254
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com>
Reviewed-by: Jonathan Zhang <jonzhang@fb.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/intel/xeon_sp/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/cpx/soc_acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/include/soc/acpi.h | 9 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/nb_acpi.c | 1 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/skx/soc_acpi.c | 1 |
5 files changed, 9 insertions, 6 deletions
diff --git a/src/soc/intel/xeon_sp/acpi.c b/src/soc/intel/xeon_sp/acpi.c index fb4cd78dd6..4fe8b206d3 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 599ccff03d..8e73008b75 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 60d6321be4..2f22c621e2 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 @@ typedef struct { 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 cb7ae40313..19c3921ce7 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 3ac46ffcfa..53b9d27b04 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> |