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>
This commit is contained in:
Marc Jones 2020-12-02 16:25:16 -07:00 committed by Patrick Georgi
parent 2c9d65b51b
commit c987e65eb4
5 changed files with 9 additions and 6 deletions

View File

@ -4,12 +4,12 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
#include <arch/smp/mpspec.h> #include <arch/smp/mpspec.h>
#include <intelblocks/acpi.h>
#include <device/pci.h> #include <device/pci.h>
#include <cbmem.h> #include <cbmem.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/intel/common/acpi.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pm.h> #include <soc/pm.h>
#include <soc/soc_util.h> #include <soc/soc_util.h>

View File

@ -8,7 +8,7 @@
#include <cpu/intel/turbo.h> #include <cpu/intel/turbo.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/acpi.h> #include <intelblocks/cpulib.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/iomap.h> #include <soc/iomap.h>

View File

@ -19,8 +19,13 @@ typedef struct {
unsigned long northbridge_write_acpi_tables(const struct device *device, unsigned long northbridge_write_acpi_tables(const struct device *device,
unsigned long current, struct acpi_rsdp *rsdp); 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); int calculate_power(int tdp, int p1_ratio, int ratio);
void uncore_inject_dsdt(const struct device *device); void uncore_inject_dsdt(const struct device *device);
unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current); unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current);

View File

@ -5,7 +5,6 @@
#include <cbmem.h> #include <cbmem.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/acpi.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/iomap.h> #include <soc/iomap.h>

View File

@ -8,7 +8,6 @@
#include <cpu/intel/turbo.h> #include <cpu/intel/turbo.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci.h> #include <device/pci.h>
#include <intelblocks/acpi.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/iomap.h> #include <soc/iomap.h>