diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2019-07-08 14:16:13 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-07-10 10:20:30 +0000 |
| commit | 71c6c1725e0efe77787a8d3b7aaf14c0c0eba166 (patch) | |
| tree | ad8c789b4756c88baf4bb5cb176bba40fa34520c /src/arch/x86 | |
| parent | 808440e6b2f7b69bcb14cccddf27b1239e47a792 (diff) | |
arch/cpu/x86: Update AMD detection
AMD Picasso, and later, will not use CPU_AMD_AGESA or CPU_AMD_PI.
Those two symbols indicate an Arch2008 system. Add SOC_AMD_COMMON
to cause cpu_is_amd() to return TRUE on Picasso.
This removes an error message of "Unknown CPU".
The patch also assumes AMD Family 10h and non-AGESA Family 15h
devices were seeing the "Unknown CPU" message. No functionality
has been verified on these devices.
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Change-Id: I3357606c37082f3587ff91924bf7a0e0f8af9625
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34146
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/include/arch/cpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 38066c15a2..32717ba5b3 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -210,7 +210,8 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1); static inline bool cpu_is_amd(void) { - return CONFIG(CPU_AMD_AGESA) || CONFIG(CPU_AMD_PI); + return CONFIG(CPU_AMD_AGESA) || CONFIG(CPU_AMD_PI) + || CONFIG(SOC_AMD_COMMON) || CONFIG(CPU_AMD_MODEL_10XXX); } static inline bool cpu_is_intel(void) |