coreboot-gerrit December 2016

coreboot-gerrit@coreboot.org

1 participants
1140 discussions

Patch set updated for coreboot: cpu/cpu.h: Drop excessive includes
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17734 -gerrit commit dc4fdda4cc72182eade4763469d903c51120b917 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 14:12:04 2016 +0200 cpu/cpu.h: Drop excessive includes Change-Id: Ifeef04b68760522ce7f230a51f5df354e6da6607 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/mainboard/esd/atom15/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c | 1 - src/mainboard/google/auron/acpi_tables.c | 1 - src/mainboard/google/auron_paine/acpi_tables.c | 1 - src/mainboard/google/beltino/acpi_tables.c | 1 - src/mainboard/google/butterfly/acpi_tables.c | 1 - src/mainboard/google/cyan/acpi_tables.c | 1 - src/mainboard/google/enguarde/acpi_tables.c | 1 - src/mainboard/google/guado/acpi_tables.c | 1 - src/mainboard/google/jecht/acpi_tables.c | 1 - src/mainboard/google/link/acpi_tables.c | 1 - src/mainboard/google/ninja/acpi_tables.c | 1 - src/mainboard/google/parrot/acpi_tables.c | 1 - src/mainboard/google/rambi/acpi_tables.c | 1 - src/mainboard/google/rikku/acpi_tables.c | 1 - src/mainboard/google/samus/acpi_tables.c | 1 - src/mainboard/google/slippy/acpi_tables.c | 1 - src/mainboard/google/stout/acpi_tables.c | 1 - src/mainboard/google/tidus/acpi_tables.c | 1 - src/mainboard/intel/baskingridge/acpi_tables.c | 1 - src/mainboard/intel/bayleybay_fsp/acpi_tables.c | 1 - src/mainboard/intel/minnowmax/acpi_tables.c | 1 - src/mainboard/intel/strago/acpi_tables.c | 1 - src/mainboard/intel/wtm2/acpi_tables.c | 1 - src/mainboard/kontron/ktqm77/acpi_tables.c | 1 - src/mainboard/lenovo/t420s/acpi_tables.c | 1 - src/mainboard/lenovo/t520/acpi_tables.c | 1 - src/mainboard/lenovo/t530/acpi_tables.c | 1 - src/mainboard/lenovo/x220/acpi_tables.c | 1 - src/mainboard/lenovo/x230/acpi_tables.c | 1 - src/mainboard/siemens/mc_tcu3/acpi_tables.c | 1 - 32 files changed, 32 deletions(-) diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c index 3da29ee..4e7fc0d 100644 --- a/src/mainboard/esd/atom15/acpi_tables.c +++ b/src/mainboard/esd/atom15/acpi_tables.c @@ -26,7 +26,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c index 978ce55..3f203ca 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c index 978ce55..3f203ca 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/google/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c index 4566e2f..9583d11 100644 --- a/src/mainboard/google/auron/acpi_tables.c +++ b/src/mainboard/google/auron/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/auron_paine/acpi_tables.c b/src/mainboard/google/auron_paine/acpi_tables.c index 2b43673..f6fc3fd 100644 --- a/src/mainboard/google/auron_paine/acpi_tables.c +++ b/src/mainboard/google/auron_paine/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c index 4b6e015..0f2b0a0 100644 --- a/src/mainboard/google/beltino/acpi_tables.c +++ b/src/mainboard/google/beltino/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c index 63e712d..cdaa474 100644 --- a/src/mainboard/google/butterfly/acpi_tables.c +++ b/src/mainboard/google/butterfly/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/quanta/ene_kb3940q/ec.h> diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c index 3f81747..d2a78f9 100644 --- a/src/mainboard/google/cyan/acpi_tables.c +++ b/src/mainboard/google/cyan/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/google/enguarde/acpi_tables.c b/src/mainboard/google/enguarde/acpi_tables.c index 4eaf103..2c83327 100644 --- a/src/mainboard/google/enguarde/acpi_tables.c +++ b/src/mainboard/google/enguarde/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/google/guado/acpi_tables.c b/src/mainboard/google/guado/acpi_tables.c index 4f75200..aa7f16f 100644 --- a/src/mainboard/google/guado/acpi_tables.c +++ b/src/mainboard/google/guado/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c index 255ad2b..655acc6 100644 --- a/src/mainboard/google/jecht/acpi_tables.c +++ b/src/mainboard/google/jecht/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/link/acpi_tables.c b/src/mainboard/google/link/acpi_tables.c index a7f2c50..b0ecee1 100644 --- a/src/mainboard/google/link/acpi_tables.c +++ b/src/mainboard/google/link/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/ninja/acpi_tables.c b/src/mainboard/google/ninja/acpi_tables.c index c647c9b..c1c4c81 100644 --- a/src/mainboard/google/ninja/acpi_tables.c +++ b/src/mainboard/google/ninja/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c index c9237ac..f5b6146 100644 --- a/src/mainboard/google/parrot/acpi_tables.c +++ b/src/mainboard/google/parrot/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/compal/ene932/ec.h> diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c index c647c9b..c1c4c81 100644 --- a/src/mainboard/google/rambi/acpi_tables.c +++ b/src/mainboard/google/rambi/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/google/rikku/acpi_tables.c b/src/mainboard/google/rikku/acpi_tables.c index 0af2697..6626219 100644 --- a/src/mainboard/google/rikku/acpi_tables.c +++ b/src/mainboard/google/rikku/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/samus/acpi_tables.c b/src/mainboard/google/samus/acpi_tables.c index 8794883..ccca999 100644 --- a/src/mainboard/google/samus/acpi_tables.c +++ b/src/mainboard/google/samus/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c index 97b246f..1e25057 100644 --- a/src/mainboard/google/slippy/acpi_tables.c +++ b/src/mainboard/google/slippy/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c index 729c0f3..580f130 100644 --- a/src/mainboard/google/stout/acpi_tables.c +++ b/src/mainboard/google/stout/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <bootmode.h> diff --git a/src/mainboard/google/tidus/acpi_tables.c b/src/mainboard/google/tidus/acpi_tables.c index 46f5dd9..0ee7934 100644 --- a/src/mainboard/google/tidus/acpi_tables.c +++ b/src/mainboard/google/tidus/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c index b03dc75..e8251dc 100644 --- a/src/mainboard/intel/baskingridge/acpi_tables.c +++ b/src/mainboard/intel/baskingridge/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c index f8b6f65..cbb3e09 100644 --- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c +++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c index 3da29ee..4e7fc0d 100644 --- a/src/mainboard/intel/minnowmax/acpi_tables.c +++ b/src/mainboard/intel/minnowmax/acpi_tables.c @@ -26,7 +26,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c index 591d934..33eba3c 100644 --- a/src/mainboard/intel/strago/acpi_tables.c +++ b/src/mainboard/intel/strago/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c index c72fdb8..35ba78e 100644 --- a/src/mainboard/intel/wtm2/acpi_tables.c +++ b/src/mainboard/intel/wtm2/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c index 7134d3e..c4bd87c 100644 --- a/src/mainboard/kontron/ktqm77/acpi_tables.c +++ b/src/mainboard/kontron/ktqm77/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/t420s/acpi_tables.c b/src/mainboard/lenovo/t420s/acpi_tables.c index a6d2d5d..1b1556a 100644 --- a/src/mainboard/lenovo/t420s/acpi_tables.c +++ b/src/mainboard/lenovo/t420s/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c index 6746220..b435baf 100644 --- a/src/mainboard/lenovo/t520/acpi_tables.c +++ b/src/mainboard/lenovo/t520/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c index 6746220..b435baf 100644 --- a/src/mainboard/lenovo/t530/acpi_tables.c +++ b/src/mainboard/lenovo/t530/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/x220/acpi_tables.c b/src/mainboard/lenovo/x220/acpi_tables.c index 2c148d4..095f6f7 100644 --- a/src/mainboard/lenovo/x220/acpi_tables.c +++ b/src/mainboard/lenovo/x220/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c index 2c148d4..095f6f7 100644 --- a/src/mainboard/lenovo/x230/acpi_tables.c +++ b/src/mainboard/lenovo/x230/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c index f8b6f65..cbb3e09 100644 --- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c +++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h>

1 0

Patch set updated for coreboot: CPU: Declare cpu_phys_address_size() for all arch
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17733 -gerrit commit 39433d50e8c3ec7b8d23b7b55d94f66d57f45c39 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 14:00:05 2016 +0200 CPU: Declare cpu_phys_address_size() for all arch Resource allocator and 64-bit PCI BARs will need it and PCI use is not really restricted to x86. Change-Id: Ie97f0f73380118f43ec6271aed5617d62a4f5532 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/x86/include/arch/cpu.h | 1 - src/arch/x86/postcar_loader.c | 1 + src/cpu/intel/haswell/romstage.c | 1 + src/include/cpu/cpu.h | 1 + src/northbridge/intel/sandybridge/ram_calc.c | 1 + src/soc/intel/common/util.c | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 578bb07..a923d8e 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -161,7 +161,6 @@ static inline unsigned int cpuid_edx(unsigned int op) int cpu_cpuid_extended_level(void); int cpu_have_cpuid(void); -int cpu_phys_address_size(void); void smm_init(void); void smm_lock(void); diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index 948e445..23f33d5 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -16,6 +16,7 @@ #include <arch/cpu.h> #include <cbmem.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <program_loading.h> diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c index 7eb115c..c82f3b9 100644 --- a/src/cpu/intel/haswell/romstage.c +++ b/src/cpu/intel/haswell/romstage.c @@ -18,6 +18,7 @@ #include <cbfs.h> #include <console/console.h> #include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/bist.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 3256a83..dd89a8c 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -8,6 +8,7 @@ void cpu_initialize(unsigned int cpu_index); struct bus; void initialize_cpus(struct bus *cpu_bus); void asmlinkage secondary_cpu_init(unsigned int cpu_index); +int cpu_phys_address_size(void); #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) #ifndef __SIMPLE_DEVICE__ diff --git a/src/northbridge/intel/sandybridge/ram_calc.c b/src/northbridge/intel/sandybridge/ram_calc.c index 026531a..0253def 100644 --- a/src/northbridge/intel/sandybridge/ram_calc.c +++ b/src/northbridge/intel/sandybridge/ram_calc.c @@ -19,6 +19,7 @@ #include <arch/cpu.h> #include <arch/io.h> #include <cbmem.h> +#include <cpu/cpu.h> #include <cpu/intel/romstage.h> #include <cpu/x86/mtrr.h> #include <program_loading.h> diff --git a/src/soc/intel/common/util.c b/src/soc/intel/common/util.c index 2d3a34a..3aadd6b 100644 --- a/src/soc/intel/common/util.c +++ b/src/soc/intel/common/util.c @@ -15,6 +15,7 @@ #include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/x86/mtrr.h> #include <soc/intel/common/util.h> #include <stddef.h>

1 0

Patch set updated for coreboot: CPU: Move SMM prototypes under x86
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17732 -gerrit commit afbb825834d7314e4092916c6ea56b731e1dc0c7 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 13:58:56 2016 +0200 CPU: Move SMM prototypes under x86 Change-Id: Iefbc17dcfcf312338d94b2c2945c7fac3b23bff6 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/x86/include/arch/cpu.h | 4 ++++ src/include/cpu/cpu.h | 4 ---- src/mainboard/siemens/sitemp_g1p1/mainboard.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index faa2375..578bb07 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -163,6 +163,10 @@ int cpu_cpuid_extended_level(void); int cpu_have_cpuid(void); int cpu_phys_address_size(void); +void smm_init(void); +void smm_lock(void); +void smm_setup_structures(void *gnvs, void *tcg, void *smi1); + #ifndef __SIMPLE_DEVICE__ struct device; diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index bf622d7..3256a83 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -9,10 +9,6 @@ struct bus; void initialize_cpus(struct bus *cpu_bus); void asmlinkage secondary_cpu_init(unsigned int cpu_index); -void smm_init(void); -void smm_lock(void); -void smm_setup_structures(void *gnvs, void *tcg, void *smi1); - #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) #ifndef __SIMPLE_DEVICE__ /** start of compile time generated pci driver array */ diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index 736ef34..1f266a7 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -760,7 +760,7 @@ static void detect_hw_variant( device_t dev ) } } -static void smm_lock( void ) +void smm_lock(void) { /* LOCK the SMM memory window and enable normal SMM. * After running this function, only a full reset can

1 0

Patch set updated for coreboot: soc/intel/common: remove mrc cache assumptions
by Aaron Durbin 06 Dec '16

