diff options
| -rw-r--r-- | src/soc/amd/cezanne/cpu.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/include/soc/cpu.h | 2 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/mca.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/mca.h | 8 | ||||
| -rw-r--r-- | src/soc/amd/picasso/cpu.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/cpu.h | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/mca.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/cpu.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/include/soc/cpu.h | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/mca.c | 2 |
10 files changed, 14 insertions, 9 deletions
diff --git a/src/soc/amd/cezanne/cpu.c b/src/soc/amd/cezanne/cpu.c index 5f0a5a1a2a..2ac30b6b9f 100644 --- a/src/soc/amd/cezanne/cpu.c +++ b/src/soc/amd/cezanne/cpu.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <amdblocks/cpu.h> +#include <amdblocks/mca.h> #include <amdblocks/reset.h> #include <amdblocks/smm.h> #include <assert.h> diff --git a/src/soc/amd/cezanne/include/soc/cpu.h b/src/soc/amd/cezanne/include/soc/cpu.h index ec83349a11..27647adbd1 100644 --- a/src/soc/amd/cezanne/include/soc/cpu.h +++ b/src/soc/amd/cezanne/include/soc/cpu.h @@ -5,6 +5,4 @@ #define CEZANNE_A0_CPUID 0x00a50f00 -void check_mca(void); - #endif /* AMD_CEZANNE_CPU_H */ diff --git a/src/soc/amd/cezanne/mca.c b/src/soc/amd/cezanne/mca.c index 7160256539..24a77887df 100644 --- a/src/soc/amd/cezanne/mca.c +++ b/src/soc/amd/cezanne/mca.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/mca.h> #include <cpu/x86/msr.h> -#include <soc/cpu.h> /* Check the Machine Check Architecture Extension registers */ void check_mca(void) diff --git a/src/soc/amd/common/block/include/amdblocks/mca.h b/src/soc/amd/common/block/include/amdblocks/mca.h new file mode 100644 index 0000000000..9ea29e8ccc --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/mca.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef AMD_BLOCK_MCA_H +#define AMD_BLOCK_MCA_H + +void check_mca(void); + +#endif /* AMD_BLOCK_MCA_H */ diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index 4e9c9a9cac..b04d004f59 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <amdblocks/cpu.h> +#include <amdblocks/mca.h> #include <amdblocks/reset.h> #include <amdblocks/smm.h> #include <assert.h> diff --git a/src/soc/amd/picasso/include/soc/cpu.h b/src/soc/amd/picasso/include/soc/cpu.h index 79d5cc6536..7051bb8b10 100644 --- a/src/soc/amd/picasso/include/soc/cpu.h +++ b/src/soc/amd/picasso/include/soc/cpu.h @@ -3,8 +3,6 @@ #ifndef AMD_PICASSO_CPU_H #define AMD_PICASSO_CPU_H -void check_mca(void); - #define RAVEN1_B0_CPUID 0x00810f10 #define PICASSO_B0_CPUID 0x00810f80 #define PICASSO_B1_CPUID 0x00810f81 diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c index 6787b75236..24a921a7a6 100644 --- a/src/soc/amd/picasso/mca.c +++ b/src/soc/amd/picasso/mca.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/mca.h> #include <amdblocks/msr_zen.h> #include <amdblocks/reset.h> #include <cpu/x86/lapic.h> #include <cpu/x86/msr.h> #include <acpi/acpi.h> -#include <soc/cpu.h> #include <console/console.h> #include <arch/bert_storage.h> #include <cper.h> diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c index e00763753a..9283ff76e0 100644 --- a/src/soc/amd/stoneyridge/cpu.c +++ b/src/soc/amd/stoneyridge/cpu.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/mca.h> #include <amdblocks/reset.h> #include <amdblocks/smm.h> #include <cpu/amd/msr.h> diff --git a/src/soc/amd/stoneyridge/include/soc/cpu.h b/src/soc/amd/stoneyridge/include/soc/cpu.h index 528daa4125..cb6bb52832 100644 --- a/src/soc/amd/stoneyridge/include/soc/cpu.h +++ b/src/soc/amd/stoneyridge/include/soc/cpu.h @@ -14,6 +14,4 @@ #define SOC_EARLY_VMTRR_CAR_HEAP 2 #define SOC_EARLY_VMTRR_TEMPRAM 3 -void check_mca(void); - #endif /* AMD_STONEYRIDGE_CPU_H */ diff --git a/src/soc/amd/stoneyridge/mca.c b/src/soc/amd/stoneyridge/mca.c index bdb06ccfa2..b3e6682074 100644 --- a/src/soc/amd/stoneyridge/mca.c +++ b/src/soc/amd/stoneyridge/mca.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/mca.h> #include <amdblocks/reset.h> #include <cpu/amd/msr.h> #include <cpu/x86/lapic.h> #include <cpu/x86/msr.h> #include <acpi/acpi.h> -#include <soc/cpu.h> #include <console/console.h> #include <arch/bert_storage.h> #include <cper.h> |