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

fix x86 UP build broken by r334204, TSC resynchronization

Browse Source 
Reported by:	bde
MFC after:	1 week
X-MFC with:	r334204
This commit is contained in:
Andriy Gapon 2018-05-29 16:03:53 +00:00
parent 075bac9787
commit ba79ab8215
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=334338
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/x86/x86/tsc.c
View File

@ -505,19 +505,6 @@ test_tsc(int adj_max_count)
#undef N
#else
/*
* The function is not called, it is provided to avoid linking failure
* on uniprocessor kernel.
*/
static int
test_tsc(int adj_max_count __unused)
{
return (0);
}
#endif /* SMP */
static void
@ -578,9 +565,12 @@ init_TSC_tc(void)
* non-zero value. The TSC seems unreliable in virtualized SMP
* environments, so it is set to a negative quality in those cases.
*/
#ifdef SMP
if (mp_ncpus > 1)
tsc_timecounter.tc_quality = test_tsc(smp_tsc_adjust);
else if (tsc_is_invariant)
else
#endif /* SMP */
if (tsc_is_invariant)
tsc_timecounter.tc_quality = 1000;
max_freq >>= tsc_shift;
@ -618,6 +608,7 @@ SYSINIT(tsc_tc, SI_SUB_SMP, SI_ORDER_ANY, init_TSC_tc, NULL);
void
resume_TSC(void)
{
#ifdef SMP
int quality;
/* If TSC was not good on boot, it is unlikely to become good now. */
@ -637,6 +628,7 @@ resume_TSC(void)
tsc_timecounter.tc_quality, quality);
tsc_timecounter.tc_quality = quality;
}
#endif /* SMP */
}
/*