GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Move max cpuid leaf function into arch/x86 

This cpuid function (0) is same across Intel and AMD so having it in
arch/x86 seems like a good idea.

Change-Id: I38f1c40bceac38ed6428f74b08bf60b971644f5a
Signed-off-by: Andrey Petrov <anpetrov@fb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36282
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
This commit is contained in:
Andrey Petrov 2019-10-23 15:15:08 -07:00
parent 19e353473d
commit b8eaa6a584
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/arch/x86/include/arch/cpu.h
View File

@ -141,6 +141,11 @@ static inline unsigned int cpuid_edx(unsigned int op)
return edx; return edx;
} }
static inline unsigned int cpuid_get_max_func(void)
{
return cpuid_eax(0);
}
#define X86_VENDOR_INVALID 0 #define X86_VENDOR_INVALID 0
#define X86_VENDOR_INTEL 1 #define X86_VENDOR_INTEL 1
#define X86_VENDOR_CYRIX 2 #define X86_VENDOR_CYRIX 2

9
src/soc/intel/common/block/timer/timer.c
View File

@ -30,11 +30,6 @@ static int get_processor_model(void)
return c.x86_model; return c.x86_model;
} }
static unsigned int get_max_cpuid_func(void)
{
return cpuid_eax(0);
}
static unsigned long get_hardcoded_crystal_freq(void) static unsigned long get_hardcoded_crystal_freq(void)
{ {
unsigned long core_crystal_nominal_freq_khz = 0; unsigned long core_crystal_nominal_freq_khz = 0;
@ -72,7 +67,7 @@ static unsigned long calculate_tsc_freq_from_core_crystal(void)
unsigned long core_crystal_nominal_freq_khz; unsigned long core_crystal_nominal_freq_khz;
struct cpuid_result cpuidr_15h; struct cpuid_result cpuidr_15h;
if (get_max_cpuid_func() < 0x15) if (cpuid_get_max_func() < 0x15)
return 0; return 0;
/* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */ /* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */
@ -103,7 +98,7 @@ static unsigned long calculate_tsc_freq_from_core_crystal(void)
*/ */
static unsigned long get_freq_from_cpuid16h(void) static unsigned long get_freq_from_cpuid16h(void)
{ {
if (get_max_cpuid_func() < 0x16) if (cpuid_get_max_func() < 0x16)
return 0; return 0;
return cpuid_eax(0x16); return cpuid_eax(0x16);