[coreboot-gerrit] Change in coreboot[master]: arch/x86: Move max cpuid leaf function into arch/x86

[Andrey Petrov (Code Review)]

Andrey Petrov has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36282 )

Change subject: arch/x86: Move max cpuid leaf function into arch/x86
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36282
Tested-by: build bot (Jenkins) 
Reviewed-by: David Hendricks 
---
M src/arch/x86/include/arch/cpu.h
M src/soc/intel/common/block/timer/timer.c
2 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  David Hendricks: Looks good to me, approved

diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index b824736..9133f53 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -141,6 +141,11 @@
    return edx;
 }

+static inline unsigned int cpuid_get_max_func(void)
+{
+	return cpuid_eax(0);
+}
+
 #define X86_VENDOR_INVALID    0
 #define X86_VENDOR_INTEL      1
 #define X86_VENDOR_CYRIX      2
diff --git a/src/soc/intel/common/block/timer/timer.c b/src/soc/intel/common/block/timer/timer.c
index 219c634..94e2e65 100644
--- a/src/soc/intel/common/block/timer/timer.c
+++ b/src/soc/intel/common/block/timer/timer.c
@@ -30,11 +30,6 @@
    return c.x86_model;
 }

-static unsigned int get_max_cpuid_func(void)
-{
-	return cpuid_eax(0);
-}
-
 static unsigned long get_hardcoded_crystal_freq(void)
 {
    unsigned long core_crystal_nominal_freq_khz = 0;
@@ -72,7 +67,7 @@
    unsigned long core_crystal_nominal_freq_khz;
    struct cpuid_result cpuidr_15h;

-	if (get_max_cpuid_func() < 0x15)
+	if (cpuid_get_max_func() < 0x15)
    	return 0;

/* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */
@@ -103,7 +98,7 @@
  */
 static unsigned long get_freq_from_cpuid16h(void)
 {
-	if (get_max_cpuid_func() < 0x16)
+	if (cpuid_get_max_func() < 0x16)
    	return 0;

return cpuid_eax(0x16);