06 Dec '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17717 -gerrit commit d9959b08e690e9bea9ad6bd447e89e8be3e18550 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Sat Dec 3 22:08:20 2016 -0600 soc/intel/common: remove mrc cache assumptions Update the mrc cache implementation to use region_file. Instead of relying on memory-mapped access and pointer arithmetic use the region_devices and region_file to obtain the latest data associated with the region. This removes the need for the nvm wrapper as the region_devices can be used directly. Thus, the library is more generic and can be extended to work on different boot mediums. BUG=chrome-os-partner:56151 Change-Id: Ic14e2d2f7339e50256b4a3a297fc33991861ca44 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/drivers/intel/fsp1_1/romstage.c | 29 +- src/drivers/intel/fsp2_0/memory_init.c | 58 +-- src/soc/intel/apollolake/mmap_boot.c | 17 - src/soc/intel/apollolake/romstage.c | 15 +- src/soc/intel/baytrail/romstage/raminit.c | 15 +- src/soc/intel/broadwell/romstage/raminit.c | 16 +- src/soc/intel/common/mrc_cache.c | 619 +++++++++++++++-------------- src/soc/intel/common/mrc_cache.h | 45 +-- src/soc/intel/common/nvm.c | 122 ++---- src/soc/intel/common/nvm.h | 16 +- 10 files changed, 433 insertions(+), 519 deletions(-) diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index bb3e96c..73fb66d 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -19,6 +19,7 @@ #include <arch/io.h> #include <arch/cbfs.h> #include <arch/early_variables.h> +#include <assert.h> #include <boardid.h> #include <console/console.h> #include <cbmem.h> @@ -99,7 +100,7 @@ void *cache_as_ram_stage_main(FSP_INFO_HEADER *fih) /* Entry from the mainboard. */ void romstage_common(struct romstage_params *params) { - const struct mrc_saved_data *cache; + struct region_device rdev; struct pei_data *pei_data; post_code(0x32); @@ -127,11 +128,15 @@ void romstage_common(struct romstage_params *params) printk(BIOS_DEBUG, "Recovery mode: not using MRC cache.\n"); } else if (IS_ENABLED(CONFIG_CACHE_MRC_SETTINGS) - && (!mrc_cache_get_current_with_version(&cache, - params->fsp_version))) { + && (!mrc_cache_get_current(MRC_TRAINING_DATA, + params->fsp_version, + &rdev))) { /* MRC cache found */ - params->pei_data->saved_data_size = cache->size; - params->pei_data->saved_data = &cache->data[0]; + params->pei_data->saved_data_size = + region_device_sz(&rdev); + params->pei_data->saved_data = rdev_mmap_full(&rdev); + /* Assum boot device is memory mapped. */ + assert(IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)); } else if (params->pei_data->boot_mode == ACPI_S3) { /* Waking from S3 and no cache. */ printk(BIOS_DEBUG, @@ -155,10 +160,10 @@ void romstage_common(struct romstage_params *params) if ((params->pei_data->boot_mode != ACPI_S3) && (params->pei_data->data_to_save_size != 0) && (params->pei_data->data_to_save != NULL)) - mrc_cache_stash_data_with_version( + mrc_cache_stash_data(MRC_TRAINING_DATA, + params->fsp_version, params->pei_data->data_to_save, - params->pei_data->data_to_save_size, - params->fsp_version); + params->pei_data->data_to_save_size); } /* Save DIMM information */ @@ -355,15 +360,15 @@ __attribute__((weak)) void mainboard_add_dimm_info( } /* Get the memory configuration data */ -__attribute__((weak)) int mrc_cache_get_current_with_version( - const struct mrc_saved_data **cache, uint32_t version) +__attribute__((weak)) int mrc_cache_get_current(int type, uint32_t version, + struct region_device *rdev) { return -1; } /* Save the memory configuration data */ -__attribute__((weak)) int mrc_cache_stash_data_with_version(const void *data, - size_t size, uint32_t version) +__attribute__((weak)) int mrc_cache_stash_data(int type, uint32_t version, + const void *data, size_t size) { return -1; } diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 283b179..fab65f2 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -15,6 +15,7 @@ #include <arch/io.h> #include <arch/cpu.h> #include <arch/symbols.h> +#include <assert.h> #include <cbfs.h> #include <cbmem.h> #include <console/console.h> @@ -107,9 +108,9 @@ static void save_memory_training_data(bool s3wake, uint32_t fsp_version) * code which saves the data to flash doesn't write if the latest * training data matches this one. */ - if (mrc_cache_stash_data_with_version(mrc_data, mrc_data_size, - fsp_version) < 0) - printk(BIOS_ERR, "Failed to stash MRC data\n"); + if (mrc_cache_stash_data(MRC_TRAINING_DATA, fsp_version, mrc_data, + mrc_data_size) < 0) + printk(BIOS_ERR, "Failed to stash MRC data\n"); mrc_cache_update_tpm_hash(mrc_data, mrc_data_size); } @@ -146,24 +147,6 @@ static void do_fsp_post_memory_init(bool s3wake, uint32_t fsp_version) romstage_handoff_init(s3wake); } -static const char *mrc_cache_get_region_name(void) -{ - /* In normal mode, always use DEFAULT_MRC_CACHE */ - if (!vboot_recovery_mode_enabled()) - return DEFAULT_MRC_CACHE; - - /* - * In recovery mode, force retraining by returning NULL if: - * 1. Recovery cache is not supported, or - * 2. Memory retrain switch is set. - */ - if (!IS_ENABLED(CONFIG_HAS_RECOVERY_MRC_CACHE) || - vboot_recovery_mode_memory_retrain()) - return NULL; - - return RECOVERY_MRC_CACHE; -} - static int mrc_cache_verify_tpm_hash(const uint8_t *data, size_t size) { uint8_t data_hash[VB2_SHA256_DIGEST_SIZE]; @@ -209,29 +192,46 @@ static int mrc_cache_verify_tpm_hash(const uint8_t *data, size_t size) static void fsp_fill_mrc_cache(FSPM_ARCH_UPD *arch_upd, bool s3wake, uint32_t fsp_version) { - const struct mrc_saved_data *mrc_cache; - const char *name; + struct region_device rdev; + void *data; arch_upd->NvsBufferPtr = NULL; if (!IS_ENABLED(CONFIG_CACHE_MRC_SETTINGS)) return; - name = mrc_cache_get_region_name(); + /* + * In recovery mode, force retraining: + * 1. Recovery cache is not supported, or + * 2. Memory retrain switch is set. + */ + if (vboot_recovery_mode_enabled()) { + if (!IS_ENABLED(CONFIG_HAS_RECOVERY_MRC_CACHE)) + return; + if (vboot_recovery_mode_memory_retrain()) + return; + } + + if (mrc_cache_get_current(MRC_TRAINING_DATA, fsp_version, &rdev) < 0) + return; + + /* Assume boot device is memory mapped. */ + assert(IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)); + data = rdev_mmap_full(&rdev); - if (mrc_cache_get_current_from_region(&mrc_cache, fsp_version, name)) + if (data == NULL) return; - if (!mrc_cache_verify_tpm_hash(mrc_cache->data, mrc_cache->size)) + if (!mrc_cache_verify_tpm_hash(data, region_device_sz(&rdev))) return; /* MRC cache found */ - arch_upd->NvsBufferPtr = (void *)mrc_cache->data; + arch_upd->NvsBufferPtr = data; arch_upd->BootMode = s3wake ? FSP_BOOT_ON_S3_RESUME: FSP_BOOT_ASSUMING_NO_CONFIGURATION_CHANGES; - printk(BIOS_SPEW, "MRC cache found, size %x bootmode:%d\n", - mrc_cache->size, arch_upd->BootMode); + printk(BIOS_SPEW, "MRC cache found, size %zx bootmode:%d\n", + region_device_sz(&rdev), arch_upd->BootMode); } static enum cb_err check_region_overlap(const struct memranges *ranges, diff --git a/src/soc/intel/apollolake/mmap_boot.c b/src/soc/intel/apollolake/mmap_boot.c index bf2e5b9..4617630 100644 --- a/src/soc/intel/apollolake/mmap_boot.c +++ b/src/soc/intel/apollolake/mmap_boot.c @@ -22,7 +22,6 @@ #include <commonlib/region.h> #include <console/console.h> #include <fmap.h> -#include <soc/intel/common/nvm.h> #include <soc/mmap_boot.h> #include <soc/spi.h> @@ -148,22 +147,6 @@ const struct cbfs_locator cbfs_master_header_locator = { .locate = iafw_boot_region_properties, }; -uint32_t nvm_mmio_to_flash_offset(void *p) -{ - bios_mmap_init(); - - size_t start, size; - start = car_get_var(bios_start); - size = car_get_var(bios_size); - - /* - * Returns : - * addr - base of mmaped region in addr space + offset of mmaped region - * start on flash - */ - return (uintptr_t)p - (4ULL * GiB - size) + start; -} - size_t get_bios_size(void) { bios_mmap_init(); diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index 039b586..feb566b 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -201,8 +201,9 @@ asmlinkage void car_stage_entry(void) new_var_data = fsp_find_extension_hob_by_guid(hob_variable_guid, &var_size); if (new_var_data) - mrc_cache_stash_vardata(new_var_data, var_size, - car_get_var(fsp_version)); + mrc_cache_stash_data(MRC_VARIABLE_DATA, + car_get_var(fsp_version), new_var_data, + var_size); else printk(BIOS_ERR, "Failed to determine variable data\n"); @@ -257,7 +258,7 @@ static void fill_console_params(FSPM_UPD *mupd) void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) { - const struct mrc_saved_data *msd; + struct region_device rdev; fill_console_params(mupd); mainboard_memory_init_params(mupd); @@ -292,10 +293,10 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) * wrong/missing key renders DRAM contents useless. */ - if (mrc_cache_get_vardata(&msd, version) < 0) { - printk(BIOS_DEBUG, "MRC variable data missing/invalid\n"); - } else { - mupd->FspmConfig.VariableNvsBufferPtr = (void*) msd->data; + if (mrc_cache_get_current(MRC_VARIABLE_DATA, version, &rdev) == 0) { + /* Assume leaking is ok. */ + assert(IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)); + mupd->FspmConfig.VariableNvsBufferPtr = rdev_mmap_full(&rdev); } car_set_var(fsp_version, version); diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c index a79fe95..190231d 100644 --- a/src/soc/intel/baytrail/romstage/raminit.c +++ b/src/soc/intel/baytrail/romstage/raminit.c @@ -15,7 +15,7 @@ #include <stddef.h> #include <arch/acpi.h> -#include <arch/io.h> +#include <assert.h> #include <cbfs.h> #include <cbmem.h> #include <console/console.h> @@ -111,7 +111,7 @@ void raminit(struct mrc_params *mp, int prev_sleep_state) { int ret; mrc_wrapper_entry_t mrc_entry; - const struct mrc_saved_data *cache; + struct region_device rdev; /* Fill in default entries. */ mp->version = MRC_PARAMS_VER; @@ -125,9 +125,11 @@ void raminit(struct mrc_params *mp, int prev_sleep_state) if (vboot_recovery_mode_enabled()) { printk(BIOS_DEBUG, "Recovery mode: not using MRC cache.\n"); - } else if (!mrc_cache_get_current(&cache)) { - mp->saved_data_size = cache->size; - mp->saved_data = &cache->data[0]; + } else if (!mrc_cache_get_current(MRC_TRAINING_DATA, 0, &rdev)) { + mp->saved_data_size = region_device_sz(&rdev); + mp->saved_data = rdev_mmap_full(&rdev); + /* Assume boot device is memory mapped. */ + assert(IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)); } else if (prev_sleep_state == ACPI_S3) { /* If waking from S3 and no cache then. */ printk(BIOS_DEBUG, "No MRC cache found in S3 resume path.\n"); @@ -178,5 +180,6 @@ void raminit(struct mrc_params *mp, int prev_sleep_state) mp->data_to_save_size); if (mp->data_to_save != NULL && mp->data_to_save_size > 0) - mrc_cache_stash_data(mp->data_to_save, mp->data_to_save_size); + mrc_cache_stash_data(MRC_TRAINING_DATA, 0, mp->data_to_save, + mp->data_to_save_size); } diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c index 61b1bc9..1185788 100644 --- a/src/soc/intel/broadwell/romstage/raminit.c +++ b/src/soc/intel/broadwell/romstage/raminit.c @@ -15,6 +15,7 @@ #include <arch/cbfs.h> #include <arch/io.h> +#include <assert.h> #include <cbfs.h> #include <cbmem.h> #include <console/console.h> @@ -41,7 +42,7 @@ */ void raminit(struct pei_data *pei_data) { - const struct mrc_saved_data *cache; + struct region_device rdev; struct memory_info* mem_info; pei_wrapper_entry_t entry; int ret; @@ -51,10 +52,12 @@ void raminit(struct pei_data *pei_data) if (vboot_recovery_mode_enabled()) { /* Recovery mode does not use MRC cache */ printk(BIOS_DEBUG, "Recovery mode: not using MRC cache.\n"); - } else if (!mrc_cache_get_current(&cache)) { + } else if (!mrc_cache_get_current(MRC_TRAINING_DATA, 0, &rdev)) { /* MRC cache found */ - pei_data->saved_data_size = cache->size; - pei_data->saved_data = &cache->data[0]; + pei_data->saved_data_size = region_device_sz(&rdev); + pei_data->saved_data = rdev_mmap_full(&rdev); + /* Assume boot device is memory mapped. */ + assert(IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)); } else if (pei_data->boot_mode == ACPI_S3) { /* Waking from S3 and no cache. */ printk(BIOS_DEBUG, "No MRC cache found in S3 resume path.\n"); @@ -118,8 +121,9 @@ void raminit(struct pei_data *pei_data) pei_data->data_to_save_size); if (pei_data->data_to_save != NULL && pei_data->data_to_save_size > 0) - mrc_cache_stash_data(pei_data->data_to_save, - pei_data->data_to_save_size); + mrc_cache_stash_data(MRC_TRAINING_DATA, 0, + pei_data->data_to_save, + pei_data->data_to_save_size); printk(BIOS_DEBUG, "create cbmem for dimm information\n"); mem_info = cbmem_add(CBMEM_ID_MEMINFO, sizeof(struct memory_info)); diff --git a/src/soc/intel/common/mrc_cache.c b/src/soc/intel/common/mrc_cache.c index e9d670e..bcb191e 100644 --- a/src/soc/intel/common/mrc_cache.c +++ b/src/soc/intel/common/mrc_cache.c @@ -14,344 +14,343 @@ */ #include <string.h> +#include <boot_device.h> #include <bootstate.h> #include <console/console.h> #include <cbmem.h> #include <elog.h> #include <fmap.h> #include <ip_checksum.h> +#include <region_file.h> #include <vboot/vboot_common.h> #include "mrc_cache.h" #include "nvm.h" -#define MRC_DATA_ALIGN 0x1000 +#define DEFAULT_MRC_CACHE "RW_MRC_CACHE" +#define VARIABLE_MRC_CACHE "RW_VAR_MRC_CACHE" +#define RECOVERY_MRC_CACHE "RECOVERY_MRC_CACHE" +#define UNIFIED_MRC_CACHE "UNIFIED_MRC_CACHE" + #define MRC_DATA_SIGNATURE (('M'<<0)|('R'<<8)|('C'<<16)|('D'<<24)) -/* The mrc_data_region describes the larger non-volatile area to store - * mrc_saved_data objects.*/ -struct mrc_data_region { - void *base; - uint32_t size; -}; +struct mrc_metadata { + uint32_t signature; + uint32_t data_size; + uint16_t data_checksum; + uint16_t header_checksum; + uint32_t version; +} __attribute__((packed)); enum result { - WRITE_FAILURE = -1, - ERASE_FAILURE = -2, - OTHER_FAILURE = -3, + UPDATE_FAILURE = -1, UPDATE_SUCCESS = 0, ALREADY_UPTODATE = 1 }; -/* common code */ -static int mrc_cache_get_region(const char *name, - struct mrc_data_region *region) -{ - bool located_by_fmap = true; - struct region_device rdev; +#define NORMAL_FLAG (1 << 0) +#define RECOVERY_FLAG (1 << 1) - region->base = NULL; - region->size = 0; - - if (fmap_locate_area_as_rdev(name, &rdev)) - located_by_fmap = false; +struct cache_region { + const char *name; + uint32_t cbmem_id; + int type; + int elog_slot; + int flags; +}; - /* CHROMEOS builds must get their MRC cache from FMAP. */ - if (IS_ENABLED(CONFIG_CHROMEOS) && !located_by_fmap) - return -1; +static const struct cache_region recovery_training = { + .name = RECOVERY_MRC_CACHE, + .cbmem_id = CBMEM_ID_MRCDATA, + .type = MRC_TRAINING_DATA, + .elog_slot = ELOG_MEM_CACHE_UPDATE_SLOT_RECOVERY, +#if IS_ENABLED(CONFIG_HAS_RECOVERY_MRC_CACHE) + .flags = RECOVERY_FLAG, +#else + .flags = 0, +#endif +}; - if (located_by_fmap) { - region->size = region_device_sz(&rdev); - region->base = rdev_mmap_full(&rdev); +static const struct cache_region normal_training = { + .name = DEFAULT_MRC_CACHE, + .cbmem_id = CBMEM_ID_MRCDATA, + .type = MRC_TRAINING_DATA, + .elog_slot = ELOG_MEM_CACHE_UPDATE_SLOT_NORMAL, + .flags = NORMAL_FLAG | RECOVERY_FLAG, +}; - if (region->base == NULL) - return -1; - } else { - region->base = (void *)CONFIG_MRC_SETTINGS_CACHE_BASE; - region->size = CONFIG_MRC_SETTINGS_CACHE_SIZE; - } +static const struct cache_region variable_data = { + .name = VARIABLE_MRC_CACHE, + .cbmem_id = CBMEM_ID_VAR_MRCDATA, + .type = MRC_VARIABLE_DATA, + .elog_slot = ELOG_MEM_CACHE_UPDATE_SLOT_VARIABLE, + .flags = NORMAL_FLAG | RECOVERY_FLAG, +}; - return 0; -} +/* Order matters here for priority in matching. */ +static const struct cache_region *cache_regions[] = { + &recovery_training, + &normal_training, + &variable_data, +}; -/* Protect mrc region with a Protected Range Register */ -static int __protect_mrc_cache(const struct mrc_data_region *region, - const char *name) +static int lookup_region_by_name(const char *name, struct region *r) { - if (!IS_ENABLED(CONFIG_MRC_SETTINGS_PROTECT)) + /* This assumes memory mapped boot media just under 4GiB. */ + const uint32_t pointer_base_32bit = -CONFIG_ROM_SIZE; + + if (fmap_locate_area(name, r) == 0) return 0; - if (nvm_is_write_protected() <= 0) { - printk(BIOS_INFO, "MRC: NOT enabling PRR for %s.\n", name); - return 1; + /* CHROMEOS builds must get their MRC cache from FMAP. */ + if (IS_ENABLED(CONFIG_CHROMEOS)) { + printk(BIOS_ERR, "MRC: Chrome OS lookup failure.\n"); + return -1; } - if (nvm_protect(region->base, region->size) < 0) { - printk(BIOS_ERR, "MRC: ERROR setting PRR for %s.\n", name); + if (!IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)) return -1; - } - printk(BIOS_INFO, "MRC: Enabled Protected Range on %s.\n", name); + /* Base is in the form of a pointer. Make it an offset. */ + r->offset = CONFIG_MRC_SETTINGS_CACHE_BASE - pointer_base_32bit; + r->size = CONFIG_MRC_SETTINGS_CACHE_SIZE; + return 0; } -static int protect_mrc_cache(const char *name) +static const struct cache_region *lookup_region_type(int type) { - struct mrc_data_region region; - if (mrc_cache_get_region(name, &region) < 0) { - printk(BIOS_ERR, "MRC: Could not find region %s\n", name); - return -1; + int i; + int flags; + + if (vboot_recovery_mode_enabled()) + flags = RECOVERY_FLAG; + else + flags = NORMAL_FLAG; + + for (i = 0; i < ARRAY_SIZE(cache_regions); i++) { + if (cache_regions[i]->type != type) + continue; + if ((cache_regions[i]->flags & flags) == flags) + return cache_regions[i]; } - return __protect_mrc_cache(&region, name); + return NULL; } -static int mrc_cache_in_region(const struct mrc_data_region *region, - const struct mrc_saved_data *cache) +int mrc_cache_stash_data(int type, uint32_t version, const void *data, + size_t size) { - uintptr_t region_end; - uintptr_t cache_end; - - if ((uintptr_t)cache < (uintptr_t)region->base) - return 0; + const struct cache_region *cr; + size_t cbmem_size; + struct mrc_metadata *md; + + cr = lookup_region_type(type); + if (cr == NULL) { + printk(BIOS_ERR, "MRC: failed to add to cbmem for type %d.\n", + type); + return -1; + } - region_end = (uintptr_t)region->base; - region_end += region->size; + cbmem_size = sizeof(*md) + size; - if ((uintptr_t)cache >= region_end) - return 0; + md = cbmem_add(cr->cbmem_id, cbmem_size); - if ((sizeof(*cache) + (uintptr_t)cache) >= region_end) - return 0; + if (md == NULL) { + printk(BIOS_ERR, "MRC: failed to add '%s' to cbmem.\n", + cr->name); + return -1; + } - cache_end = (uintptr_t)cache; - cache_end += cache->size + sizeof(*cache); + memset(md, 0, sizeof(*md)); + md->signature = MRC_DATA_SIGNATURE; + md->data_size = size; + md->version = version; + md->data_checksum = compute_ip_checksum(data, size); + md->header_checksum = compute_ip_checksum(md, sizeof(*md)); + memcpy(&md[1], data, size); - if (cache_end > region_end) - return 0; - - return 1; + return 0; } -static int mrc_cache_valid(const struct mrc_data_region *region, - const struct mrc_saved_data *cache) +static const struct cache_region *lookup_region(struct region *r, int type) { - uint32_t checksum; - - if (cache->signature != MRC_DATA_SIGNATURE) - return 0; - - if (cache->size > region->size) - return 0; - - checksum = compute_ip_checksum((void *)&cache->data[0], cache->size); - - if (cache->checksum != checksum) - return 0; + const struct cache_region *cr; - return 1; -} + cr = lookup_region_type(type); -static const struct mrc_saved_data * -next_cache_block(const struct mrc_saved_data *cache) -{ - uintptr_t next = (uintptr_t)cache; + if (cr == NULL) { + printk(BIOS_ERR, "MRC: failed to locate region type %d.\n", + type); + return NULL; + } - next += ALIGN(cache->size + sizeof(*cache), MRC_DATA_ALIGN); + if (lookup_region_by_name(cr->name, r) < 0) + return NULL; - return (const struct mrc_saved_data *)next; + return cr; } -/* Locate the most recently saved MRC data. */ -static int __mrc_cache_get_current(const struct mrc_data_region *region, - const struct mrc_saved_data **cache, - uint32_t version) +static int mrc_header_valid(struct region_device *rdev, struct mrc_metadata *md) { - const struct mrc_saved_data *msd; - const struct mrc_saved_data *verified_cache; - int slot = 0; + uint16_t checksum; + uint16_t checksum_result; + size_t size; - msd = region->base; - - verified_cache = NULL; + if (rdev_readat(rdev, md, 0, sizeof(*md)) < 0) { + printk(BIOS_ERR, "MRC: couldn't read metadata\n"); + return -1; + } - while (mrc_cache_in_region(region, msd) && - mrc_cache_valid(region, msd)) { - verified_cache = msd; - msd = next_cache_block(msd); - slot++; + if (md->signature != MRC_DATA_SIGNATURE) { + printk(BIOS_ERR, "MRC: invalid header signature\n"); + return -1; } - /* - * Update pointer to the most recently saved MRC data before returning - * any error. This ensures that the caller can use next available slot - * if required. - */ - *cache = verified_cache; + /* Compute checksum over header with 0 as the value. */ + checksum = md->header_checksum; + md->header_checksum = 0; + checksum_result = compute_ip_checksum(md, sizeof(*md)); - if (verified_cache == NULL) + if (checksum != checksum_result) { + printk(BIOS_ERR, "MRC: header checksum mismatch: %x vs %x\n", + checksum, checksum_result); return -1; + } + + /* Put back original. */ + md->header_checksum = checksum; - if (verified_cache->version != version) { - printk(BIOS_DEBUG, "MRC: cache version mismatch: %x vs %x\n", - verified_cache->version, version); + /* Re-size the region device according to the metadata as a region_file + * does block allocation. */ + size = sizeof(*md) + md->data_size; + if (rdev_chain(rdev, rdev, 0, size) < 0) { + printk(BIOS_ERR, "MRC: size exceeds rdev size: %zx vs %zx\n", + size, region_device_sz(rdev)); return -1; } - printk(BIOS_DEBUG, "MRC: cache slot %d @ %p\n", slot-1, verified_cache); - return 0; } -int mrc_cache_get_current_from_region(const struct mrc_saved_data **cache, - uint32_t version, - const char *region_name) +static int mrc_data_valid(const struct region_device *rdev, + struct mrc_metadata *md) { - struct mrc_data_region region; - - if (!region_name) { - printk(BIOS_ERR, "MRC: Requires memory retraining.\n"); + void *data; + uint16_t checksum; + const size_t md_size = sizeof(*md); + const size_t data_size = region_device_sz(rdev) - md_size; + + data = rdev_mmap(rdev, md_size, data_size); + if (data == NULL) { + printk(BIOS_ERR, "MRC: mmap failure on data verification.\n"); return -1; } - printk(BIOS_ERR, "MRC: Using data from %s\n", region_name); - - if (mrc_cache_get_region(region_name, &region) < 0) { - printk(BIOS_ERR, "MRC: Region %s not found. " - "Requires memory retraining.\n", region_name); - return -1; - } + checksum = compute_ip_checksum(data, data_size); - if (__mrc_cache_get_current(&region, cache, version) < 0) { - printk(BIOS_ERR, "MRC: Valid slot not found in %s." - "Requires memory retraining.\n", region_name); + rdev_munmap(rdev, data); + if (md->data_checksum != checksum) { + printk(BIOS_ERR, "MRC: data checksum mismatch: %x vs %x\n", + md->data_checksum, checksum); return -1; } return 0; } -int mrc_cache_get_current_with_version(const struct mrc_saved_data **cache, - uint32_t version) -{ - return mrc_cache_get_current_from_region(cache, version, - DEFAULT_MRC_CACHE); -} - -int mrc_cache_get_current(const struct mrc_saved_data **cache) +static int mrc_cache_latest(const char *name, + const struct region_device *backing_rdev, + struct mrc_metadata *md, + struct region_file *cache_file, + struct region_device *rdev, + bool fail_bad_data) { - return mrc_cache_get_current_with_version(cache, 0); -} - -int mrc_cache_get_vardata(const struct mrc_saved_data **cache, uint32_t version) -{ - struct mrc_data_region region; - - if (mrc_cache_get_region(VARIABLE_MRC_CACHE, &region) < 0) + /* Init and obtain a handle to the file data. */ + if (region_file_init(cache_file, backing_rdev) < 0) { + printk(BIOS_ERR, "MRC: region file invalid in '%s'\n", name); return -1; + } - return __mrc_cache_get_current(&region, cache, version); -} - -/* Fill in mrc_saved_data structure with payload. */ -static void mrc_cache_fill(struct mrc_saved_data *cache, const void *data, - size_t size, uint32_t version) -{ - cache->signature = MRC_DATA_SIGNATURE; - cache->size = size; - cache->version = version; - memcpy(&cache->data[0], data, size); - cache->checksum = compute_ip_checksum((void *)&cache->data[0], - cache->size); -} - -static int _mrc_stash_data(const void *data, size_t size, uint32_t version, - uint32_t cbmem_id) -{ - int cbmem_size; - struct mrc_saved_data *cache; - - cbmem_size = sizeof(*cache) + ALIGN(size, 16); - - cache = cbmem_add(cbmem_id, cbmem_size); + /* Provide a 0 sized region_device from here on out so the caller + * has a valid yet unusable region_device. */ + rdev_chain(rdev, backing_rdev, 0, 0); - if (cache == NULL) { - printk(BIOS_ERR, "MRC: No space in cbmem for training data.\n"); - return -1; + /* No data to return. */ + if (region_file_data(cache_file, rdev) < 0) { + printk(BIOS_ERR, "MRC: no data in '%s'\n", name); + return fail_bad_data ? -1 : 0; } - /* Clear alignment padding bytes at end of data. */ - memset(&cache->data[size], 0, cbmem_size - size - sizeof(*cache)); - - printk(BIOS_DEBUG, "MRC: Relocate data from %p to %p (%zu bytes)\n", - data, cache, size); + /* Validate header and resize region to reflect actual usage on the + * saved medium (including metadata and data). */ + if (mrc_header_valid(rdev, md) < 0) { + printk(BIOS_ERR, "MRC: invalid header in '%s'\n", name); + return fail_bad_data ? -1 : 0; + } - mrc_cache_fill(cache, data, size, version); + /* Validate Data */ + if (mrc_data_valid(rdev, md) < 0) { + printk(BIOS_ERR, "MRC: invalid data in '%s'\n", name); + return fail_bad_data ? -1 : 0; + } return 0; } -int mrc_cache_stash_data_with_version(const void *data, size_t size, - uint32_t version) +int mrc_cache_get_current(int type, uint32_t version, + struct region_device *rdev) { - return _mrc_stash_data(data, size, version, CBMEM_ID_MRCDATA); -} + const struct cache_region *cr; + struct region region; + struct region_device read_rdev; + struct region_file cache_file; + struct mrc_metadata md; + size_t data_size; + const size_t md_size = sizeof(md); + const bool fail_bad_data = true; + + cr = lookup_region(&region, type); + + if (cr == NULL) + return -1; -int mrc_cache_stash_vardata(const void *data, size_t size, uint32_t version) -{ - return _mrc_stash_data(data, size, version, CBMEM_ID_VAR_MRCDATA); -} + if (boot_device_ro_subregion(&region, &read_rdev) < 0) + return -1; + if (mrc_cache_latest(cr->name, &read_rdev, &md, &cache_file, rdev, + fail_bad_data) < 0) + return -1; -int mrc_cache_stash_data(const void *data, size_t size) -{ - return mrc_cache_stash_data_with_version(data, size, 0); + if (version != md.version) { + printk(BIOS_INFO, "MRC: version mismatch: %x vs %x\n", + md.version, version); + return -1; + } + + /* Re-size rdev to only contain the data. i.e. remove metadata. */ + data_size = region_device_sz(rdev) - md_size; + return rdev_chain(rdev, rdev, md_size, data_size); } -static int mrc_slot_valid(const struct mrc_data_region *region, - const struct mrc_saved_data *slot, - const struct mrc_saved_data *to_save) +static bool mrc_cache_needs_update(const struct region_device *rdev, + const struct cbmem_entry *to_be_updated) { - uintptr_t region_begin; - uintptr_t region_end; - uintptr_t slot_end; - uintptr_t slot_begin; - uint32_t size; - - region_begin = (uintptr_t)region->base; - region_end = region_begin + region->size; - slot_begin = (uintptr_t)slot; - size = to_save->size + sizeof(*to_save); - slot_end = slot_begin + size; - - if (slot_begin < region_begin || slot_begin >= region_end) - return 0; + void *mapping; + size_t size = region_device_sz(rdev); + bool need_update = false; - if (size > region->size) - return 0; - - if (slot_end > region_end || slot_end < region_begin) - return 0; - - if (!nvm_is_erased(slot, size)) - return 0; + if (cbmem_entry_size(to_be_updated) != size) + return true; - return 1; -} + mapping = rdev_mmap_full(rdev); -static const struct mrc_saved_data * -mrc_cache_next_slot(const struct mrc_data_region *region, - const struct mrc_saved_data *current_slot) -{ - const struct mrc_saved_data *next_slot; + if (memcmp(cbmem_entry_start(to_be_updated), mapping, size)) + need_update = true; - if (current_slot == NULL) { - next_slot = region->base; - } else { - next_slot = next_cache_block(current_slot); - } + rdev_munmap(rdev, mapping); - return next_slot; + return need_update; } static void log_event_cache_update(uint8_t slot, enum result res) @@ -363,9 +362,7 @@ static void log_event_cache_update(uint8_t slot, enum result res) /* Filter through interesting events only */ switch (res) { - case WRITE_FAILURE: /* fall-through */ - case ERASE_FAILURE: /* fall-through */ - case OTHER_FAILURE: /* fall-through */ + case UPDATE_FAILURE: event.status = ELOG_MEM_CACHE_UPDATE_STATUS_FAIL; break; case UPDATE_SUCCESS: @@ -379,63 +376,95 @@ static void log_event_cache_update(uint8_t slot, enum result res) printk(BIOS_ERR, "Failed to log mem cache update event.\n"); } -static int update_mrc_cache_type(uint32_t cbmem_id, const char *region_name) +/* During ramstage this code purposefully uses incoherent transactions between + * read and write. The read assumes a memory-mapped boot device that can be used + * to quickly locate and compare the up-to-date data. However, when an update + * is required it uses the writeable region access to perform the update. */ +static void update_mrc_cache_by_type(int type) { - const struct mrc_saved_data *current_boot; - const struct mrc_saved_data *current_saved; - const struct mrc_saved_data *next_slot; - struct mrc_data_region region; - int res; + const struct cache_region *cr; + struct region region; + struct region_device read_rdev; + struct region_device write_rdev; + struct region_file cache_file; + struct mrc_metadata md; + const struct cbmem_entry *to_be_updated; + struct incoherent_rdev backing_irdev; + const struct region_device *backing_rdev; + struct region_device latest_rdev; + const bool fail_bad_data = false; + + cr = lookup_region(&region, type); + + if (cr == NULL) + return; - printk(BIOS_DEBUG, "MRC: Updating cache data.\n"); + to_be_updated = cbmem_entry_find(cr->cbmem_id); + if (to_be_updated == NULL) { + printk(BIOS_ERR, "MRC: No data in cbmem for '%s'.\n", + cr->name); + return; + } - printk(BIOS_ERR, "MRC: Cache region selected - %s\n", region_name); + printk(BIOS_DEBUG, "MRC: Checking cached data update for '%s'.\n", + cr->name); - if (mrc_cache_get_region(region_name, &region)) { - printk(BIOS_ERR, "MRC: Could not obtain cache region.\n"); - return OTHER_FAILURE; - } + if (boot_device_ro_subregion(&region, &read_rdev) < 0) + return; - current_boot = cbmem_find(cbmem_id); - if (!current_boot) { - printk(BIOS_ERR, "MRC: No cache in cbmem.\n"); - return OTHER_FAILURE; - } + if (boot_device_rw_subregion(&region, &write_rdev) < 0) + return; + + backing_rdev = incoherent_rdev_init(&backing_irdev, &region, &read_rdev, + &write_rdev); - if (!mrc_cache_valid(&region, current_boot)) { - printk(BIOS_ERR, "MRC: Cache data in cbmem invalid.\n"); - return OTHER_FAILURE; + if (backing_rdev == NULL) + return; + + if (mrc_cache_latest(cr->name, backing_rdev, &md, &cache_file, + &latest_rdev, fail_bad_data) < 0) + return; + + if (!mrc_cache_needs_update(&latest_rdev, to_be_updated)) { + log_event_cache_update(cr->elog_slot, ALREADY_UPTODATE); + return; } - current_saved = NULL; + printk(BIOS_DEBUG, "MRC: cache data '%s' needs update.\n", cr->name); + + if (region_file_update_data(&cache_file, + cbmem_entry_start(to_be_updated), + cbmem_entry_size(to_be_updated)) < 0) + log_event_cache_update(cr->elog_slot, UPDATE_FAILURE); + else + log_event_cache_update(cr->elog_slot, UPDATE_SUCCESS); +} + +/* Protect mrc region with a Protected Range Register */ +static int protect_mrc_cache(const char *name) +{ + struct region region; + + if (!IS_ENABLED(CONFIG_MRC_SETTINGS_PROTECT)) + return 0; + + if (lookup_region_by_name(name, &region) < 0) { + printk(BIOS_ERR, "MRC: Could not find region '%s'\n", name); + return -1; + } - if (!__mrc_cache_get_current(&region, &current_saved, - current_boot->version)) { - if (current_saved->size == current_boot->size && - !memcmp(&current_saved->data[0], &current_boot->data[0], - current_saved->size)) { - printk(BIOS_DEBUG, "MRC: Cache up to date.\n"); - return ALREADY_UPTODATE; - } + if (nvm_is_write_protected() <= 0) { + printk(BIOS_INFO, "MRC: NOT enabling PRR for '%s'.\n", name); + return 0; } - next_slot = mrc_cache_next_slot(&region, current_saved); - - if (!mrc_slot_valid(&region, next_slot, current_boot)) { - printk(BIOS_DEBUG, "MRC: Slot @ %p is invalid.\n", next_slot); - if (!nvm_is_erased(region.base, region.size)) { - if (nvm_erase(region.base, region.size) < 0) { - printk(BIOS_DEBUG, "MRC: Failure erasing " - "region %s.\n", region_name); - return ERASE_FAILURE; - } - } - next_slot = region.base; + if (nvm_protect(&region) < 0) { + printk(BIOS_ERR, "MRC: ERROR setting PRR for '%s'.\n", name); + return -1; } - res = nvm_write((void *)next_slot, current_boot, current_boot->size - + sizeof(*current_boot)); - return res < 0 ? WRITE_FAILURE : UPDATE_SUCCESS; + printk(BIOS_INFO, "MRC: Enabled Protected Range on '%s'.\n", name); + return 0; } static void protect_mrc_region(void) @@ -459,30 +488,10 @@ static void protect_mrc_region(void) static void update_mrc_cache(void *unused) { - uint8_t slot; - const char *region_name; - enum result res; - - /* First update either recovery or default cache */ - if (vboot_recovery_mode_enabled() && - IS_ENABLED(CONFIG_HAS_RECOVERY_MRC_CACHE)) { - region_name = RECOVERY_MRC_CACHE; - slot = ELOG_MEM_CACHE_UPDATE_SLOT_RECOVERY; - } else { - region_name = DEFAULT_MRC_CACHE; - slot = ELOG_MEM_CACHE_UPDATE_SLOT_NORMAL; - } + update_mrc_cache_by_type(MRC_TRAINING_DATA); - res = update_mrc_cache_type(CBMEM_ID_MRCDATA, region_name); - log_event_cache_update(slot, res); - - /* Next update variable cache if in use */ - if (IS_ENABLED(CONFIG_MRC_SETTINGS_VARIABLE_DATA)) { - res = update_mrc_cache_type(CBMEM_ID_VAR_MRCDATA, - VARIABLE_MRC_CACHE); - log_event_cache_update(ELOG_MEM_CACHE_UPDATE_SLOT_VARIABLE, - res); - } + if (IS_ENABLED(CONFIG_MRC_SETTINGS_VARIABLE_DATA)) + update_mrc_cache_by_type(MRC_VARIABLE_DATA); protect_mrc_region(); } diff --git a/src/soc/intel/common/mrc_cache.h b/src/soc/intel/common/mrc_cache.h index 6414acc..4511fc3 100644 --- a/src/soc/intel/common/mrc_cache.h +++ b/src/soc/intel/common/mrc_cache.h @@ -19,34 +19,25 @@ #include <stddef.h> #include <stdint.h> -#define DEFAULT_MRC_CACHE "RW_MRC_CACHE" -#define VARIABLE_MRC_CACHE "RW_VAR_MRC_CACHE" -#define RECOVERY_MRC_CACHE "RECOVERY_MRC_CACHE" -#define UNIFIED_MRC_CACHE "UNIFIED_MRC_CACHE" +enum { + MRC_TRAINING_DATA, + MRC_VARIABLE_DATA, +}; -/* Wrapper object to save MRC information. */ -struct mrc_saved_data { - uint32_t signature; - uint32_t size; - uint32_t checksum; - uint32_t version; - uint8_t data[0]; -} __attribute__((packed)); - -/* Locate the most recently saved MRC data. */ -int mrc_cache_get_current(const struct mrc_saved_data **cache); -int mrc_cache_get_current_with_version(const struct mrc_saved_data **cache, - uint32_t version); -int mrc_cache_get_vardata(const struct mrc_saved_data **cache, - uint32_t version); -int mrc_cache_get_current_from_region(const struct mrc_saved_data **cache, - uint32_t version, - const char *region_name); +/* + * It's up to the caller to decide when to retrieve and stash data. There is + * differentiation on recovery mode CONFIG_HAS_RECOVERY_MRC_CACHE, but that's + * only for locating where to retrieve and save the data. If a platform doesn't + * want to update the data then it shouldn't stash the data for saving. + * Similarly, if the platform doesn't need the data for booting because of a + * policy don't request the data. + */ -/* Stash the resulting MRC data to be saved in non-volatile storage later. */ -int mrc_cache_stash_data(const void *data, size_t size); -int mrc_cache_stash_data_with_version(const void *data, size_t size, - uint32_t version); -int mrc_cache_stash_vardata(const void *data, size_t size, uint32_t version); +/* Get and stash data for saving provided the type passed in. The functions + * return < 0 on error, 0 on success. */ +int mrc_cache_get_current(int type, uint32_t version, + struct region_device *rdev); +int mrc_cache_stash_data(int type, uint32_t version, const void *data, + size_t size); #endif /* _COMMON_MRC_CACHE_H_ */ diff --git a/src/soc/intel/common/nvm.c b/src/soc/intel/common/nvm.c index 99a1fbf..b7e0f4e 100644 --- a/src/soc/intel/common/nvm.c +++ b/src/soc/intel/common/nvm.c @@ -24,113 +24,43 @@ #include "nvm.h" #include "spi_flash.h" -/* This module assumes the flash is memory mapped just below 4GiB in the - * address space for reading. Also this module assumes an area it erased - * when all bytes read as all 0xff's. */ - -static struct spi_flash *flash; - -static int nvm_init(void) +/* Read flash status register to determine if write protect is active */ +int nvm_is_write_protected(void) { - if (flash != NULL) - return 0; + u8 sr1; + u8 wp_gpio; + u8 wp_spi; - spi_init(); - flash = spi_flash_probe(0, 0); - if (!flash) { - printk(BIOS_DEBUG, "Could not find SPI device\n"); - return -1; - } - - return 0; -} + if (!IS_ENABLED(CONFIG_CHROMEOS)) + return 0; -/* - * Convert memory mapped pointer to flash offset. - * - * This is weak because not every platforms memory-maps the NVM media in the - * same manner. This is a stop-gap solution. - * - * The root of the problem is that users of this API work in memory space for - * both reads and writes, but erase and write must be done in flash space. This - * also only works when the media is memory-mapped, which is no longer - * universally true. The long-term approach should be to rewrite this and its - * users to work in flash space, while using rdev_read() instead of rdev_mmap(). - */ -__attribute__((weak)) -uint32_t nvm_mmio_to_flash_offset(void *p) -{ - return CONFIG_ROM_SIZE + (uintptr_t)p; -} + if (!IS_ENABLED(CONFIG_BOOT_DEVICE_SPI_FLASH)) + return 0; -int nvm_is_erased(const void *start, size_t size) -{ - const uint8_t *cur = start; - const uint8_t erased_value = 0xff; + /* Read Write Protect GPIO if available */ + wp_gpio = get_write_protect_state(); - while (size > 0) { - if (*cur != erased_value) - return 0; - cur++; - size--; + /* Read Status Register 1 */ + if (spi_flash_status(boot_device_spi_flash(), &sr1) < 0) { + printk(BIOS_ERR, "Failed to read SPI status register 1\n"); + return -1; } - return 1; -} + wp_spi = !!(sr1 & 0x80); -int nvm_erase(void *start, size_t size) -{ - if (nvm_init() < 0) - return -1; - return spi_flash_erase(flash, nvm_mmio_to_flash_offset(start), size); -} + printk(BIOS_DEBUG, "SPI flash protection: WPSW=%d SRP0=%d\n", + wp_gpio, wp_spi); -/* Write data to NVM. Returns 0 on success < 0 on error. */ -int nvm_write(void *start, const void *data, size_t size) -{ - if (nvm_init() < 0) - return -1; - return spi_flash_write(flash, nvm_mmio_to_flash_offset(start), size, - data); + return wp_gpio && wp_spi; } -/* Read flash status register to determine if write protect is active */ -int nvm_is_write_protected(void) +/* Apply protection to a range of flash */ +int nvm_protect(const struct region *r) { - if (nvm_init() < 0) - return -1; - - if (IS_ENABLED(CONFIG_CHROMEOS)) { - u8 sr1; - u8 wp_gpio; - u8 wp_spi; - - /* Read Write Protect GPIO if available */ - wp_gpio = get_write_protect_state(); - - /* Read Status Register 1 */ - if (spi_flash_status(flash, &sr1) < 0) { - printk(BIOS_ERR, - "Failed to read SPI status register 1\n"); - return -1; - } - wp_spi = !!(sr1 & 0x80); - - printk(BIOS_DEBUG, "SPI flash protection: WPSW=%d SRP0=%d\n", - wp_gpio, wp_spi); + if (!IS_ENABLED(CONFIG_MRC_SETTINGS_PROTECT)) + return 0; - return wp_gpio && wp_spi; - } - return 0; -} + if (!IS_ENABLED(CONFIG_BOOT_DEVICE_SPI_FLASH)) + return 0; -/* Apply protection to a range of flash */ -int nvm_protect(void *start, size_t size) -{ -#if IS_ENABLED(CONFIG_MRC_SETTINGS_PROTECT) - if (nvm_init() < 0) - return -1; - return spi_flash_protect(nvm_mmio_to_flash_offset(start), size); -#else - return -1; -#endif + return spi_flash_protect(region_offset(r), region_sz(r)); } diff --git a/src/soc/intel/common/nvm.h b/src/soc/intel/common/nvm.h index 074a2ce..1e32ed8 100644 --- a/src/soc/intel/common/nvm.h +++ b/src/soc/intel/common/nvm.h @@ -16,24 +16,12 @@ #ifndef _COMMON_NVM_H_ #define _COMMON_NVM_H_ -#include <stddef.h> - -/* Determine if area is erased. returns 1 if erased. 0 otherwise. */ -int nvm_is_erased(const void *start, size_t size); - -/* Erase region according to start and size. Returns < 0 on error else 0. */ -int nvm_erase(void *start, size_t size); - -/* Write data to NVM. Returns 0 on success < 0 on error. */ -int nvm_write(void *start, const void *data, size_t size); +#include <commonlib/region.h> /* Determine if flash device is write protected */ int nvm_is_write_protected(void); /* Apply protection to a range of flash */ -int nvm_protect(void *start, size_t size); - -/* Map MMIO address to actual address in flash */ -uint32_t nvm_mmio_to_flash_offset(void *p); +int nvm_protect(const struct region *region); #endif /* _COMMON_NVM_H_ */

1 0

Patch set updated for coreboot: src/device: Get device structure by path type
by Subrata Banik 06 Dec '16

06 Dec '16

Subrata Banik (subrata.banik(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17731 -gerrit commit aaaf608e0fb4661c2652f4a0fbd6fff8edd8dce8 Author: Subrata Banik <subrata.banik(a)intel.com> Date: Tue Dec 6 18:06:30 2016 +0530 src/device: Get device structure by path type Add helper function to find a device by path type in the device tree. Change-Id: I8846f63bd2488788ea3c7ab5154e7cf431a252bc Credits-to: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Subrata Banik <subrata.banik(a)intel.com> Signed-off-by: Dhaval V Sharma <dhaval.v.sharma(a)intel.com> --- src/device/device_util.c | 25 +++++++++++++++++++++++++ src/include/device/device.h | 1 + 2 files changed, 26 insertions(+) diff --git a/src/device/device_util.c b/src/device/device_util.c index 56afefd..f60074f 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -131,6 +131,31 @@ device_t dev_find_lapic(unsigned apic_id) } /** + * Given a Device Path Type, find the device structure. + * + * @param prev_match The previously matched device instance. + * @param path_type The Device Path Type. + * @return Pointer to the device structure (if found), 0 otherwise. + */ +device_t dev_find_path(device_t prev_match, enum device_path_type path_type) +{ + device_t dev, result = NULL; + + if (prev_match == NULL) + prev_match = all_devices; + else + prev_match = prev_match->next; + + for (dev = prev_match; dev; dev = dev->next) { + if (dev->path.type == path_type) { + result = dev; + break; + } + } + return result; +} + +/** * Find a device of a given vendor and type. * * @param vendor A PCI vendor ID (e.g. 0x8086 for Intel). diff --git a/src/include/device/device.h b/src/include/device/device.h index 95fabf4..f3de65b 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -195,6 +195,7 @@ device_t find_dev_path(struct bus *parent, struct device_path *path); device_t alloc_find_dev(struct bus *parent, struct device_path *path); device_t dev_find_device (u16 vendor, u16 device, device_t from); device_t dev_find_class (unsigned int class, device_t from); +device_t dev_find_path(device_t prev_match, enum device_path_type path_type); device_t dev_find_slot (unsigned int bus, unsigned int devfn); device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr); device_t dev_find_slot_pnp(u16 port, u16 device);

1 0

Patch set updated for coreboot: src/device: Get device structure by path type
by Subrata Banik 06 Dec '16

06 Dec '16

Subrata Banik (subrata.banik(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17731 -gerrit commit 7961a304930f1dc212dfc56e5a0583aa6a84eb53 Author: Subrata Banik <subrata.banik(a)intel.com> Date: Tue Dec 6 18:06:30 2016 +0530 src/device: Get device structure by path type Add helper function to find a device by path type in the device tree. Change-Id: I8846f63bd2488788ea3c7ab5154e7cf431a252bc Credits-to: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Subrata Banik <subrata.banik(a)intel.com> Signed-off-by: Dhaval V Sharma <dhaval.v.sharma(a)intel.com> --- src/device/device_util.c | 25 +++++++++++++++++++++++++ src/include/device/device.h | 1 + 2 files changed, 26 insertions(+) diff --git a/src/device/device_util.c b/src/device/device_util.c index 56afefd..f2392d3 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -131,6 +131,31 @@ device_t dev_find_lapic(unsigned apic_id) } /** + * Given a Device Path Type, find the device structure. + * + * @param prev_match The starting device instance. + * @param path_type The Device Path Type. + * @return Pointer to the device structure (if found), 0 otherwise. + */ +device_t dev_find_path(device_t prev_match, unsigned int path_type) +{ + device_t dev, result = NULL; + + if (prev_match == NULL) + prev_match = all_devices; + else + prev_match = prev_match->next; + + for (dev = prev_match; dev; dev = dev->next) { + if (dev->path.type == path_type) { + result = dev; + break; + } + } + return result; +} + +/** * Find a device of a given vendor and type. * * @param vendor A PCI vendor ID (e.g. 0x8086 for Intel). diff --git a/src/include/device/device.h b/src/include/device/device.h index 95fabf4..173a3ec 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -195,6 +195,7 @@ device_t find_dev_path(struct bus *parent, struct device_path *path); device_t alloc_find_dev(struct bus *parent, struct device_path *path); device_t dev_find_device (u16 vendor, u16 device, device_t from); device_t dev_find_class (unsigned int class, device_t from); +device_t dev_find_path(device_t prev_match, unsigned int path_type); device_t dev_find_slot (unsigned int bus, unsigned int devfn); device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr); device_t dev_find_slot_pnp(u16 port, u16 device);

1 0

New patch to review for coreboot: cpu/amd/mtrr.h: Drop excessive includes
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17736 -gerrit commit 24d79ab2bec653b15fea66cc2095aca5f69f42d5 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 16:40:39 2016 +0200 cpu/amd/mtrr.h: Drop excessive includes Change-Id: Id404bdab1f2361f1e7d20f7ee72111971863dddf Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/mainboard/advansus/a785e-i/acpi_tables.c | 1 - src/mainboard/amd/bettong/acpi_tables.c | 1 - src/mainboard/amd/bimini_fam10/acpi_tables.c | 1 - src/mainboard/amd/db-ft3b-lc/acpi_tables.c | 1 - src/mainboard/amd/dbm690t/acpi_tables.c | 1 - src/mainboard/amd/dinar/acpi_tables.c | 1 - src/mainboard/amd/inagua/acpi_tables.c | 1 - src/mainboard/amd/lamar/acpi_tables.c | 1 - src/mainboard/amd/mahogany/acpi_tables.c | 1 - src/mainboard/amd/mahogany_fam10/acpi_tables.c | 1 - src/mainboard/amd/olivehill/acpi_tables.c | 1 - src/mainboard/amd/olivehillplus/acpi_tables.c | 1 - src/mainboard/amd/parmer/acpi_tables.c | 1 - src/mainboard/amd/persimmon/acpi_tables.c | 1 - src/mainboard/amd/pistachio/acpi_tables.c | 1 - src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 1 - src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c | 1 - src/mainboard/amd/south_station/acpi_tables.c | 1 - src/mainboard/amd/thatcher/acpi_tables.c | 1 - src/mainboard/amd/tilapia_fam10/acpi_tables.c | 1 - src/mainboard/amd/torpedo/acpi_tables.c | 1 - src/mainboard/amd/union_station/acpi_tables.c | 1 - src/mainboard/asrock/939a785gmh/acpi_tables.c | 1 - src/mainboard/asrock/imb-a180/acpi_tables.c | 1 - src/mainboard/asus/a8n_e/acpi_tables.c | 1 - src/mainboard/asus/kcma-d8/acpi_tables.c | 1 - src/mainboard/asus/kfsn4-dre/acpi_tables.c | 1 - src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c | 1 - src/mainboard/asus/kgpe-d16/acpi_tables.c | 1 - src/mainboard/asus/m4a78-em/acpi_tables.c | 1 - src/mainboard/asus/m4a785-m/acpi_tables.c | 1 - src/mainboard/asus/m5a88-v/acpi_tables.c | 1 - src/mainboard/avalue/eax-785e/acpi_tables.c | 1 - src/mainboard/bap/ode_e20XX/acpi_tables.c | 1 - src/mainboard/bap/ode_e21XX/acpi_tables.c | 1 - src/mainboard/biostar/am1ml/acpi_tables.c | 1 - src/mainboard/elmex/pcm205400/acpi_tables.c | 1 - src/mainboard/gigabyte/ma785gm/acpi_tables.c | 1 - src/mainboard/gigabyte/ma785gmt/acpi_tables.c | 1 - src/mainboard/gigabyte/ma78gm/acpi_tables.c | 1 - src/mainboard/gizmosphere/gizmo/acpi_tables.c | 1 - src/mainboard/gizmosphere/gizmo2/acpi_tables.c | 1 - src/mainboard/hp/abm/acpi_tables.c | 1 - src/mainboard/hp/dl145_g1/acpi_tables.c | 1 - src/mainboard/iei/kino-780am2-fam10/acpi_tables.c | 1 - src/mainboard/iwill/dk8_htx/acpi_tables.c | 1 - src/mainboard/jetway/pa78vm5/acpi_tables.c | 1 - src/mainboard/kontron/kt690/acpi_tables.c | 1 - src/mainboard/lippert/frontrunner-af/acpi_tables.c | 1 - src/mainboard/lippert/toucan-af/acpi_tables.c | 1 - src/mainboard/pcengines/apu1/acpi_tables.c | 1 - src/mainboard/siemens/sitemp_g1p1/acpi_tables.c | 1 - src/mainboard/supermicro/h8qgi/acpi_tables.c | 1 - src/mainboard/supermicro/h8scm/acpi_tables.c | 1 - src/mainboard/supermicro/h8scm_fam10/acpi_tables.c | 1 - src/mainboard/technexion/tim5690/acpi_tables.c | 1 - src/mainboard/technexion/tim8690/acpi_tables.c | 1 - src/mainboard/tyan/s8226/acpi_tables.c | 1 - 58 files changed, 58 deletions(-) diff --git a/src/mainboard/advansus/a785e-i/acpi_tables.c b/src/mainboard/advansus/a785e-i/acpi_tables.c index e8652da..59bbdaa 100644 --- a/src/mainboard/advansus/a785e-i/acpi_tables.c +++ b/src/mainboard/advansus/a785e-i/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c index e72d265..9d2febe 100644 --- a/src/mainboard/amd/bettong/acpi_tables.c +++ b/src/mainboard/amd/bettong/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #define IO_APIC2_ADDR 0xFEC20000 diff --git a/src/mainboard/amd/bimini_fam10/acpi_tables.c b/src/mainboard/amd/bimini_fam10/acpi_tables.c index 4a0a18c..cdefb92 100644 --- a/src/mainboard/amd/bimini_fam10/acpi_tables.c +++ b/src/mainboard/amd/bimini_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c index c4e32a5..b399d04 100644 --- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c +++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c index d9a997d..e199692 100644 --- a/src/mainboard/amd/dbm690t/acpi_tables.c +++ b/src/mainboard/amd/dbm690t/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c index e1ddc42..c205d08 100644 --- a/src/mainboard/amd/dinar/acpi_tables.c +++ b/src/mainboard/amd/dinar/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/amdfam15.h> diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c index 6db210c..eebe8e6 100644 --- a/src/mainboard/amd/inagua/acpi_tables.c +++ b/src/mainboard/amd/inagua/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c index 5047483..aa5f056 100644 --- a/src/mainboard/amd/lamar/acpi_tables.c +++ b/src/mainboard/amd/lamar/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c index 910445a..26e2022 100644 --- a/src/mainboard/amd/mahogany/acpi_tables.c +++ b/src/mainboard/amd/mahogany/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c index d3425e5..f1decd3 100644 --- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c +++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c index 21173ba..a1abe74 100644 --- a/src/mainboard/amd/olivehill/acpi_tables.c +++ b/src/mainboard/amd/olivehill/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c index c4e32a5..b399d04 100644 --- a/src/mainboard/amd/olivehillplus/acpi_tables.c +++ b/src/mainboard/amd/olivehillplus/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c index 1ed363e..a902bad 100644 --- a/src/mainboard/amd/parmer/acpi_tables.c +++ b/src/mainboard/amd/parmer/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c index 1105ee4..b36cef0 100644 --- a/src/mainboard/amd/persimmon/acpi_tables.c +++ b/src/mainboard/amd/persimmon/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c index dd9bb22..75834b6 100644 --- a/src/mainboard/amd/pistachio/acpi_tables.c +++ b/src/mainboard/amd/pistachio/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c index 29d0953..41e12eb 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c @@ -27,7 +27,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include <cbfs.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c index 3eb4c79..6911c36 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <cbfs.h> diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c index 6db210c..eebe8e6 100644 --- a/src/mainboard/amd/south_station/acpi_tables.c +++ b/src/mainboard/amd/south_station/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c index 1ed363e..a902bad 100644 --- a/src/mainboard/amd/thatcher/acpi_tables.c +++ b/src/mainboard/amd/thatcher/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/amd/tilapia_fam10/acpi_tables.c b/src/mainboard/amd/tilapia_fam10/acpi_tables.c index 8dd7562..080e4e3 100644 --- a/src/mainboard/amd/tilapia_fam10/acpi_tables.c +++ b/src/mainboard/amd/tilapia_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c index d23937b..a0b3933 100644 --- a/src/mainboard/amd/torpedo/acpi_tables.c +++ b/src/mainboard/amd/torpedo/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam12.h> extern u32 apicid_sb900; diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c index 6db210c..eebe8e6 100644 --- a/src/mainboard/amd/union_station/acpi_tables.c +++ b/src/mainboard/amd/union_station/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/asrock/939a785gmh/acpi_tables.c b/src/mainboard/asrock/939a785gmh/acpi_tables.c index 3401dcc..6026a68 100644 --- a/src/mainboard/asrock/939a785gmh/acpi_tables.c +++ b/src/mainboard/asrock/939a785gmh/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c index 21173ba..a1abe74 100644 --- a/src/mainboard/asrock/imb-a180/acpi_tables.c +++ b/src/mainboard/asrock/imb-a180/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/asus/a8n_e/acpi_tables.c b/src/mainboard/asus/a8n_e/acpi_tables.c index 696ddfd..8071459 100644 --- a/src/mainboard/asus/a8n_e/acpi_tables.c +++ b/src/mainboard/asus/a8n_e/acpi_tables.c @@ -15,7 +15,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "../../../northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/asus/kcma-d8/acpi_tables.c b/src/mainboard/asus/kcma-d8/acpi_tables.c index 4198559..436e156 100644 --- a/src/mainboard/asus/kcma-d8/acpi_tables.c +++ b/src/mainboard/asus/kcma-d8/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c index 1c55c76..a19dc9a 100644 --- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c +++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c @@ -17,7 +17,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> /* APIC */ diff --git a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c index f1f7770..6acb94c 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c +++ b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c @@ -17,7 +17,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> /* APIC */ diff --git a/src/mainboard/asus/kgpe-d16/acpi_tables.c b/src/mainboard/asus/kgpe-d16/acpi_tables.c index 4198559..436e156 100644 --- a/src/mainboard/asus/kgpe-d16/acpi_tables.c +++ b/src/mainboard/asus/kgpe-d16/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/asus/m4a78-em/acpi_tables.c b/src/mainboard/asus/m4a78-em/acpi_tables.c index 1d935ea..851ce9a 100644 --- a/src/mainboard/asus/m4a78-em/acpi_tables.c +++ b/src/mainboard/asus/m4a78-em/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c index 7bd4a66..48c70d1 100644 --- a/src/mainboard/asus/m4a785-m/acpi_tables.c +++ b/src/mainboard/asus/m4a785-m/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/asus/m5a88-v/acpi_tables.c b/src/mainboard/asus/m5a88-v/acpi_tables.c index e8652da..59bbdaa 100644 --- a/src/mainboard/asus/m5a88-v/acpi_tables.c +++ b/src/mainboard/asus/m5a88-v/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/avalue/eax-785e/acpi_tables.c b/src/mainboard/avalue/eax-785e/acpi_tables.c index e8652da..59bbdaa 100644 --- a/src/mainboard/avalue/eax-785e/acpi_tables.c +++ b/src/mainboard/avalue/eax-785e/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c index 21173ba..a1abe74 100644 --- a/src/mainboard/bap/ode_e20XX/acpi_tables.c +++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c index c4e32a5..b399d04 100644 --- a/src/mainboard/bap/ode_e21XX/acpi_tables.c +++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c index 4f496697..1818e08 100644 --- a/src/mainboard/biostar/am1ml/acpi_tables.c +++ b/src/mainboard/biostar/am1ml/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c index 1105ee4..b36cef0 100644 --- a/src/mainboard/elmex/pcm205400/acpi_tables.c +++ b/src/mainboard/elmex/pcm205400/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/gigabyte/ma785gm/acpi_tables.c b/src/mainboard/gigabyte/ma785gm/acpi_tables.c index 8dd7562..080e4e3 100644 --- a/src/mainboard/gigabyte/ma785gm/acpi_tables.c +++ b/src/mainboard/gigabyte/ma785gm/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c index ad63b01..e2edff3 100644 --- a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c +++ b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/gigabyte/ma78gm/acpi_tables.c b/src/mainboard/gigabyte/ma78gm/acpi_tables.c index ad63b01..e2edff3 100644 --- a/src/mainboard/gigabyte/ma78gm/acpi_tables.c +++ b/src/mainboard/gigabyte/ma78gm/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c index fe22f4d..49f4e1f 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c +++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c @@ -22,7 +22,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c index 21173ba..a1abe74 100644 --- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c +++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c index 21173ba..a1abe74 100644 --- a/src/mainboard/hp/abm/acpi_tables.c +++ b/src/mainboard/hp/abm/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/hp/dl145_g1/acpi_tables.c b/src/mainboard/hp/dl145_g1/acpi_tables.c index 304b425..1b4ada1 100644 --- a/src/mainboard/hp/dl145_g1/acpi_tables.c +++ b/src/mainboard/hp/dl145_g1/acpi_tables.c @@ -16,7 +16,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include "mb_sysconf.h" diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c index d3425e5..f1decd3 100644 --- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c +++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c index da96d2c..e9818b3 100644 --- a/src/mainboard/iwill/dk8_htx/acpi_tables.c +++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c @@ -14,7 +14,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include "mb_sysconf.h" diff --git a/src/mainboard/jetway/pa78vm5/acpi_tables.c b/src/mainboard/jetway/pa78vm5/acpi_tables.c index ff72a1b..ce29c90 100644 --- a/src/mainboard/jetway/pa78vm5/acpi_tables.c +++ b/src/mainboard/jetway/pa78vm5/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c index dd9bb22..75834b6 100644 --- a/src/mainboard/kontron/kt690/acpi_tables.c +++ b/src/mainboard/kontron/kt690/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c index 6db210c..eebe8e6 100644 --- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c +++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c index 6db210c..eebe8e6 100644 --- a/src/mainboard/lippert/toucan-af/acpi_tables.c +++ b/src/mainboard/lippert/toucan-af/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c index 1105ee4..b36cef0 100644 --- a/src/mainboard/pcengines/apu1/acpi_tables.c +++ b/src/mainboard/pcengines/apu1/acpi_tables.c @@ -21,7 +21,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <northbridge/amd/agesa/agesawrapper.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c index a2db39b..0582566 100644 --- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c +++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include <../../../northbridge/amd/amdk8/acpi.h> #include <arch/cpu.h> diff --git a/src/mainboard/supermicro/h8qgi/acpi_tables.c b/src/mainboard/supermicro/h8qgi/acpi_tables.c index cae1b60..8166d47 100644 --- a/src/mainboard/supermicro/h8qgi/acpi_tables.c +++ b/src/mainboard/supermicro/h8qgi/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/supermicro/h8scm/acpi_tables.c b/src/mainboard/supermicro/h8scm/acpi_tables.c index cae1b60..8166d47 100644 --- a/src/mainboard/supermicro/h8scm/acpi_tables.c +++ b/src/mainboard/supermicro/h8scm/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c index a3b0382..8560292 100644 --- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c +++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c index dd9bb22..75834b6 100644 --- a/src/mainboard/technexion/tim5690/acpi_tables.c +++ b/src/mainboard/technexion/tim5690/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c index dd9bb22..75834b6 100644 --- a/src/mainboard/technexion/tim8690/acpi_tables.c +++ b/src/mainboard/technexion/tim8690/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> diff --git a/src/mainboard/tyan/s8226/acpi_tables.c b/src/mainboard/tyan/s8226/acpi_tables.c index cae1b60..8166d47 100644 --- a/src/mainboard/tyan/s8226/acpi_tables.c +++ b/src/mainboard/tyan/s8226/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <northbridge/amd/agesa/agesawrapper.h>

1 0

New patch to review for coreboot: cpu/x86/msr.h: Drop excessive includes
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17735 -gerrit commit 58b30990b910d7e45fd78934d6893e7370fe1a93 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 14:14:19 2016 +0200 cpu/x86/msr.h: Drop excessive includes Change-Id: Ic22beaa47476d8c600e4081fc5ad7bc171e0f903 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/mainboard/adi/rcc-dff/acpi_tables.c | 1 - src/mainboard/advansus/a785e-i/acpi_tables.c | 1 - src/mainboard/amd/bettong/acpi_tables.c | 1 - src/mainboard/amd/bimini_fam10/acpi_tables.c | 1 - src/mainboard/amd/db-ft3b-lc/acpi_tables.c | 1 - src/mainboard/amd/dbm690t/acpi_tables.c | 1 - src/mainboard/amd/dinar/acpi_tables.c | 1 - src/mainboard/amd/inagua/acpi_tables.c | 1 - src/mainboard/amd/lamar/acpi_tables.c | 1 - src/mainboard/amd/mahogany/acpi_tables.c | 1 - src/mainboard/amd/mahogany_fam10/acpi_tables.c | 1 - src/mainboard/amd/olivehill/acpi_tables.c | 1 - src/mainboard/amd/olivehillplus/acpi_tables.c | 1 - src/mainboard/amd/parmer/acpi_tables.c | 1 - src/mainboard/amd/persimmon/acpi_tables.c | 1 - src/mainboard/amd/pistachio/acpi_tables.c | 1 - src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 1 - src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c | 1 - src/mainboard/amd/south_station/acpi_tables.c | 1 - src/mainboard/amd/thatcher/acpi_tables.c | 1 - src/mainboard/amd/tilapia_fam10/acpi_tables.c | 1 - src/mainboard/amd/torpedo/acpi_tables.c | 1 - src/mainboard/amd/union_station/acpi_tables.c | 1 - src/mainboard/asrock/939a785gmh/acpi_tables.c | 1 - src/mainboard/asrock/imb-a180/acpi_tables.c | 1 - src/mainboard/asus/a8n_e/acpi_tables.c | 1 - src/mainboard/asus/kcma-d8/acpi_tables.c | 1 - src/mainboard/asus/kfsn4-dre/acpi_tables.c | 1 - src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c | 1 - src/mainboard/asus/kgpe-d16/acpi_tables.c | 1 - src/mainboard/asus/m4a78-em/acpi_tables.c | 1 - src/mainboard/asus/m4a785-m/acpi_tables.c | 1 - src/mainboard/asus/m5a88-v/acpi_tables.c | 1 - src/mainboard/avalue/eax-785e/acpi_tables.c | 1 - src/mainboard/bap/ode_e20XX/acpi_tables.c | 1 - src/mainboard/bap/ode_e21XX/acpi_tables.c | 1 - src/mainboard/biostar/am1ml/acpi_tables.c | 1 - src/mainboard/elmex/pcm205400/acpi_tables.c | 1 - src/mainboard/emulation/qemu-i440fx/acpi_tables.c | 1 - src/mainboard/emulation/qemu-q35/acpi_tables.c | 1 - src/mainboard/esd/atom15/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c | 1 - src/mainboard/gigabyte/ma785gm/acpi_tables.c | 1 - src/mainboard/gigabyte/ma785gmt/acpi_tables.c | 1 - src/mainboard/gigabyte/ma78gm/acpi_tables.c | 1 - src/mainboard/gizmosphere/gizmo/acpi_tables.c | 1 - src/mainboard/gizmosphere/gizmo2/acpi_tables.c | 1 - src/mainboard/google/beltino/acpi_tables.c | 1 - src/mainboard/google/butterfly/acpi_tables.c | 1 - src/mainboard/google/cyan/acpi_tables.c | 1 - src/mainboard/google/enguarde/acpi_tables.c | 1 - src/mainboard/google/link/acpi_tables.c | 1 - src/mainboard/google/ninja/acpi_tables.c | 1 - src/mainboard/google/parrot/acpi_tables.c | 1 - src/mainboard/google/rambi/acpi_tables.c | 1 - src/mainboard/google/slippy/acpi_tables.c | 1 - src/mainboard/google/stout/acpi_tables.c | 1 - src/mainboard/hp/abm/acpi_tables.c | 1 - src/mainboard/hp/dl145_g1/acpi_tables.c | 1 - src/mainboard/ibase/mb899/acpi_tables.c | 1 - src/mainboard/iei/kino-780am2-fam10/acpi_tables.c | 1 - src/mainboard/intel/baskingridge/acpi_tables.c | 1 - src/mainboard/intel/bayleybay_fsp/acpi_tables.c | 1 - src/mainboard/intel/cougar_canyon2/acpi_tables.c | 1 - src/mainboard/intel/d945gclf/acpi_tables.c | 1 - src/mainboard/intel/emeraldlake2/acpi_tables.c | 1 - src/mainboard/intel/littleplains/acpi_tables.c | 1 - src/mainboard/intel/minnowmax/acpi_tables.c | 1 - src/mainboard/intel/mohonpeak/acpi_tables.c | 1 - src/mainboard/intel/stargo2/acpi_tables.c | 1 - src/mainboard/intel/strago/acpi_tables.c | 1 - src/mainboard/iwave/iWRainbowG6/acpi_tables.c | 1 - src/mainboard/iwill/dk8_htx/acpi_tables.c | 1 - src/mainboard/jetway/pa78vm5/acpi_tables.c | 1 - src/mainboard/kontron/986lcd-m/acpi_tables.c | 1 - src/mainboard/kontron/kt690/acpi_tables.c | 1 - src/mainboard/kontron/ktqm77/acpi_tables.c | 1 - src/mainboard/lenovo/t420s/acpi_tables.c | 1 - src/mainboard/lenovo/t520/acpi_tables.c | 1 - src/mainboard/lenovo/t530/acpi_tables.c | 1 - src/mainboard/lenovo/x220/acpi_tables.c | 1 - src/mainboard/lenovo/x230/acpi_tables.c | 1 - src/mainboard/lippert/frontrunner-af/acpi_tables.c | 1 - src/mainboard/lippert/toucan-af/acpi_tables.c | 1 - src/mainboard/pcengines/apu1/acpi_tables.c | 1 - src/mainboard/samsung/lumpy/acpi_tables.c | 1 - src/mainboard/samsung/stumpy/acpi_tables.c | 1 - src/mainboard/siemens/mc_tcu3/acpi_tables.c | 1 - src/mainboard/siemens/sitemp_g1p1/acpi_tables.c | 1 - src/mainboard/supermicro/h8qgi/acpi_tables.c | 1 - src/mainboard/supermicro/h8scm/acpi_tables.c | 1 - src/mainboard/supermicro/h8scm_fam10/acpi_tables.c | 1 - src/mainboard/technexion/tim5690/acpi_tables.c | 1 - src/mainboard/technexion/tim8690/acpi_tables.c | 1 - src/mainboard/tyan/s8226/acpi_tables.c | 1 - 98 files changed, 98 deletions(-) diff --git a/src/mainboard/adi/rcc-dff/acpi_tables.c b/src/mainboard/adi/rcc-dff/acpi_tables.c index ce62bff..0f99d9b 100644 --- a/src/mainboard/adi/rcc-dff/acpi_tables.c +++ b/src/mainboard/adi/rcc-dff/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/fsp_rangeley/nvs.h> #include <northbridge/intel/fsp_rangeley/northbridge.h> diff --git a/src/mainboard/advansus/a785e-i/acpi_tables.c b/src/mainboard/advansus/a785e-i/acpi_tables.c index a36553b..e8652da 100644 --- a/src/mainboard/advansus/a785e-i/acpi_tables.c +++ b/src/mainboard/advansus/a785e-i/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c index b09b773..e72d265 100644 --- a/src/mainboard/amd/bettong/acpi_tables.c +++ b/src/mainboard/amd/bettong/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/amd/bimini_fam10/acpi_tables.c b/src/mainboard/amd/bimini_fam10/acpi_tables.c index d4963ac..4a0a18c 100644 --- a/src/mainboard/amd/bimini_fam10/acpi_tables.c +++ b/src/mainboard/amd/bimini_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c index d5ebad4..c4e32a5 100644 --- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c +++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c index e593019..d9a997d 100644 --- a/src/mainboard/amd/dbm690t/acpi_tables.c +++ b/src/mainboard/amd/dbm690t/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c index 1d1717b..e1ddc42 100644 --- a/src/mainboard/amd/dinar/acpi_tables.c +++ b/src/mainboard/amd/dinar/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c index 55bd91e..6db210c 100644 --- a/src/mainboard/amd/inagua/acpi_tables.c +++ b/src/mainboard/amd/inagua/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c index 3e73228..5047483 100644 --- a/src/mainboard/amd/lamar/acpi_tables.c +++ b/src/mainboard/amd/lamar/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h> diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c index 8a2a4ed..910445a 100644 --- a/src/mainboard/amd/mahogany/acpi_tables.c +++ b/src/mainboard/amd/mahogany/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c index 597ce5f..d3425e5 100644 --- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c +++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c index df0b560..21173ba 100644 --- a/src/mainboard/amd/olivehill/acpi_tables.c +++ b/src/mainboard/amd/olivehill/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c index d5ebad4..c4e32a5 100644 --- a/src/mainboard/amd/olivehillplus/acpi_tables.c +++ b/src/mainboard/amd/olivehillplus/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c index f01de73..1ed363e 100644 --- a/src/mainboard/amd/parmer/acpi_tables.c +++ b/src/mainboard/amd/parmer/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h> diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c index 9b92c05..1105ee4 100644 --- a/src/mainboard/amd/persimmon/acpi_tables.c +++ b/src/mainboard/amd/persimmon/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c index fc0a2eb..dd9bb22 100644 --- a/src/mainboard/amd/pistachio/acpi_tables.c +++ b/src/mainboard/amd/pistachio/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c index 282222d..29d0953 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c @@ -27,7 +27,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include <cbfs.h> diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c index 399c086..3eb4c79 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <cbfs.h> diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c index 55bd91e..6db210c 100644 --- a/src/mainboard/amd/south_station/acpi_tables.c +++ b/src/mainboard/amd/south_station/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c index f01de73..1ed363e 100644 --- a/src/mainboard/amd/thatcher/acpi_tables.c +++ b/src/mainboard/amd/thatcher/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam15.h> diff --git a/src/mainboard/amd/tilapia_fam10/acpi_tables.c b/src/mainboard/amd/tilapia_fam10/acpi_tables.c index 1e2f200..8dd7562 100644 --- a/src/mainboard/amd/tilapia_fam10/acpi_tables.c +++ b/src/mainboard/amd/tilapia_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c index fef9156..d23937b 100644 --- a/src/mainboard/amd/torpedo/acpi_tables.c +++ b/src/mainboard/amd/torpedo/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam12.h> diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c index 55bd91e..6db210c 100644 --- a/src/mainboard/amd/union_station/acpi_tables.c +++ b/src/mainboard/amd/union_station/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/asrock/939a785gmh/acpi_tables.c b/src/mainboard/asrock/939a785gmh/acpi_tables.c index b47c479..3401dcc 100644 --- a/src/mainboard/asrock/939a785gmh/acpi_tables.c +++ b/src/mainboard/asrock/939a785gmh/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c index df0b560..21173ba 100644 --- a/src/mainboard/asrock/imb-a180/acpi_tables.c +++ b/src/mainboard/asrock/imb-a180/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/asus/a8n_e/acpi_tables.c b/src/mainboard/asus/a8n_e/acpi_tables.c index f5ddec3..696ddfd 100644 --- a/src/mainboard/asus/a8n_e/acpi_tables.c +++ b/src/mainboard/asus/a8n_e/acpi_tables.c @@ -15,7 +15,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "../../../northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/asus/kcma-d8/acpi_tables.c b/src/mainboard/asus/kcma-d8/acpi_tables.c index 8af85f9..4198559 100644 --- a/src/mainboard/asus/kcma-d8/acpi_tables.c +++ b/src/mainboard/asus/kcma-d8/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c index caffdc4..1c55c76 100644 --- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c +++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c @@ -17,7 +17,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c index c6d2981..f1f7770 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c +++ b/src/mainboard/asus/kfsn4-dre_k8/acpi_tables.c @@ -17,7 +17,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/asus/kgpe-d16/acpi_tables.c b/src/mainboard/asus/kgpe-d16/acpi_tables.c index 8af85f9..4198559 100644 --- a/src/mainboard/asus/kgpe-d16/acpi_tables.c +++ b/src/mainboard/asus/kgpe-d16/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/asus/m4a78-em/acpi_tables.c b/src/mainboard/asus/m4a78-em/acpi_tables.c index 9d2350d..1d935ea 100644 --- a/src/mainboard/asus/m4a78-em/acpi_tables.c +++ b/src/mainboard/asus/m4a78-em/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c index ba70729..7bd4a66 100644 --- a/src/mainboard/asus/m4a785-m/acpi_tables.c +++ b/src/mainboard/asus/m4a785-m/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/asus/m5a88-v/acpi_tables.c b/src/mainboard/asus/m5a88-v/acpi_tables.c index a36553b..e8652da 100644 --- a/src/mainboard/asus/m5a88-v/acpi_tables.c +++ b/src/mainboard/asus/m5a88-v/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/avalue/eax-785e/acpi_tables.c b/src/mainboard/avalue/eax-785e/acpi_tables.c index a36553b..e8652da 100644 --- a/src/mainboard/avalue/eax-785e/acpi_tables.c +++ b/src/mainboard/avalue/eax-785e/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c index df0b560..21173ba 100644 --- a/src/mainboard/bap/ode_e20XX/acpi_tables.c +++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c index d5ebad4..c4e32a5 100644 --- a/src/mainboard/bap/ode_e21XX/acpi_tables.c +++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c index 63728e4..4f496697 100644 --- a/src/mainboard/biostar/am1ml/acpi_tables.c +++ b/src/mainboard/biostar/am1ml/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c index 9b92c05..1105ee4 100644 --- a/src/mainboard/elmex/pcm205400/acpi_tables.c +++ b/src/mainboard/elmex/pcm205400/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c index ee29a5f..1d372a3 100644 --- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c +++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include "fw_cfg.h" #include "acpi.h" diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c index 1b32c02..209ee02 100644 --- a/src/mainboard/emulation/qemu-q35/acpi_tables.c +++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include "../qemu-i440fx/fw_cfg.h" #include "../qemu-i440fx/acpi.h" diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c index 4e7fc0d..6b97660 100644 --- a/src/mainboard/esd/atom15/acpi_tables.c +++ b/src/mainboard/esd/atom15/acpi_tables.c @@ -26,7 +26,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c b/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c index 677ebcf..936ef26 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c @@ -22,7 +22,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <arch/ioapic.h> #include "southbridge/intel/i82801gx/nvs.h" diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c index 3f203ca..05a21ae 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c index 3f203ca..05a21ae 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c index d9d8032..b0ee271 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <arch/ioapic.h> #include "southbridge/intel/i82801gx/nvs.h" diff --git a/src/mainboard/gigabyte/ma785gm/acpi_tables.c b/src/mainboard/gigabyte/ma785gm/acpi_tables.c index 1e2f200..8dd7562 100644 --- a/src/mainboard/gigabyte/ma785gm/acpi_tables.c +++ b/src/mainboard/gigabyte/ma785gm/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c index 48458c7..ad63b01 100644 --- a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c +++ b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/gigabyte/ma78gm/acpi_tables.c b/src/mainboard/gigabyte/ma78gm/acpi_tables.c index 48458c7..ad63b01 100644 --- a/src/mainboard/gigabyte/ma78gm/acpi_tables.c +++ b/src/mainboard/gigabyte/ma78gm/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c index 3862279..fe22f4d 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c +++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c index df0b560..21173ba 100644 --- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c +++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c index 0f2b0a0..6eaa5e2 100644 --- a/src/mainboard/google/beltino/acpi_tables.c +++ b/src/mainboard/google/beltino/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <console/console.h> -#include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c index cdaa474..e132232 100644 --- a/src/mainboard/google/butterfly/acpi_tables.c +++ b/src/mainboard/google/butterfly/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/quanta/ene_kb3940q/ec.h> diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c index d2a78f9..d4271e5 100644 --- a/src/mainboard/google/cyan/acpi_tables.c +++ b/src/mainboard/google/cyan/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> -#include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/mainboard/google/enguarde/acpi_tables.c b/src/mainboard/google/enguarde/acpi_tables.c index 2c83327..e2add77 100644 --- a/src/mainboard/google/enguarde/acpi_tables.c +++ b/src/mainboard/google/enguarde/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/google/link/acpi_tables.c b/src/mainboard/google/link/acpi_tables.c index b0ecee1..13c358b 100644 --- a/src/mainboard/google/link/acpi_tables.c +++ b/src/mainboard/google/link/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/ninja/acpi_tables.c b/src/mainboard/google/ninja/acpi_tables.c index c1c4c81..9abdbf5 100644 --- a/src/mainboard/google/ninja/acpi_tables.c +++ b/src/mainboard/google/ninja/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c index f5b6146..81008a5 100644 --- a/src/mainboard/google/parrot/acpi_tables.c +++ b/src/mainboard/google/parrot/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/compal/ene932/ec.h> #include "ec.h" diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c index c1c4c81..9abdbf5 100644 --- a/src/mainboard/google/rambi/acpi_tables.c +++ b/src/mainboard/google/rambi/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c index 1e25057..bf16858 100644 --- a/src/mainboard/google/slippy/acpi_tables.c +++ b/src/mainboard/google/slippy/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c index 580f130..7019c81 100644 --- a/src/mainboard/google/stout/acpi_tables.c +++ b/src/mainboard/google/stout/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <bootmode.h> #include <ec/quanta/it8518/ec.h> diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c index df0b560..21173ba 100644 --- a/src/mainboard/hp/abm/acpi_tables.c +++ b/src/mainboard/hp/abm/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam16.h> diff --git a/src/mainboard/hp/dl145_g1/acpi_tables.c b/src/mainboard/hp/dl145_g1/acpi_tables.c index 47e0a3a..304b425 100644 --- a/src/mainboard/hp/dl145_g1/acpi_tables.c +++ b/src/mainboard/hp/dl145_g1/acpi_tables.c @@ -16,7 +16,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c index 98c8d22..9d9dde1 100644 --- a/src/mainboard/ibase/mb899/acpi_tables.c +++ b/src/mainboard/ibase/mb899/acpi_tables.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c index 597ce5f..d3425e5 100644 --- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c +++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c index e8251dc..a532ab0 100644 --- a/src/mainboard/intel/baskingridge/acpi_tables.c +++ b/src/mainboard/intel/baskingridge/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <southbridge/intel/lynxpoint/pch.h> diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c index cbb3e09..df7338b 100644 --- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c +++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/intel/cougar_canyon2/acpi_tables.c b/src/mainboard/intel/cougar_canyon2/acpi_tables.c index 1283b7e..3de6d3e 100644 --- a/src/mainboard/intel/cougar_canyon2/acpi_tables.c +++ b/src/mainboard/intel/cougar_canyon2/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include "southbridge/intel/fsp_bd82x6x/nvs.h" #include "thermal.h" diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c index 677ebcf..936ef26 100644 --- a/src/mainboard/intel/d945gclf/acpi_tables.c +++ b/src/mainboard/intel/d945gclf/acpi_tables.c @@ -22,7 +22,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <arch/ioapic.h> #include "southbridge/intel/i82801gx/nvs.h" diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c index 03404e4..3ef993a 100644 --- a/src/mainboard/intel/emeraldlake2/acpi_tables.c +++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include "southbridge/intel/bd82x6x/nvs.h" diff --git a/src/mainboard/intel/littleplains/acpi_tables.c b/src/mainboard/intel/littleplains/acpi_tables.c index ce62bff..0f99d9b 100644 --- a/src/mainboard/intel/littleplains/acpi_tables.c +++ b/src/mainboard/intel/littleplains/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/fsp_rangeley/nvs.h> #include <northbridge/intel/fsp_rangeley/northbridge.h> diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c index 4e7fc0d..6b97660 100644 --- a/src/mainboard/intel/minnowmax/acpi_tables.c +++ b/src/mainboard/intel/minnowmax/acpi_tables.c @@ -26,7 +26,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/intel/mohonpeak/acpi_tables.c b/src/mainboard/intel/mohonpeak/acpi_tables.c index ce62bff..0f99d9b 100644 --- a/src/mainboard/intel/mohonpeak/acpi_tables.c +++ b/src/mainboard/intel/mohonpeak/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/fsp_rangeley/nvs.h> #include <northbridge/intel/fsp_rangeley/northbridge.h> diff --git a/src/mainboard/intel/stargo2/acpi_tables.c b/src/mainboard/intel/stargo2/acpi_tables.c index 1284e39..c2c729b 100644 --- a/src/mainboard/intel/stargo2/acpi_tables.c +++ b/src/mainboard/intel/stargo2/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/fsp_i89xx/pch.h> #include <southbridge/intel/fsp_i89xx/nvs.h> diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c index 33eba3c..c6c9b52 100644 --- a/src/mainboard/intel/strago/acpi_tables.c +++ b/src/mainboard/intel/strago/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> -#include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/mainboard/iwave/iWRainbowG6/acpi_tables.c b/src/mainboard/iwave/iWRainbowG6/acpi_tables.c index a175e69..45b9da2 100644 --- a/src/mainboard/iwave/iWRainbowG6/acpi_tables.c +++ b/src/mainboard/iwave/iWRainbowG6/acpi_tables.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include "soc/intel/sch/nvs.h" diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c index b9e8468..da96d2c 100644 --- a/src/mainboard/iwill/dk8_htx/acpi_tables.c +++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c @@ -14,7 +14,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/jetway/pa78vm5/acpi_tables.c b/src/mainboard/jetway/pa78vm5/acpi_tables.c index ec3cc20..ff72a1b 100644 --- a/src/mainboard/jetway/pa78vm5/acpi_tables.c +++ b/src/mainboard/jetway/pa78vm5/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c index 98c8d22..9d9dde1 100644 --- a/src/mainboard/kontron/986lcd-m/acpi_tables.c +++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c @@ -23,7 +23,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c index fc0a2eb..dd9bb22 100644 --- a/src/mainboard/kontron/kt690/acpi_tables.c +++ b/src/mainboard/kontron/kt690/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c index c4bd87c..312557c 100644 --- a/src/mainboard/kontron/ktqm77/acpi_tables.c +++ b/src/mainboard/kontron/ktqm77/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/lenovo/t420s/acpi_tables.c b/src/mainboard/lenovo/t420s/acpi_tables.c index 1b1556a..1a6cb83 100644 --- a/src/mainboard/lenovo/t420s/acpi_tables.c +++ b/src/mainboard/lenovo/t420s/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c index b435baf..b1c4733 100644 --- a/src/mainboard/lenovo/t520/acpi_tables.c +++ b/src/mainboard/lenovo/t520/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c index b435baf..b1c4733 100644 --- a/src/mainboard/lenovo/t530/acpi_tables.c +++ b/src/mainboard/lenovo/t530/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/lenovo/x220/acpi_tables.c b/src/mainboard/lenovo/x220/acpi_tables.c index 095f6f7..c9e9407 100644 --- a/src/mainboard/lenovo/x220/acpi_tables.c +++ b/src/mainboard/lenovo/x220/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c index 095f6f7..c9e9407 100644 --- a/src/mainboard/lenovo/x230/acpi_tables.c +++ b/src/mainboard/lenovo/x230/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> #include <southbridge/intel/bd82x6x/nvs.h> diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c index 55bd91e..6db210c 100644 --- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c +++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c index 55bd91e..6db210c 100644 --- a/src/mainboard/lippert/toucan-af/acpi_tables.c +++ b/src/mainboard/lippert/toucan-af/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c index 9b92c05..1105ee4 100644 --- a/src/mainboard/pcengines/apu1/acpi_tables.c +++ b/src/mainboard/pcengines/apu1/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <northbridge/amd/agesa/agesawrapper.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam14.h> diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c index 3d89188..828546c 100644 --- a/src/mainboard/samsung/lumpy/acpi_tables.c +++ b/src/mainboard/samsung/lumpy/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <ec/acpi/ec.h> #if CONFIG_CHROMEOS #include <vendorcode/google/chromeos/gnvs.h> diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c index ae2f6fe..c5ecbea 100644 --- a/src/mainboard/samsung/stumpy/acpi_tables.c +++ b/src/mainboard/samsung/stumpy/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include "southbridge/intel/bd82x6x/nvs.h" diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c index cbb3e09..df7338b 100644 --- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c +++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> #include <soc/iomap.h> diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c index ad6687e..a2db39b 100644 --- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c +++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c @@ -22,7 +22,6 @@ #include <arch/smp/mpspec.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include <../../../northbridge/amd/amdk8/acpi.h> diff --git a/src/mainboard/supermicro/h8qgi/acpi_tables.c b/src/mainboard/supermicro/h8qgi/acpi_tables.c index 7fd5eaf..cae1b60 100644 --- a/src/mainboard/supermicro/h8qgi/acpi_tables.c +++ b/src/mainboard/supermicro/h8qgi/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/supermicro/h8scm/acpi_tables.c b/src/mainboard/supermicro/h8scm/acpi_tables.c index 7fd5eaf..cae1b60 100644 --- a/src/mainboard/supermicro/h8scm/acpi_tables.c +++ b/src/mainboard/supermicro/h8scm/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <northbridge/amd/agesa/agesawrapper.h> diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c index b50410a..a3b0382 100644 --- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c +++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c index fc0a2eb..dd9bb22 100644 --- a/src/mainboard/technexion/tim5690/acpi_tables.c +++ b/src/mainboard/technexion/tim5690/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c index fc0a2eb..dd9bb22 100644 --- a/src/mainboard/technexion/tim8690/acpi_tables.c +++ b/src/mainboard/technexion/tim8690/acpi_tables.c @@ -19,7 +19,6 @@ #include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" diff --git a/src/mainboard/tyan/s8226/acpi_tables.c b/src/mainboard/tyan/s8226/acpi_tables.c index 7fd5eaf..cae1b60 100644 --- a/src/mainboard/tyan/s8226/acpi_tables.c +++ b/src/mainboard/tyan/s8226/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> #include <northbridge/amd/agesa/agesawrapper.h>

1 0

New patch to review for coreboot: cpu/cpu.h: Drop excessive includes
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17734 -gerrit commit fc106c49a1a0b6fc0bf2a2d395a0157710024bf4 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 14:12:04 2016 +0200 cpu/cpu.h: Drop excessive includes Change-Id: Ifeef04b68760522ce7f230a51f5df354e6da6607 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/mainboard/esd/atom15/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c | 1 - src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c | 1 - src/mainboard/google/auron/acpi_tables.c | 1 - src/mainboard/google/auron_paine/acpi_tables.c | 1 - src/mainboard/google/beltino/acpi_tables.c | 1 - src/mainboard/google/butterfly/acpi_tables.c | 1 - src/mainboard/google/cyan/acpi_tables.c | 1 - src/mainboard/google/enguarde/acpi_tables.c | 1 - src/mainboard/google/guado/acpi_tables.c | 1 - src/mainboard/google/jecht/acpi_tables.c | 1 - src/mainboard/google/link/acpi_tables.c | 1 - src/mainboard/google/ninja/acpi_tables.c | 1 - src/mainboard/google/parrot/acpi_tables.c | 1 - src/mainboard/google/rambi/acpi_tables.c | 1 - src/mainboard/google/rikku/acpi_tables.c | 1 - src/mainboard/google/samus/acpi_tables.c | 1 - src/mainboard/google/slippy/acpi_tables.c | 1 - src/mainboard/google/stout/acpi_tables.c | 1 - src/mainboard/google/tidus/acpi_tables.c | 1 - src/mainboard/intel/baskingridge/acpi_tables.c | 1 - src/mainboard/intel/bayleybay_fsp/acpi_tables.c | 1 - src/mainboard/intel/minnowmax/acpi_tables.c | 1 - src/mainboard/intel/strago/acpi_tables.c | 1 - src/mainboard/intel/wtm2/acpi_tables.c | 1 - src/mainboard/kontron/ktqm77/acpi_tables.c | 1 - src/mainboard/lenovo/t420s/acpi_tables.c | 1 - src/mainboard/lenovo/t520/acpi_tables.c | 1 - src/mainboard/lenovo/t530/acpi_tables.c | 1 - src/mainboard/lenovo/x220/acpi_tables.c | 1 - src/mainboard/lenovo/x230/acpi_tables.c | 1 - src/mainboard/siemens/mc_tcu3/acpi_tables.c | 1 - 32 files changed, 32 deletions(-) diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c index 3da29ee..4e7fc0d 100644 --- a/src/mainboard/esd/atom15/acpi_tables.c +++ b/src/mainboard/esd/atom15/acpi_tables.c @@ -26,7 +26,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c index 978ce55..3f203ca 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c index 978ce55..3f203ca 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c +++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/google/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c index 4566e2f..9583d11 100644 --- a/src/mainboard/google/auron/acpi_tables.c +++ b/src/mainboard/google/auron/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/auron_paine/acpi_tables.c b/src/mainboard/google/auron_paine/acpi_tables.c index 2b43673..f6fc3fd 100644 --- a/src/mainboard/google/auron_paine/acpi_tables.c +++ b/src/mainboard/google/auron_paine/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c index 4b6e015..0f2b0a0 100644 --- a/src/mainboard/google/beltino/acpi_tables.c +++ b/src/mainboard/google/beltino/acpi_tables.c @@ -21,7 +21,6 @@ #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c index 63e712d..cdaa474 100644 --- a/src/mainboard/google/butterfly/acpi_tables.c +++ b/src/mainboard/google/butterfly/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/quanta/ene_kb3940q/ec.h> diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c index 3f81747..d2a78f9 100644 --- a/src/mainboard/google/cyan/acpi_tables.c +++ b/src/mainboard/google/cyan/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/google/enguarde/acpi_tables.c b/src/mainboard/google/enguarde/acpi_tables.c index 4eaf103..2c83327 100644 --- a/src/mainboard/google/enguarde/acpi_tables.c +++ b/src/mainboard/google/enguarde/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/google/guado/acpi_tables.c b/src/mainboard/google/guado/acpi_tables.c index 4f75200..aa7f16f 100644 --- a/src/mainboard/google/guado/acpi_tables.c +++ b/src/mainboard/google/guado/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c index 255ad2b..655acc6 100644 --- a/src/mainboard/google/jecht/acpi_tables.c +++ b/src/mainboard/google/jecht/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/link/acpi_tables.c b/src/mainboard/google/link/acpi_tables.c index a7f2c50..b0ecee1 100644 --- a/src/mainboard/google/link/acpi_tables.c +++ b/src/mainboard/google/link/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/ninja/acpi_tables.c b/src/mainboard/google/ninja/acpi_tables.c index c647c9b..c1c4c81 100644 --- a/src/mainboard/google/ninja/acpi_tables.c +++ b/src/mainboard/google/ninja/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c index c9237ac..f5b6146 100644 --- a/src/mainboard/google/parrot/acpi_tables.c +++ b/src/mainboard/google/parrot/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/compal/ene932/ec.h> diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c index c647c9b..c1c4c81 100644 --- a/src/mainboard/google/rambi/acpi_tables.c +++ b/src/mainboard/google/rambi/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/google/rikku/acpi_tables.c b/src/mainboard/google/rikku/acpi_tables.c index 0af2697..6626219 100644 --- a/src/mainboard/google/rikku/acpi_tables.c +++ b/src/mainboard/google/rikku/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/samus/acpi_tables.c b/src/mainboard/google/samus/acpi_tables.c index 8794883..ccca999 100644 --- a/src/mainboard/google/samus/acpi_tables.c +++ b/src/mainboard/google/samus/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c index 97b246f..1e25057 100644 --- a/src/mainboard/google/slippy/acpi_tables.c +++ b/src/mainboard/google/slippy/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <ec/google/chromeec/ec.h> diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c index 729c0f3..580f130 100644 --- a/src/mainboard/google/stout/acpi_tables.c +++ b/src/mainboard/google/stout/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> #include <bootmode.h> diff --git a/src/mainboard/google/tidus/acpi_tables.c b/src/mainboard/google/tidus/acpi_tables.c index 46f5dd9..0ee7934 100644 --- a/src/mainboard/google/tidus/acpi_tables.c +++ b/src/mainboard/google/tidus/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c index b03dc75..e8251dc 100644 --- a/src/mainboard/intel/baskingridge/acpi_tables.c +++ b/src/mainboard/intel/baskingridge/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <vendorcode/google/chromeos/gnvs.h> diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c index f8b6f65..cbb3e09 100644 --- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c +++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c index 3da29ee..4e7fc0d 100644 --- a/src/mainboard/intel/minnowmax/acpi_tables.c +++ b/src/mainboard/intel/minnowmax/acpi_tables.c @@ -26,7 +26,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h> diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c index 591d934..33eba3c 100644 --- a/src/mainboard/intel/strago/acpi_tables.c +++ b/src/mainboard/intel/strago/acpi_tables.c @@ -20,7 +20,6 @@ #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c index c72fdb8..35ba78e 100644 --- a/src/mainboard/intel/wtm2/acpi_tables.c +++ b/src/mainboard/intel/wtm2/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <soc/acpi.h> #include <soc/nvs.h> #include "thermal.h" diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c index 7134d3e..c4bd87c 100644 --- a/src/mainboard/kontron/ktqm77/acpi_tables.c +++ b/src/mainboard/kontron/ktqm77/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/t420s/acpi_tables.c b/src/mainboard/lenovo/t420s/acpi_tables.c index a6d2d5d..1b1556a 100644 --- a/src/mainboard/lenovo/t420s/acpi_tables.c +++ b/src/mainboard/lenovo/t420s/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c index 6746220..b435baf 100644 --- a/src/mainboard/lenovo/t520/acpi_tables.c +++ b/src/mainboard/lenovo/t520/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c index 6746220..b435baf 100644 --- a/src/mainboard/lenovo/t530/acpi_tables.c +++ b/src/mainboard/lenovo/t530/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/x220/acpi_tables.c b/src/mainboard/lenovo/x220/acpi_tables.c index 2c148d4..095f6f7 100644 --- a/src/mainboard/lenovo/x220/acpi_tables.c +++ b/src/mainboard/lenovo/x220/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c index 2c148d4..095f6f7 100644 --- a/src/mainboard/lenovo/x230/acpi_tables.c +++ b/src/mainboard/lenovo/x230/acpi_tables.c @@ -24,7 +24,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <southbridge/intel/bd82x6x/pch.h> diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c index f8b6f65..cbb3e09 100644 --- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c +++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c @@ -25,7 +25,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <soc/acpi.h> #include <soc/nvs.h>

1 0

New patch to review for coreboot: CPU: Declare cpu_phys_address_size() for all arch
by Kyösti Mälkki 06 Dec '16

06 Dec '16

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17733 -gerrit commit 71aa3544ed8ef5cd4c9a81675fef82548a06f172 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Dec 6 14:00:05 2016 +0200 CPU: Declare cpu_phys_address_size() for all arch Resource allocator and 64-bit PCI BARs will need it and PCI use is not really restricted to x86. Change-Id: Ie97f0f73380118f43ec6271aed5617d62a4f5532 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/x86/include/arch/cpu.h | 1 - src/arch/x86/postcar_loader.c | 1 + src/cpu/intel/haswell/romstage.c | 1 + src/include/cpu/cpu.h | 1 + src/northbridge/intel/sandybridge/ram_calc.c | 1 + src/soc/intel/common/util.c | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 578bb07..a923d8e 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -161,7 +161,6 @@ static inline unsigned int cpuid_edx(unsigned int op) int cpu_cpuid_extended_level(void); int cpu_have_cpuid(void); -int cpu_phys_address_size(void); void smm_init(void); void smm_lock(void); diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index 948e445..23f33d5 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -16,6 +16,7 @@ #include <arch/cpu.h> #include <cbmem.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <program_loading.h> diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c index 7eb115c..c82f3b9 100644 --- a/src/cpu/intel/haswell/romstage.c +++ b/src/cpu/intel/haswell/romstage.c @@ -18,6 +18,7 @@ #include <cbfs.h> #include <console/console.h> #include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/bist.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 3256a83..dd89a8c 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -8,6 +8,7 @@ void cpu_initialize(unsigned int cpu_index); struct bus; void initialize_cpus(struct bus *cpu_bus); void asmlinkage secondary_cpu_init(unsigned int cpu_index); +int cpu_phys_address_size(void); #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) #ifndef __SIMPLE_DEVICE__ diff --git a/src/northbridge/intel/sandybridge/ram_calc.c b/src/northbridge/intel/sandybridge/ram_calc.c index 026531a..0253def 100644 --- a/src/northbridge/intel/sandybridge/ram_calc.c +++ b/src/northbridge/intel/sandybridge/ram_calc.c @@ -19,6 +19,7 @@ #include <arch/cpu.h> #include <arch/io.h> #include <cbmem.h> +#include <cpu/cpu.h> #include <cpu/intel/romstage.h> #include <cpu/x86/mtrr.h> #include <program_loading.h> diff --git a/src/soc/intel/common/util.c b/src/soc/intel/common/util.c index 2d3a34a..3aadd6b 100644 --- a/src/soc/intel/common/util.c +++ b/src/soc/intel/common/util.c @@ -15,6 +15,7 @@ #include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/x86/mtrr.h> #include <soc/intel/common/util.h> #include <stddef.h>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2016