d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd64: Call clock_init() after finishidentcpu()

Browse Source 
As in commit c3d830cf7c, we should finalize CPU identification before
probing the TSC frequency.

Fixes:		84369dd523 ("x86: Probe the TSC frequency earlier")
Reported by:	khng
This commit is contained in:
Mark Johnston 2022-03-04 19:32:39 -05:00
parent 61d83041ab
commit f7a6dccf42
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/amd64/amd64/machdep.c
View File

@ -1457,12 +1457,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
r_idt.rd_base = (long) idt;
lidt(&r_idt);
/*
* Initialize the clock before the console so that console
* initialization can use DELAY().
*/
clock_init();
/*
* Use vt(4) by default for UEFI boot (during the sc(4)/vt(4)
* transition).
@ -1490,6 +1484,13 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
&x86_rngds_mitg_enable);
finishidentcpu(); /* Final stage of CPU initialization */
/*
* Initialize the clock before the console so that console
* initialization can use DELAY().
*/
clock_init();
initializecpu(); /* Initialize CPU registers */
amd64_bsp_ist_init(pc);