Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/73200 )
Change subject: soc/intel/xeon_sp: Drop unused cpu.h header ......................................................................
soc/intel/xeon_sp: Drop unused cpu.h header
Change-Id: I42856424d3b55107f1758fb05f7ddbee3550d8b2 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/xeon_sp/cpx/chip.c M src/soc/intel/xeon_sp/cpx/cpu.c D src/soc/intel/xeon_sp/cpx/include/soc/cpu.h M src/soc/intel/xeon_sp/cpx/soc_acpi.c M src/soc/intel/xeon_sp/cpx/soc_util.c M src/soc/intel/xeon_sp/nb_acpi.c M src/soc/intel/xeon_sp/skx/cpu.c D src/soc/intel/xeon_sp/skx/include/soc/cpu.h M src/soc/intel/xeon_sp/skx/soc_acpi.c M src/soc/intel/xeon_sp/skx/soc_util.c 10 files changed, 13 insertions(+), 35 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/73200/1
diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c index 9d94d8b..a3d15ab 100644 --- a/src/soc/intel/xeon_sp/cpx/chip.c +++ b/src/soc/intel/xeon_sp/cpx/chip.c @@ -12,7 +12,6 @@ #include <intelblocks/p2sb.h> #include <soc/acpi.h> #include <soc/chip_common.h> -#include <soc/cpu.h> #include <soc/pch.h> #include <soc/soc_pch.h> #include <soc/ramstage.h> diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c index fefb900..f46d1a6 100644 --- a/src/soc/intel/xeon_sp/cpx/cpu.c +++ b/src/soc/intel/xeon_sp/cpx/cpu.c @@ -15,7 +15,6 @@ #include <intelblocks/cpulib.h> #include <intelblocks/mp_init.h> #include <intelpch/lockdown.h> -#include <soc/cpu.h> #include <soc/msr.h> #include <soc/pci_devs.h> #include <soc/pm.h> diff --git a/src/soc/intel/xeon_sp/cpx/include/soc/cpu.h b/src/soc/intel/xeon_sp/cpx/include/soc/cpu.h deleted file mode 100644 index d00c27f..0000000 --- a/src/soc/intel/xeon_sp/cpx/include/soc/cpu.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef _SOC_CPU_H -#define _SOC_CPU_H - -#include <device/device.h> -#include <cpu/intel/cpu_ids.h> -#include <cpu/x86/msr.h> - -void cpx_init_cpus(struct device *dev); - -#endif diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 0da827d..e8abd77 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -9,7 +9,6 @@ #include <intelblocks/acpi.h> #include <intelblocks/cpulib.h> #include <soc/acpi.h> -#include <soc/cpu.h> #include <soc/iomap.h> #include <soc/msr.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/xeon_sp/cpx/soc_util.c b/src/soc/intel/xeon_sp/cpx/soc_util.c index cd1e06d..a6bcad3 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_util.c +++ b/src/soc/intel/xeon_sp/cpx/soc_util.c @@ -4,7 +4,6 @@ #include <device/device.h> #include <device/pci.h> #include <intelblocks/cpulib.h> -#include <soc/cpu.h> #include <soc/pci_devs.h> #include <soc/soc_util.h> #include <soc/util.h> diff --git a/src/soc/intel/xeon_sp/nb_acpi.c b/src/soc/intel/xeon_sp/nb_acpi.c index bebabfb..121c8a1 100644 --- a/src/soc/intel/xeon_sp/nb_acpi.c +++ b/src/soc/intel/xeon_sp/nb_acpi.c @@ -7,7 +7,6 @@ #include <device/mmio.h> #include <device/pci.h> #include <soc/acpi.h> -#include <soc/cpu.h> #include <soc/hest.h> #include <soc/iomap.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/xeon_sp/skx/cpu.c b/src/soc/intel/xeon_sp/skx/cpu.c index 283cbcc9..a9a035d 100644 --- a/src/soc/intel/xeon_sp/skx/cpu.c +++ b/src/soc/intel/xeon_sp/skx/cpu.c @@ -4,11 +4,11 @@ #include <console/debug.h> #include <intelblocks/cpulib.h> #include <cpu/cpu.h> +#include <cpu/intel/cpu_ids.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/mp.h> #include <cpu/intel/turbo.h> #include <soc/msr.h> -#include <soc/cpu.h> #include <soc/soc_util.h> #include <soc/smmrelocate.h> #include <soc/util.h> @@ -161,6 +161,8 @@ .id_table = cpu_table, };
+#define CPU_BCLK 100 + static void set_max_turbo_freq(void) { msr_t msr, perf_ctl; diff --git a/src/soc/intel/xeon_sp/skx/include/soc/cpu.h b/src/soc/intel/xeon_sp/skx/include/soc/cpu.h deleted file mode 100644 index ef712ab..0000000 --- a/src/soc/intel/xeon_sp/skx/include/soc/cpu.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef _SOC_CPU_H_ -#define _SOC_CPU_H_ - -#include <device/device.h> -#include <cpu/intel/cpu_ids.h> -#include <cpu/x86/msr.h> - -/* CPU bus clock is fixed at 100MHz */ -#define CPU_BCLK 100 - -void xeon_sp_init_cpus(struct device *dev); - -#endif diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index 88f24d4..39dbd4a 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 <device/pci.h> #include <intelblocks/acpi.h> #include <soc/acpi.h> -#include <soc/cpu.h> #include <soc/iomap.h> #include <soc/msr.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/xeon_sp/skx/soc_util.c b/src/soc/intel/xeon_sp/skx/soc_util.c index 3258007..6286138 100644 --- a/src/soc/intel/xeon_sp/skx/soc_util.c +++ b/src/soc/intel/xeon_sp/skx/soc_util.c @@ -7,7 +7,6 @@ #include <intelblocks/cpulib.h> #include <intelblocks/pcr.h> #include <soc/iomap.h> -#include <soc/cpu.h> #include <soc/msr.h> #include <soc/pci_devs.h> #include <soc/pcr_ids.h>