]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
x86: Set the CPU vendor in SPL
authorSimon Glass <sjg@chromium.org>
Wed, 20 Sep 2023 03:00:05 +0000 (21:00 -0600)
committerBin Meng <bmeng@tinylab.org>
Thu, 21 Sep 2023 22:03:46 +0000 (06:03 +0800)
We don't read this information in 64-bit mode, since we don't have the
macros for doing it. Set it to Intel by default. This allows the TSC timer
to work correctly.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
arch/x86/cpu/x86_64/cpu.c

index d1c3873dd6a7836763562c4ee93d378fad46b741..2647bff891f86046a8388961af649c9165af8c9d 100644 (file)
@@ -8,8 +8,11 @@
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <init.h>
+#include <asm/cpu.h>
 #include <asm/global_data.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int cpu_has_64bit(void)
 {
        return true;
@@ -38,6 +41,10 @@ int x86_mp_init(void)
 
 int x86_cpu_reinit_f(void)
 {
+       /* set the vendor to Intel so that native_calibrate_tsc() works */
+       gd->arch.x86_vendor = X86_VENDOR_INTEL;
+       gd->arch.has_mtrr = true;
+
        return 0;
 }